Module Name: src
Committed By: jmcneill
Date: Sat Sep 13 14:47:35 UTC 2014
Modified Files:
src/sys/conf: files
src/sys/dev/usb: motgreg.h
Log Message:
options MOTG_ALLWINNER to select the awin specific reg layout
To generate a diff of this commit:
cvs rdiff -u -r1.1103 -r1.1104 src/sys/conf/files
cvs rdiff -u -r1.1 -r1.2 src/sys/dev/usb/motgreg.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/conf/files
diff -u src/sys/conf/files:1.1103 src/sys/conf/files:1.1104
--- src/sys/conf/files:1.1103 Mon Sep 8 14:26:16 2014
+++ src/sys/conf/files Sat Sep 13 14:47:35 2014
@@ -1,4 +1,4 @@
-# $NetBSD: files,v 1.1103 2014/09/08 14:26:16 martin Exp $
+# $NetBSD: files,v 1.1104 2014/09/13 14:47:35 jmcneill Exp $
# @(#)files.newconf 7.5 (Berkeley) 5/10/93
version 20140824
@@ -1246,6 +1246,7 @@ device xhci: usbus, usbroothub, usb_dma
file dev/usb/xhci.c xhci needs-flag
# Mentor graphics OTG IP
+defflag opt_motg.h MOTG_ALLWINNER
device motg: usbus, usbroothub, usb_dma
file dev/usb/motg.c motg needs-flag
Index: src/sys/dev/usb/motgreg.h
diff -u src/sys/dev/usb/motgreg.h:1.1 src/sys/dev/usb/motgreg.h:1.2
--- src/sys/dev/usb/motgreg.h:1.1 Wed Jul 16 18:22:23 2014
+++ src/sys/dev/usb/motgreg.h Sat Sep 13 14:47:35 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: motgreg.h,v 1.1 2014/07/16 18:22:23 bouyer Exp $ */
+/* $NetBSD: motgreg.h,v 1.2 2014/09/13 14:47:35 jmcneill Exp $ */
/* FreeBSD: head/sys/dev/usb/controller/musb_otg.h 267122 2014-06-05 18:23:51Z hselasky */
/*-
* Copyright (c) 2008 Hans Petter Selasky. All rights reserved.
@@ -33,6 +33,8 @@
#ifndef _MUSB2_OTG_H_
#define _MUSB2_OTG_H_
+#include "opt_motg.h"
+
#define MUSB2_MAX_DEVICES USB_MAX_DEVICES
/* Common registers */
@@ -283,4 +285,55 @@
#define MUSB2_EP_MAX 16 /* maximum number of endpoints */
+#ifdef MOTG_ALLWINNER
+/*
+ * AllWinner SoCs have an MOTG with shuffled registers
+ */
+#undef MUSB2_REG_FADDR
+#define MUSB2_REG_FADDR 0x0098
+
+#undef MUSB2_REG_POWER
+#define MUSB2_REG_POWER 0x0040
+
+#undef MUSB2_REG_DEVCTL
+#define MUSB2_REG_DEVCTL 0x0041
+
+#undef MUSB2_REG_EPINDEX
+#define MUSB2_REG_EPINDEX 0x0042
+
+#undef MUSB2_REG_INTTX
+#define MUSB2_REG_INTTX 0x0044
+
+#undef MUSB2_REG_INTRX
+#define MUSB2_REG_INTRX 0x0046
+
+#undef MUSB2_REG_INTTXE
+#define MUSB2_REG_INTTXE 0x0048
+
+#undef MUSB2_REG_INTRXE
+#define MUSB2_REG_INTRXE 0x004a
+
+#undef MUSB2_REG_INTUSB
+#define MUSB2_REG_INTUSB 0x004c
+
+#undef MUSB2_REG_INTUSBE
+#define MUSB2_REG_INTUSBE 0x0050
+
+#undef MUSB2_REG_FRAME
+#define MUSB2_REG_FRAME 0x0054
+
+#undef MUSB2_REG_TXFIFOSZ
+#define MUSB2_REG_TXFIFOSZ 0x0090
+
+#undef MUSB2_REG_RXFIFOSZ
+#define MUSB2_REG_RXFIFOSZ 0x0094
+
+#undef MUSB2_REG_TXFIFOADD
+#define MUSB2_REG_TXFIFOADD 0x0064
+
+#undef MUSB2_REG_RXFIFOADD
+#define MUSB2_REG_RXFIFOADD 0x0066
+
+#endif /* !MOTG_ALLWINNER */
+
#endif /* _MUSB2_OTG_H_ */
