Date: Sat, 21 Jul 2012 21:53:04 +0000 From: aleek@FreeBSD.org To: svn-soc-all@FreeBSD.org Subject: socsvn commit: r239648 - in soc2012/aleek/beaglexm-armv6/sys: arm/conf arm/ti/am37x arm/ti/usb boot/fdt/dts Message-ID: <20120721215304.7E1BE10657A1@hub.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: aleek Date: Sat Jul 21 21:53:03 2012 New Revision: 239648 URL: http://svnweb.FreeBSD.org/socsvn/?view=rev&rev=239648 Log: probing usb driver for bb-xm Modified: soc2012/aleek/beaglexm-armv6/sys/arm/conf/BEAGLEBOARD-XM soc2012/aleek/beaglexm-armv6/sys/arm/ti/am37x/files.am37x soc2012/aleek/beaglexm-armv6/sys/arm/ti/usb/omap_ehci.c soc2012/aleek/beaglexm-armv6/sys/boot/fdt/dts/beagleboardxm.dts Modified: soc2012/aleek/beaglexm-armv6/sys/arm/conf/BEAGLEBOARD-XM ============================================================================== --- soc2012/aleek/beaglexm-armv6/sys/arm/conf/BEAGLEBOARD-XM Sat Jul 21 20:52:20 2012 (r239647) +++ soc2012/aleek/beaglexm-armv6/sys/arm/conf/BEAGLEBOARD-XM Sat Jul 21 21:53:03 2012 (r239648) @@ -82,7 +82,7 @@ device mmcsd # mmc/sd flash cards # Boot device is 2nd slice on MMC/SD card -options ROOTDEVNAME=\"msdosfs:mmcsd0s3\" +options ROOTDEVNAME=\"msdosfs:mmcsd0s2\" # Console and misc @@ -103,14 +103,15 @@ device gpio # USB support -#device usb -#options USB_DEBUG -#options USB_REQ_DEBUG -#options USB_VERBOSE -#device musb -#device umass -#device scbus # SCSI bus (required for SCSI) -#device da # Direct Access (disks) +device usb +options USB_DEBUG +options USB_REQ_DEBUG +options USB_VERBOSE +device musb +device ehci +device umass +device scbus # SCSI bus (required for SCSI) +device da # Direct Access (disks) # Ethernet device loop Modified: soc2012/aleek/beaglexm-armv6/sys/arm/ti/am37x/files.am37x ============================================================================== --- soc2012/aleek/beaglexm-armv6/sys/arm/ti/am37x/files.am37x Sat Jul 21 20:52:20 2012 (r239647) +++ soc2012/aleek/beaglexm-armv6/sys/arm/ti/am37x/files.am37x Sat Jul 21 21:53:03 2012 (r239648) @@ -5,6 +5,7 @@ arm/ti/am37x/am37x_gptimer_tc.c standard arm/ti/am37x/am37x_scm_padconf.c standard arm/ti/ti_sdma.c standard +arm/ti/am37x/am37x_early_uart.c standard arm/ti/ti_mmchs.c optional mmc arm/ti/cpsw/if_cpsw.c optional cpsw -arm/ti/am37x/am37x_early_uart.c standard +arm/ti/usb/omap_ehci.c optional usb Modified: soc2012/aleek/beaglexm-armv6/sys/arm/ti/usb/omap_ehci.c ============================================================================== --- soc2012/aleek/beaglexm-armv6/sys/arm/ti/usb/omap_ehci.c Sat Jul 21 20:52:20 2012 (r239647) +++ soc2012/aleek/beaglexm-armv6/sys/arm/ti/usb/omap_ehci.c Sat Jul 21 21:53:03 2012 (r239648) @@ -742,9 +742,11 @@ static int omap_ehci_probe(device_t dev) { - if (!ofw_bus_is_compatible(dev, "ti,usb-ehci")) + device_printf( dev, "probing!\n\n" ); + if (!ofw_bus_is_compatible(dev, "ti,ehci")) return (ENXIO); + device_printf( dev, "probed!!!\n\n" ); device_set_desc(dev, OMAP_EHCI_HC_DEVSTR); return (BUS_PROBE_DEFAULT); @@ -778,6 +780,8 @@ int len, tuple_size; int i; + device_printf( dev, "%s:%d\n", __FUNCTION__, __LINE__ ); + /* initialise some bus fields */ sc->sc_bus.parent = dev; sc->sc_bus.devices = sc->sc_devices; Modified: soc2012/aleek/beaglexm-armv6/sys/boot/fdt/dts/beagleboardxm.dts ============================================================================== --- soc2012/aleek/beaglexm-armv6/sys/boot/fdt/dts/beagleboardxm.dts Sat Jul 21 20:52:20 2012 (r239647) +++ soc2012/aleek/beaglexm-armv6/sys/boot/fdt/dts/beagleboardxm.dts Sat Jul 21 21:53:03 2012 (r239648) @@ -167,11 +167,11 @@ }; }; - ehci { - compatible = "ti, ehci", "usb-ehci"; + ehci@48064800 { + compatible = "ti, ehci"; reg = < 0x48064800 0x400 /* EHCI */ 0x48064000 0x400 /* UHH */ - 0x48062000 0x1000 /* TLL */ > + 0x48062000 0x1000 /* TLL */ >; interrupts = < 77 >; interrupt-parent = <&AINTC>; };
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20120721215304.7E1BE10657A1>