diff options
| author | Alexander Shiyan <shc_work@mail.ru> | 2012-03-24 18:00:39 +0400 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2012-04-02 09:32:54 +0200 |
| commit | 9d9724e17842fc33ca7ccc70466039d3e65c7657 (patch) | |
| tree | 277fd44378a0218b4e8b799f627fcac69cb963aa /drivers | |
| parent | a2623f1712cb3957b7a0ba6b78623a34b9826a60 (diff) | |
| download | barebox-9d9724e17842fc33ca7ccc70466039d3e65c7657.tar.gz barebox-9d9724e17842fc33ca7ccc70466039d3e65c7657.tar.xz | |
Completely migrate option ISP1504 to ULPI
Since we do not have ISP1504-related functions, we migrated to ULPI.
Signed-off-by: Alexander Shiyan <shc_work@mail.ru>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/usb/otg/Kconfig | 8 | ||||
| -rw-r--r-- | drivers/usb/otg/Makefile | 1 | ||||
| -rw-r--r-- | drivers/usb/otg/isp1504.c | 10 | ||||
| -rw-r--r-- | drivers/usb/otg/ulpi.c | 11 |
4 files changed, 12 insertions, 18 deletions
diff --git a/drivers/usb/otg/Kconfig b/drivers/usb/otg/Kconfig index de09cf352b..2c5b789c8f 100644 --- a/drivers/usb/otg/Kconfig +++ b/drivers/usb/otg/Kconfig @@ -1,9 +1,7 @@ config USB_ULPI - bool - -config USB_ISP1504 - select USB_ULPI - bool "ISP1504 Tranceiver support" + bool "ULPI Tranceiver support" + help + Support for tranceivers that conforms ULPI specification. config USB_TWL4030 bool "TWL4030 Tranceiver support" diff --git a/drivers/usb/otg/Makefile b/drivers/usb/otg/Makefile index aa95cc9954..465a7f098c 100644 --- a/drivers/usb/otg/Makefile +++ b/drivers/usb/otg/Makefile @@ -1,4 +1,3 @@ obj-$(CONFIG_USB_ULPI) += ulpi.o -obj-$(CONFIG_USB_ISP1504) += isp1504.o obj-$(CONFIG_USB_TWL4030) += twl4030.o diff --git a/drivers/usb/otg/isp1504.c b/drivers/usb/otg/isp1504.c deleted file mode 100644 index 568ba72da4..0000000000 --- a/drivers/usb/otg/isp1504.c +++ /dev/null @@ -1,10 +0,0 @@ -#include <common.h> -#include <usb/ulpi.h> - -int isp1504_set_vbus_power(void __iomem *view, int on) -{ - if (ulpi_init(view)) - return -1; - - return ulpi_set_vbus(view, on); -} diff --git a/drivers/usb/otg/ulpi.c b/drivers/usb/otg/ulpi.c index 6d00ff07d4..662f78b195 100644 --- a/drivers/usb/otg/ulpi.c +++ b/drivers/usb/otg/ulpi.c @@ -160,7 +160,6 @@ int ulpi_probe(void __iomem *view) return -1; } -EXPORT_SYMBOL(ulpi_probe); int ulpi_set_vbus(void __iomem *view, int on) { @@ -184,4 +183,12 @@ int ulpi_set_vbus(void __iomem *view, int on) return ret; } -EXPORT_SYMBOL(ulpi_set_vbus); + +int ulpi_setup(void __iomem *view, int on) +{ + if (ulpi_probe(view)) + return -1; + + return ulpi_set_vbus(view, on); +} +EXPORT_SYMBOL(ulpi_setup); |