[src/trunk]: src/sys/arch remove options COM_AWIN and set COM_TYPE_SUNXI in t...

[jmcneill <jmcneill%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/418151e0a426
branches:  trunk
changeset: 357168:418151e0a426
user:      jmcneill <jmcneill%NetBSD.org@localhost>
date:      Sun Oct 29 14:07:11 2017 +0000

description:
remove options COM_AWIN and set COM_TYPE_SUNXI in the bus driver instead

diffstat:

 sys/arch/arm/sunxi/sunxi_com.c |  8 ++++----
 sys/arch/evbarm/conf/SUNXI     |  3 +--
 2 files changed, 5 insertions(+), 6 deletions(-)

diffs (54 lines):

diff -r b3942de8f53a -r 418151e0a426 sys/arch/arm/sunxi/sunxi_com.c
--- a/sys/arch/arm/sunxi/sunxi_com.c    Sun Oct 29 14:06:08 2017 +0000
+++ b/sys/arch/arm/sunxi/sunxi_com.c    Sun Oct 29 14:07:11 2017 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: sunxi_com.c,v 1.3 2017/10/23 21:03:24 jmcneill Exp $ */
+/* $NetBSD: sunxi_com.c,v 1.4 2017/10/29 14:07:11 jmcneill Exp $ */
 
 /*-
  * Copyright (c) 2017 Jared McNeill <jmcneill%invisible.ca@localhost>
@@ -28,7 +28,7 @@
 
 #include <sys/cdefs.h>
 
-__KERNEL_RCSID(1, "$NetBSD: sunxi_com.c,v 1.3 2017/10/23 21:03:24 jmcneill Exp $");
+__KERNEL_RCSID(1, "$NetBSD: sunxi_com.c,v 1.4 2017/10/29 14:07:11 jmcneill Exp $");
 
 #include <sys/param.h>
 #include <sys/bus.h>
@@ -122,7 +122,7 @@
        }
 
        sc->sc_frequency = clk_get_rate(ssc->ssc_clk);
-       sc->sc_type = COM_TYPE_NORMAL;
+       sc->sc_type = COM_TYPE_SUNXI;
 
        error = bus_space_map(bst, addr, size, 0, &bsh);
        if (error) {
@@ -174,7 +174,7 @@
                speed = 115200; /* default */
        flags = fdtbus_get_stdout_flags();
 
-       if (comcnattach(bst, addr, speed, uart_freq, COM_TYPE_NORMAL, flags))
+       if (comcnattach(bst, addr, speed, uart_freq, COM_TYPE_SUNXI, flags))
                panic("Cannot initialize sunxi com console");
 }
 
diff -r b3942de8f53a -r 418151e0a426 sys/arch/evbarm/conf/SUNXI
--- a/sys/arch/evbarm/conf/SUNXI        Sun Oct 29 14:06:08 2017 +0000
+++ b/sys/arch/evbarm/conf/SUNXI        Sun Oct 29 14:07:11 2017 +0000
@@ -1,5 +1,5 @@
 #
-#      $NetBSD: SUNXI,v 1.47 2017/10/28 10:54:18 jmcneill Exp $
+#      $NetBSD: SUNXI,v 1.48 2017/10/29 14:07:11 jmcneill Exp $
 #
 #      Allwinner sunxi family
 #
@@ -167,7 +167,6 @@
 
 # UART
 com*           at fdt?                 # UART
-options        COM_AWIN                # XXX this should be a driver flag
 
 # I2C
 sunxitwi*      at fdt?                 # TWI