Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

USB: move isp1301_omap to drivers/usb/otg

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 <dbrownell@users.sourceforge.net>
Acked-by: Jean Delvare <khali@linux-fr.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

authored by

David Brownell and committed by
Greg Kroah-Hartman
b8da8677 ea99ecfd

+42 -13
+1
drivers/Makefile
··· 57 57 obj-$(CONFIG_PARIDE) += block/paride/ 58 58 obj-$(CONFIG_TC) += tc/ 59 59 obj-$(CONFIG_UWB) += uwb/ 60 + obj-$(CONFIG_USB_OTG_UTILS) += usb/otg/ 60 61 obj-$(CONFIG_USB) += usb/ 61 62 obj-$(CONFIG_USB_MUSB_HDRC) += usb/musb/ 62 63 obj-$(CONFIG_PCI) += usb/
-12
drivers/i2c/chips/Kconfig
··· 114 114 These devices are hard to detect and rarely found on mainstream 115 115 hardware. If unsure, say N. 116 116 117 - config ISP1301_OMAP 118 - tristate "Philips ISP1301 with OMAP OTG" 119 - depends on ARCH_OMAP_OTG 120 - help 121 - If you say yes here you get support for the Philips ISP1301 122 - USB-On-The-Go transceiver working with the OMAP OTG controller. 123 - The ISP1301 is used in products including H2 and H3 development 124 - boards for Texas Instruments OMAP processors. 125 - 126 - This driver can also be built as a module. If so, the module 127 - will be called isp1301_omap. 128 - 129 117 config SENSORS_MAX6875 130 118 tristate "Maxim MAX6875 Power supply supervisor" 131 119 depends on EXPERIMENTAL
-1
drivers/i2c/chips/Makefile
··· 18 18 obj-$(CONFIG_SENSORS_PCF8574) += pcf8574.o 19 19 obj-$(CONFIG_PCF8575) += pcf8575.o 20 20 obj-$(CONFIG_SENSORS_PCF8591) += pcf8591.o 21 - obj-$(CONFIG_ISP1301_OMAP) += isp1301_omap.o 22 21 obj-$(CONFIG_SENSORS_TSL2550) += tsl2550.o 23 22 obj-$(CONFIG_MCU_MPC8349EMITX) += mcu_mpc8349emitx.o 24 23
drivers/i2c/chips/isp1301_omap.c drivers/usb/otg/isp1301_omap.c
+2
drivers/usb/Kconfig
··· 150 150 151 151 source "drivers/usb/gadget/Kconfig" 152 152 153 + source "drivers/usb/otg/Kconfig" 154 + 153 155 endif # USB_SUPPORT
+31
drivers/usb/otg/Kconfig
··· 1 + # 2 + # USB OTG infrastructure may be needed for peripheral-only, host-only, 3 + # or OTG-capable configurations when OTG transceivers or controllers 4 + # are used. 5 + # 6 + 7 + comment "OTG and related infrastructure" 8 + 9 + if USB || USB_GADGET 10 + 11 + config USB_OTG_UTILS 12 + bool 13 + help 14 + Select this to make sure the build includes objects from 15 + the OTG infrastructure directory. 16 + 17 + config ISP1301_OMAP 18 + tristate "Philips ISP1301 with OMAP OTG" 19 + depends on I2C && ARCH_OMAP_OTG 20 + select USB_OTG_UTILS 21 + help 22 + If you say yes here you get support for the Philips ISP1301 23 + USB-On-The-Go transceiver working with the OMAP OTG controller. 24 + The ISP1301 is a full speed USB transceiver which is used in 25 + products including H2, H3, and H4 development boards for Texas 26 + Instruments OMAP processors. 27 + 28 + This driver can also be built as a module. If so, the module 29 + will be called isp1301_omap. 30 + 31 + endif # USB || OTG
+8
drivers/usb/otg/Makefile
··· 1 + obj-$(CONFIG_ISP1301_OMAP) += isp1301_omap.o 2 + 3 + ifeq ($(CONFIG_USB_DEBUG),y) 4 + EXTRA_CFLAGS += -DDEBUG 5 + else ifeq ($(CONFIG_USB_GADGET_DEBUG),y) 6 + EXTRA_CFLAGS += -DDEBUG 7 + endif 8 +