Author: hselasky
Date: Thu May 29 10:46:09 2014
New Revision: 266832
URL: http://svnweb.freebsd.org/changeset/base/266832
Log:
Hook the ISP/SAF1761 driver into MIPS kernel builds.
- Update FDT file for BERI DE4 boards.
- Add needed kernel configuration keywords.
- Rename module to saf1761otg so that the device unit number does not
interfere with the hardware ID in dmesg.
Sponsored by: DARPA, AFRL
Added:
head/sys/modules/usb/saf1761otg/
- copied from r266244, head/sys/modules/usb/saf1761/
Deleted:
head/sys/modules/usb/saf1761/
Modified:
head/sys/boot/fdt/dts/mips/beripad-de4.dts
head/sys/conf/files
head/sys/dev/usb/controller/saf1761_otg_fdt.c
head/sys/dev/usb/controller/usb_controller.c
head/sys/mips/conf/BERI_DE4_BASE
head/sys/modules/usb/Makefile
head/sys/modules/usb/saf1761otg/Makefile
Modified: head/sys/boot/fdt/dts/mips/beripad-de4.dts
==============================================================================
--- head/sys/boot/fdt/dts/mips/beripad-de4.dts Thu May 29 10:06:18 2014
(r266831)
+++ head/sys/boot/fdt/dts/mips/beripad-de4.dts Thu May 29 10:46:09 2014
(r266832)
@@ -222,7 +222,7 @@
};
usb@0x7f100000 {
- compatible = "philips,isp1761";
+ compatible = "nxp,usb-isp1761";
reg = <0x7f100000 0x40000
0x7f140000 0x4>;
// IRQ 4 is DC, IRQ 5 is HC.
@@ -253,14 +253,5 @@
sri-cambridge,fileio = "rw";
sri-cambridge,devname = "de4tempfan";
};
-
- avgen@0x7f100000 {
- compatible = "sri-cambridge,avgen";
- reg = <0x7f100000 0x40000>;
- sri-cambridge,width = <4>;
- sri-cambridge,fileio = "r";
- sri-cambridge,devname = "usbmem";
- };
-
};
};
Modified: head/sys/conf/files
==============================================================================
--- head/sys/conf/files Thu May 29 10:06:18 2014 (r266831)
+++ head/sys/conf/files Thu May 29 10:46:09 2014 (r266832)
@@ -2314,6 +2314,8 @@ dev/usb/controller/uhci.c optional uhci
dev/usb/controller/uhci_pci.c optional uhci pci
dev/usb/controller/xhci.c optional xhci
dev/usb/controller/xhci_pci.c optional xhci pci
+dev/usb/controller/saf1761_otg.c optional saf1761otg
+dev/usb/controller/saf1761_otg_fdt.c optional saf1761otg fdt
dev/usb/controller/uss820dci.c optional uss820dci
dev/usb/controller/uss820dci_atmelarm.c optional uss820dci at91rm9200
dev/usb/controller/usb_controller.c optional usb
Modified: head/sys/dev/usb/controller/saf1761_otg_fdt.c
==============================================================================
--- head/sys/dev/usb/controller/saf1761_otg_fdt.c Thu May 29 10:06:18
2014 (r266831)
+++ head/sys/dev/usb/controller/saf1761_otg_fdt.c Thu May 29 10:46:09
2014 (r266832)
@@ -93,15 +93,15 @@ static device_method_t saf1761_otg_metho
};
static driver_t saf1761_otg_driver = {
- .name = "saf1761",
+ .name = "saf1761otg",
.methods = saf1761_otg_methods,
.size = sizeof(struct saf1761_otg_softc),
};
static devclass_t saf1761_otg_devclass;
-DRIVER_MODULE(saf1761, simplebus, saf1761_otg_driver, saf1761_otg_devclass, 0,
0);
-MODULE_DEPEND(saf1761, usb, 1, 1, 1);
+DRIVER_MODULE(saf1761otg, simplebus, saf1761_otg_driver, saf1761_otg_devclass,
0, 0);
+MODULE_DEPEND(saf1761otg, usb, 1, 1, 1);
static int
saf1761_otg_fdt_probe(device_t dev)
Modified: head/sys/dev/usb/controller/usb_controller.c
==============================================================================
--- head/sys/dev/usb/controller/usb_controller.c Thu May 29 10:06:18
2014 (r266831)
+++ head/sys/dev/usb/controller/usb_controller.c Thu May 29 10:46:09
2014 (r266832)
@@ -138,7 +138,7 @@ DRIVER_MODULE(usbus, octusb, usb_driver,
/* Dual Mode Drivers */
DRIVER_MODULE(usbus, dwcotg, usb_driver, usb_devclass, 0, 0);
-DRIVER_MODULE(usbus, saf1761, usb_driver, usb_devclass, 0, 0);
+DRIVER_MODULE(usbus, saf1761otg, usb_driver, usb_devclass, 0, 0);
/*------------------------------------------------------------------------*
* usb_probe
Modified: head/sys/mips/conf/BERI_DE4_BASE
==============================================================================
--- head/sys/mips/conf/BERI_DE4_BASE Thu May 29 10:06:18 2014
(r266831)
+++ head/sys/mips/conf/BERI_DE4_BASE Thu May 29 10:46:09 2014
(r266832)
@@ -40,3 +40,12 @@ device uart
device miibus
options DEVICE_POLLING
+#
+# USB support
+#
+#options USB_DEBUG
+#options USB_REQ_DEBUG
+#options USB_VERBOSE
+device usb
+device saf1761otg
+
Modified: head/sys/modules/usb/Makefile
==============================================================================
--- head/sys/modules/usb/Makefile Thu May 29 10:06:18 2014
(r266831)
+++ head/sys/modules/usb/Makefile Thu May 29 10:46:09 2014
(r266832)
@@ -44,7 +44,7 @@ MAKE+=" DEBUG_FLAGS+=-DUSB_REQ_DEBUG"
SUBDIR = usb
SUBDIR += ${_dwc_otg} ehci ${_musb} ohci uhci xhci ${_uss820dci} ${_at91dci} \
- ${_atmegadci} ${_avr32dci} ${_rsu} ${_rsufw}
+ ${_atmegadci} ${_avr32dci} ${_rsu} ${_rsufw} ${_saf1761otg}
SUBDIR += ${_rum} ${_run} ${_runfw} ${_uath} upgt usie ural ${_zyd} ${_urtw}
SUBDIR += ${_urtwn} ${_urtwnfw}
SUBDIR += atp uhid ukbd ums udbp ufm uep wsp
@@ -96,4 +96,8 @@ _urtw= urtw
_avr32dci= avr32dci
.endif
+.if ${MACHINE_CPUARCH} == "mips"
+_saf1761otg= saf1761otg
+.endif
+
.include <bsd.subdir.mk>
Modified: head/sys/modules/usb/saf1761otg/Makefile
==============================================================================
--- head/sys/modules/usb/saf1761/Makefile Fri May 16 15:50:21 2014
(r266244)
+++ head/sys/modules/usb/saf1761otg/Makefile Thu May 29 10:46:09 2014
(r266832)
@@ -33,7 +33,7 @@ S= ${.CURDIR}/../../..
.PATH: $S/dev/usb/controller
-KMOD= saf1761
+KMOD= saf1761otg
SRCS= bus_if.h device_if.h usb_if.h \
opt_bus.h opt_usb.h ofw_bus_if.h \
saf1761_otg.c saf1761_otg_fdt.c \
_______________________________________________
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
