Module Name: src
Committed By: jmcneill
Date: Sun Oct 29 14:07:11 UTC 2017
Modified Files:
src/sys/arch/arm/sunxi: sunxi_com.c
src/sys/arch/evbarm/conf: SUNXI
Log Message:
remove options COM_AWIN and set COM_TYPE_SUNXI in the bus driver instead
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/sys/arch/arm/sunxi/sunxi_com.c
cvs rdiff -u -r1.47 -r1.48 src/sys/arch/evbarm/conf/SUNXI
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/arm/sunxi/sunxi_com.c
diff -u src/sys/arch/arm/sunxi/sunxi_com.c:1.3 src/sys/arch/arm/sunxi/sunxi_com.c:1.4
--- src/sys/arch/arm/sunxi/sunxi_com.c:1.3 Mon Oct 23 21:03:24 2017
+++ src/sys/arch/arm/sunxi/sunxi_com.c Sun Oct 29 14:07:11 2017
@@ -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 <jmcne...@invisible.ca>
@@ -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 @@ sunxi_com_attach(device_t parent, device
}
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 @@ sunxi_com_console_consinit(struct fdt_at
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");
}
Index: src/sys/arch/evbarm/conf/SUNXI
diff -u src/sys/arch/evbarm/conf/SUNXI:1.47 src/sys/arch/evbarm/conf/SUNXI:1.48
--- src/sys/arch/evbarm/conf/SUNXI:1.47 Sat Oct 28 10:54:18 2017
+++ src/sys/arch/evbarm/conf/SUNXI Sun Oct 29 14:07:11 2017
@@ -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 @@ ukphy* at mii? phy ?
# UART
com* at fdt? # UART
-options COM_AWIN # XXX this should be a driver flag
# I2C
sunxitwi* at fdt? # TWI
