move drivers/i2c/chips/twl4030-usb.c

Move one more OMAP-specific driver out of the drivers/i2c/chips
directory ... in this case, a driver that's not yet upstream,
but is verging on being mainline-ready once it moves.

Signed-off-by: David Brownell <dbrownell@users.sourceforge.net>
Signed-off-by: Tony Lindgren <tony@atomide.com>

diff --git a/drivers/i2c/chips/Kconfig b/drivers/i2c/chips/Kconfig
index 19424693fa9605cceb222df112393bb6a9fd2586..2ca170bc7e0d2c4ec82d8e40ac9fadf4093c9184 100644 (file)
--- a/drivers/i2c/chips/Kconfig
+++ b/drivers/i2c/chips/Kconfig
@@ -148,10 +148,6 @@ config TWL4030_MADC
          to build it as a dinamically loadable module. The module will be
          called twl4030-madc.ko
 
-config TWL4030_USB
-       tristate "TWL4030 USB Transceiver Driver"
-       depends on TWL4030_CORE
-
 config TWL4030_PWRBUTTON
        tristate "TWL4030 Power button Driver"
        depends on TWL4030_CORE

diff --git a/drivers/i2c/chips/Makefile b/drivers/i2c/chips/Makefile
index 43ab153296cd363a442ad9b9136338c4d850f66a..417e7fb7f7d29370cafe8e726c66d0e32a7089aa 100644 (file)
--- a/drivers/i2c/chips/Makefile
+++ b/drivers/i2c/chips/Makefile
@@ -22,7 +22,6 @@ obj-$(CONFIG_TPS65010)                += tps65010.o
 obj-$(CONFIG_MENELAUS)         += menelaus.o
 obj-$(CONFIG_SENSORS_TSL2550)  += tsl2550.o
 obj-$(CONFIG_MCU_MPC8349EMITX) += mcu_mpc8349emitx.o
-obj-$(CONFIG_TWL4030_USB)      += twl4030-usb.o
 obj-$(CONFIG_TWL4030_POWEROFF) += twl4030-poweroff.o
 obj-$(CONFIG_TWL4030_PWRBUTTON)        += twl4030-pwrbutton.o
 obj-$(CONFIG_TWL4030_MADC)     += twl4030-madc.o

diff --git a/drivers/usb/otg/Kconfig b/drivers/usb/otg/Kconfig
index afe91bfea7f2d684777e39b8bdc0dbb53ab01877..b1cf38bb6b3a3be547fe0317826c2cdb1b26b251 100644 (file)
--- a/drivers/usb/otg/Kconfig
+++ b/drivers/usb/otg/Kconfig
@@ -41,4 +41,14 @@ config ISP1301_OMAP
          This driver can also be built as a module.  If so, the module
          will be called isp1301_omap.
 
+config TWL4030_USB
+       tristate "TWL4030 USB Transceiver Driver"
+       depends on TWL4030_CORE
+       select USB_OTG_UTILS
+       help
+         Enable this to support the USB OTG transceiver on TWL4030
+         family chips (including the TWL5030 and TPS659x0 devices).
+         This is transceiver supports high and full speed devices
+         plus, in host mode, low speed.
+
 endif # USB || OTG

diff --git a/drivers/usb/otg/Makefile b/drivers/usb/otg/Makefile
index 7c80fc379e6a09085d21356602b8f04ec3e65616..d73c7cf5e2f789674492cf5c4bdf609fa1c58b06 100644 (file)
--- a/drivers/usb/otg/Makefile
+++ b/drivers/usb/otg/Makefile
@@ -8,6 +8,7 @@ obj-$(CONFIG_USB_OTG_UTILS)     += otg.o
 # transceiver drivers
 obj-$(CONFIG_USB_GPIO_VBUS)    += gpio_vbus.o
 obj-$(CONFIG_ISP1301_OMAP)     += isp1301_omap.o
+obj-$(CONFIG_TWL4030_USB)      += twl4030-usb.o
 
 ccflags-$(CONFIG_USB_DEBUG)    += -DDEBUG
 ccflags-$(CONFIG_USB_GADGET_DEBUG) += -DDEBUG

diff --git a/drivers/i2c/chips/twl4030-usb.c b/drivers/usb/otg/twl4030-usb.c
similarity index 100%
rename from drivers/i2c/chips/twl4030-usb.c
rename to drivers/usb/otg/twl4030-usb.c