diff options
| author | David Brownell <dbrownell@users.sourceforge.net> | 2009-01-25 01:56:25 (GMT) |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@kvm.kroah.org> | 2009-01-28 00:15:32 (GMT) |
| commit | 37daa925cf0d4dfd2d1d9ca01e2e0d74fba3d64a (patch) | |
| tree | 6760325baee1551d3f69f9a5eaf8b56ccabe5ce9 | |
| parent | 10b4eadef140b09baf8b9ec1df37185e69773275 (diff) | |
| download | linux-fsl-qoriq-37daa925cf0d4dfd2d1d9ca01e2e0d74fba3d64a.tar.xz | |
USB: musb_hdrc: another davinci buildfix (otg related)
The DaVinci code had an implementation of the OTG transceiver glue
too; make it use the new-standard one.
Signed-off-by: David Brownell <dbrownell@users.sourceforge.net>
Acked-by: Felipe Balbi <felipe.balbi@nokia.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
| -rw-r--r-- | arch/arm/mach-davinci/usb.c | 23 | ||||
| -rw-r--r-- | drivers/usb/musb/Kconfig | 1 |
2 files changed, 1 insertions, 23 deletions
diff --git a/arch/arm/mach-davinci/usb.c b/arch/arm/mach-davinci/usb.c index c6fb32c..867ead2 100644 --- a/arch/arm/mach-davinci/usb.c +++ b/arch/arm/mach-davinci/usb.c @@ -77,29 +77,6 @@ static struct platform_device usb_dev = { .num_resources = ARRAY_SIZE(usb_resources), }; -#ifdef CONFIG_USB_MUSB_OTG - -static struct otg_transceiver *xceiv; - -struct otg_transceiver *otg_get_transceiver(void) -{ - if (xceiv) - get_device(xceiv->dev); - return xceiv; -} -EXPORT_SYMBOL(otg_get_transceiver); - -int otg_set_transceiver(struct otg_transceiver *x) -{ - if (xceiv && x) - return -EBUSY; - xceiv = x; - return 0; -} -EXPORT_SYMBOL(otg_set_transceiver); - -#endif - void __init setup_usb(unsigned mA, unsigned potpgt_msec) { usb_data.power = mA / 2; diff --git a/drivers/usb/musb/Kconfig b/drivers/usb/musb/Kconfig index 5af7379..e1d81d8 100644 --- a/drivers/usb/musb/Kconfig +++ b/drivers/usb/musb/Kconfig @@ -11,6 +11,7 @@ config USB_MUSB_HDRC depends on (USB || USB_GADGET) && HAVE_CLK depends on !SUPERH select TWL4030_USB if MACH_OMAP_3430SDP + select USB_OTG_UTILS tristate 'Inventra Highspeed Dual Role Controller (TI, ADI, ...)' help Say Y here if your system has a dual role high speed USB |