[src/trunk]: src/sys Rename COM_TYPE_SUNXI -> COM_TYPE_DW_APB

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

details:   https://anonhg.NetBSD.org/src/rev/4cd839a64ff9
branches:  trunk
changeset: 319351:4cd839a64ff9
user:      jmcneill <jmcneill%NetBSD.org@localhost>
date:      Sun May 27 17:05:06 2018 +0000

description:
Rename COM_TYPE_SUNXI -> COM_TYPE_DW_APB

diffstat:

 sys/arch/arm/sunxi/sunxi_com.c |   8 ++++----
 sys/dev/ic/com.c               |  12 ++++++------
 sys/dev/ic/comvar.h            |  20 ++++++++++----------
 3 files changed, 20 insertions(+), 20 deletions(-)

diffs (131 lines):

diff -r 21d8baa87ce0 -r 4cd839a64ff9 sys/arch/arm/sunxi/sunxi_com.c
--- a/sys/arch/arm/sunxi/sunxi_com.c    Sun May 27 17:04:45 2018 +0000
+++ b/sys/arch/arm/sunxi/sunxi_com.c    Sun May 27 17:05:06 2018 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: sunxi_com.c,v 1.4 2017/10/29 14:07:11 jmcneill Exp $ */
+/* $NetBSD: sunxi_com.c,v 1.5 2018/05/27 17:05:06 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.4 2017/10/29 14:07:11 jmcneill Exp $");
+__KERNEL_RCSID(1, "$NetBSD: sunxi_com.c,v 1.5 2018/05/27 17:05:06 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_SUNXI;
+       sc->sc_type = COM_TYPE_DW_APB;
 
        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_SUNXI, flags))
+       if (comcnattach(bst, addr, speed, uart_freq, COM_TYPE_DW_APB, flags))
                panic("Cannot initialize sunxi com console");
 }
 
diff -r 21d8baa87ce0 -r 4cd839a64ff9 sys/dev/ic/com.c
--- a/sys/dev/ic/com.c  Sun May 27 17:04:45 2018 +0000
+++ b/sys/dev/ic/com.c  Sun May 27 17:05:06 2018 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: com.c,v 1.347 2018/04/08 13:38:32 jmcneill Exp $ */
+/* $NetBSD: com.c,v 1.348 2018/05/27 17:05:06 jmcneill Exp $ */
 
 /*-
  * Copyright (c) 1998, 1999, 2004, 2008 The NetBSD Foundation, Inc.
@@ -66,7 +66,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: com.c,v 1.347 2018/04/08 13:38:32 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: com.c,v 1.348 2018/05/27 17:05:06 jmcneill Exp $");
 
 #include "opt_com.h"
 #include "opt_ddb.h"
@@ -425,7 +425,7 @@
 
                switch (sc->sc_type) {
                case COM_TYPE_16750:
-               case COM_TYPE_SUNXI:
+               case COM_TYPE_DW_APB:
                        /* Use in comintr(). */
                        sc->sc_lcr = cflag2lcr(comcons_info.cflag);
                        break;
@@ -1601,7 +1601,7 @@
 
        switch (sc->sc_type) {
        case COM_TYPE_16750:
-       case COM_TYPE_SUNXI:
+       case COM_TYPE_DW_APB:
                /*
                 * Reset all Rx/Tx FIFO, preserve current FIFO length.
                 * This should prevent triggering busy interrupt while
@@ -2059,8 +2059,8 @@
                iir = CSR_READ_1(regsp, COM_REG_IIR);
        }
 
-       /* Allwinner BUSY interrupt */
-       if (sc->sc_type == COM_TYPE_SUNXI &&
+       /* DesignWare APB UART BUSY interrupt */
+       if (sc->sc_type == COM_TYPE_DW_APB &&
            (iir & IIR_BUSY) == IIR_BUSY) {
                if ((CSR_READ_1(regsp, COM_REG_USR) & 0x1) != 0) {
                        CSR_WRITE_1(regsp, COM_REG_HALT, HALT_CHCFG_EN);
diff -r 21d8baa87ce0 -r 4cd839a64ff9 sys/dev/ic/comvar.h
--- a/sys/dev/ic/comvar.h       Sun May 27 17:04:45 2018 +0000
+++ b/sys/dev/ic/comvar.h       Sun May 27 17:05:06 2018 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: comvar.h,v 1.86 2017/12/04 09:55:37 bouyer Exp $       */
+/*     $NetBSD: comvar.h,v 1.87 2018/05/27 17:05:06 jmcneill Exp $     */
 
 /*
  * Copyright (c) 1996 Christopher G. Demetriou.  All rights reserved.
@@ -91,10 +91,10 @@
 #define        COM_REG_MCR             9
 #define        COM_REG_LSR             10
 #define        COM_REG_MSR             11
-#define        COM_REG_USR             31      /* 16750/SUNXI */
-#define        COM_REG_TFL             com_tfl         /* SUNXI */
-#define        COM_REG_RFL             com_rfl         /* SUNXI */
-#define        COM_REG_HALT            com_halt        /* SUNXI */
+#define        COM_REG_USR             31      /* 16750/DW APB */
+#define        COM_REG_TFL             com_tfl         /* DW APB */
+#define        COM_REG_RFL             com_rfl         /* DW APB */
+#define        COM_REG_HALT            com_halt        /* DW APB */
 
 struct com_regs {
        bus_space_tag_t         cr_iot;
@@ -131,10 +131,10 @@
 #define        COM_REG_TCR             com_msr
 #define        COM_REG_TLR             com_scratch
 #define        COM_REG_MDR1            8
-#define COM_REG_USR            com_usr         /* 16750/SUNXI */
-#define        COM_REG_TFL             com_tfl         /* SUNXI */
-#define        COM_REG_RFL             com_rfl         /* SUNXI */
-#define        COM_REG_HALT            com_halt        /* SUNXI */
+#define COM_REG_USR            com_usr         /* 16750/DW APB */
+#define        COM_REG_TFL             com_tfl         /* DW APB */
+#define        COM_REG_RFL             com_rfl         /* DW APB */
+#define        COM_REG_HALT            com_halt        /* DW APB */
 
 struct com_regs {
        bus_space_tag_t         cr_iot;
@@ -230,7 +230,7 @@
 #define        COM_TYPE_BCMAUXUART     8       /* BCM2835 AUX UART */
 #define        COM_TYPE_16650          9
 #define        COM_TYPE_16750          10
-#define        COM_TYPE_SUNXI          11      /* Allwinner built-in */
+#define        COM_TYPE_DW_APB         11      /* DesignWare APB UART */
 
        /* power management hooks */
        int (*enable)(struct com_softc *);