move drivers/i2c/chips/isp1301-omap.c
Subsystems (2)
PATCH 1/5 move drivers/i2c/chips/isp1301-omap.c
From: David Brownell <[email protected]>
This moves the isp1301-omap driver from the drivers/i2c/chips directory (which will be shrinking) into a new drivers/usb/otg directory (which will grow, with more drivers and utilities).
Note that OTG infrastructure needs to be initialized before either host or peripheral side USB support, and may be needed before for pure host or pure peripheral configurations.
Signed-off-by David Brownell <[email protected]>
Acked-by Jean Delvare <[email protected]>
Signed-off-by Greg Kroah-Hartman <[email protected]>
--- drivers/Makefile | 1 drivers/i2c/chips/Kconfig | 12 drivers/i2c/chips/Makefile | 1 drivers/i2c/chips/isp1301_omap.c | 1683 ------------------------------------- drivers/usb/Kconfig | 2 drivers/usb/otg/Kconfig | 31 drivers/usb/otg/Makefile | 8 drivers/usb/otg/isp1301_omap.c | 1683 +++++++++++++++++++++++++++++++++++++ 8 files changed, 1725 insertions(+), 1696 deletions(-)
drivers/Makefile +1 -0
@@ -57,6 +57,7 @@ obj-$(CONFIG_ATA_OVER_ETH) += block/aoe/ obj-$(CONFIG_PARIDE) += block/paride/ obj-$(CONFIG_TC) += tc/ obj-$(CONFIG_UWB) += uwb/ +obj-$(CONFIG_USB_OTG_UTILS) += usb/otg/ obj-$(CONFIG_USB) += usb/ obj-$(CONFIG_USB_MUSB_HDRC) += usb/musb/ obj-$(CONFIG_PCI) += usb/
drivers/i2c/chips/Kconfig +0 -12
@@ -114,18 +114,6 @@ config SENSORS_PCF8591 These devices are hard to detect and rarely found on mainstream hardware. If unsure, say N. -config ISP1301_OMAP - tristate "Philips ISP1301 with OMAP OTG" - depends on ARCH_OMAP_OTG - help - If you say yes here you get support for the Philips ISP1301 - USB-On-The-Go transceiver working with the OMAP OTG controller. - The ISP1301 is used in products including H2 and H3 development - boards for Texas Instruments OMAP processors. - - This driver can also be built as a module. If so, the module - will be called isp1301_omap. - config TPS65010 tristate "TPS6501x Power Management chips" depends on GPIOLIB
drivers/i2c/chips/Makefile +0 -1
@@ -18,7 +18,6 @@ obj-$(CONFIG_SENSORS_PCA9539) += pca9539 obj-$(CONFIG_SENSORS_PCF8574) += pcf8574.o obj-$(CONFIG_PCF8575) += pcf8575.o obj-$(CONFIG_SENSORS_PCF8591) += pcf8591.o -obj-$(CONFIG_ISP1301_OMAP) += isp1301_omap.o obj-$(CONFIG_TPS65010) += tps65010.o obj-$(CONFIG_MENELAUS) += menelaus.o obj-$(CONFIG_SENSORS_TSL2550) += tsl2550.o
drivers/i2c/chips/isp1301_omap.c deleted +0 -1683
1,683 lines not on this page · raw message
drivers/usb/Kconfig +2 -0
@@ -150,4 +150,6 @@ source "drivers/usb/atm/Kconfig" source "drivers/usb/gadget/Kconfig" +source "drivers/usb/otg/Kconfig" + endif # USB_SUPPORT
drivers/usb/otg/Kconfig new file +31 -0
@@ -0,0 +1,31 @@ +# +# USB OTG infrastructure may be needed for peripheral-only, host-only, +# or OTG-capable configurations when OTG transceivers or controllers +# are used. +# + +comment "OTG and related infrastructure" + +if USB || USB_GADGET + +config USB_OTG_UTILS + bool + help + Select this to make sure the build includes objects from + the OTG infrastructure directory. + +config ISP1301_OMAP + tristate "Philips ISP1301 with OMAP OTG" + depends on I2C && ARCH_OMAP_OTG + select USB_OTG_UTILS + help + If you say yes here you get support for the Philips ISP1301 + USB-On-The-Go transceiver working with the OMAP OTG controller. + The ISP1301 is a full speed USB transceiver which is used in + products including H2, H3, and H4 development boards for Texas + Instruments OMAP processors. + + This driver can also be built as a module. If so, the module + will be called isp1301_omap. + +endif # USB || OTG
drivers/usb/otg/Makefile new file +8 -0
@@ -0,0 +1,8 @@ +obj-$(CONFIG_ISP1301_OMAP) += isp1301_omap.o + +ifeq ($(CONFIG_USB_DEBUG),y) +EXTRA_CFLAGS += -DDEBUG +else ifeq ($(CONFIG_USB_GADGET_DEBUG),y) +EXTRA_CFLAGS += -DDEBUG +endif +
drivers/usb/otg/isp1301_omap.c new file +1683 -0
1,240 lines not on this page · raw message
The rest of this diff is not shown. View the raw message.
Part of the diff is not shown here. View the raw message.