Module Name: src
Committed By: jmcneill
Date: Mon Jul 31 09:25:14 UTC 2017
Modified Files:
src/sys/dev/ic: com.c comvar.h
Log Message:
Add COM_TYPE_BCMAUXUART type for BCM2835 AUX UART.
To generate a diff of this commit:
cvs rdiff -u -r1.339 -r1.340 src/sys/dev/ic/com.c
cvs rdiff -u -r1.82 -r1.83 src/sys/dev/ic/comvar.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/ic/com.c
diff -u src/sys/dev/ic/com.c:1.339 src/sys/dev/ic/com.c:1.340
--- src/sys/dev/ic/com.c:1.339 Fri May 27 20:01:49 2016
+++ src/sys/dev/ic/com.c Mon Jul 31 09:25:14 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: com.c,v 1.339 2016/05/27 20:01:49 bouyer Exp $ */
+/* $NetBSD: com.c,v 1.340 2017/07/31 09:25:14 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.339 2016/05/27 20:01:49 bouyer Exp $");
+__KERNEL_RCSID(0, "$NetBSD: com.c,v 1.340 2017/07/31 09:25:14 jmcneill Exp $");
#include "opt_com.h"
#include "opt_ddb.h"
@@ -475,6 +475,14 @@ com_attach_subr(struct com_softc *sc)
CSR_WRITE_1(regsp, COM_REG_FIFO,
FIFO_ENABLE | FIFO_RCV_RST | FIFO_XMT_RST | FIFO_TRIGGER_1);
goto fifodelay;
+
+ case COM_TYPE_BCMAUXUART:
+ sc->sc_fifolen = 8;
+ fifo_msg = "BCM AUX UART, working fifo";
+ SET(sc->sc_hwflags, COM_HW_FIFO);
+ CSR_WRITE_1(regsp, COM_REG_FIFO,
+ FIFO_ENABLE | FIFO_RCV_RST | FIFO_XMT_RST | FIFO_TRIGGER_1);
+ goto fifodelay;
}
sc->sc_fifolen = 1;
Index: src/sys/dev/ic/comvar.h
diff -u src/sys/dev/ic/comvar.h:1.82 src/sys/dev/ic/comvar.h:1.83
--- src/sys/dev/ic/comvar.h:1.82 Fri May 27 20:01:49 2016
+++ src/sys/dev/ic/comvar.h Mon Jul 31 09:25:14 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: comvar.h,v 1.82 2016/05/27 20:01:49 bouyer Exp $ */
+/* $NetBSD: comvar.h,v 1.83 2017/07/31 09:25:14 jmcneill Exp $ */
/*
* Copyright (c) 1996 Christopher G. Demetriou. All rights reserved.
@@ -247,6 +247,7 @@ struct com_softc {
#define COM_TYPE_16550_NOERS 5 /* like a 16550, no ERS */
#define COM_TYPE_INGENIC 6 /* JZ4780 built-in */
#define COM_TYPE_TEGRA 7 /* NVIDIA Tegra built-in */
+#define COM_TYPE_BCMAUXUART 8 /* BCM2835 AUX UART */
/* power management hooks */
int (*enable)(struct com_softc *);
