[src/trunk]: src/sys Remove MOTG_ALLWINNER option

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

details:   https://anonhg.NetBSD.org/src/rev/123adf0b3ad7
branches:  trunk
changeset: 360982:123adf0b3ad7
user:      jmcneill <jmcneill%NetBSD.org@localhost>
date:      Sun Apr 08 13:36:37 2018 +0000

description:
Remove MOTG_ALLWINNER option

diffstat:

 sys/arch/arm/sunxi/sunxi_musb.c |   9 ++-------
 sys/conf/files                  |   3 +--
 sys/dev/usb/motg.c              |  10 ++--------
 3 files changed, 5 insertions(+), 17 deletions(-)

diffs (75 lines):

diff -r 9de38f29865b -r 123adf0b3ad7 sys/arch/arm/sunxi/sunxi_musb.c
--- a/sys/arch/arm/sunxi/sunxi_musb.c   Sun Apr 08 13:19:17 2018 +0000
+++ b/sys/arch/arm/sunxi/sunxi_musb.c   Sun Apr 08 13:36:37 2018 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: sunxi_musb.c,v 1.3 2017/12/03 14:35:07 jmcneill Exp $ */
+/* $NetBSD: sunxi_musb.c,v 1.4 2018/04/08 13:36:37 jmcneill Exp $ */
 
 /*-
  * Copyright (c) 2017 Jared McNeill <jmcneill%invisible.ca@localhost>
@@ -26,13 +26,8 @@
  * SUCH DAMAGE.
  */
 
-#include "opt_motg.h"
-#ifdef MOTG_ALLWINNER
-# error Do not define MOTG_ALLWINNER when using this driver
-#endif
-
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: sunxi_musb.c,v 1.3 2017/12/03 14:35:07 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sunxi_musb.c,v 1.4 2018/04/08 13:36:37 jmcneill Exp $");
 
 #include <sys/param.h>
 #include <sys/bus.h>
diff -r 9de38f29865b -r 123adf0b3ad7 sys/conf/files
--- a/sys/conf/files    Sun Apr 08 13:19:17 2018 +0000
+++ b/sys/conf/files    Sun Apr 08 13:36:37 2018 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: files,v 1.1196 2018/02/27 14:28:01 maxv Exp $
+#      $NetBSD: files,v 1.1197 2018/04/08 13:36:37 jmcneill Exp $
 #      @(#)files.newconf       7.5 (Berkeley) 5/10/93
 
 version        20171118
@@ -1287,7 +1287,6 @@
 file   dev/usb/xhci.c                  xhci                    needs-flag
 
 # Mentor graphics OTG IP
-defflag        opt_motg.h      MOTG_ALLWINNER
 device motg: usbus, usbroothub
 file   dev/usb/motg.c                  motg                    needs-flag
 
diff -r 9de38f29865b -r 123adf0b3ad7 sys/dev/usb/motg.c
--- a/sys/dev/usb/motg.c        Sun Apr 08 13:19:17 2018 +0000
+++ b/sys/dev/usb/motg.c        Sun Apr 08 13:36:37 2018 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: motg.c,v 1.19 2017/11/17 08:22:02 skrll Exp $  */
+/*     $NetBSD: motg.c,v 1.20 2018/04/08 13:36:37 jmcneill Exp $       */
 
 /*
  * Copyright (c) 1998, 2004, 2011, 2012, 2014 The NetBSD Foundation, Inc.
@@ -40,10 +40,9 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: motg.c,v 1.19 2017/11/17 08:22:02 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: motg.c,v 1.20 2018/04/08 13:36:37 jmcneill Exp $");
 
 #ifdef _KERNEL_OPT
-#include "opt_motg.h"
 #include "opt_usb.h"
 #endif
 
@@ -68,12 +67,7 @@
 #include <dev/usb/usb_mem.h>
 #include <dev/usb/usbhist.h>
 
-#ifdef MOTG_ALLWINNER
-#include <arch/arm/allwinner/awin_otgreg.h>
-#else
 #include <dev/usb/motgreg.h>
-#endif
-
 #include <dev/usb/motgvar.h>
 #include <dev/usb/usbroothub.h>