Commit b8da8677 authored by David Brownell's avatar David Brownell Committed by Greg Kroah-Hartman
Browse files

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: default avatarDavid Brownell <dbrownell@users.sourceforge.net>
Acked-by: default avatarJean Delvare <khali@linux-fr.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent ea99ecfd

drivers/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -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
Original line number Diff line number Diff line
@@ -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 SENSORS_MAX6875

	tristate "Maxim MAX6875 Power supply supervisor"

	depends on EXPERIMENTAL

drivers/i2c/chips/Makefile

+0 −1
Original line number Diff line number Diff line
@@ -18,7 +18,6 @@ obj-$(CONFIG_SENSORS_PCA9539) += pca9539.o 
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_SENSORS_TSL2550)	+= tsl2550.o

obj-$(CONFIG_MCU_MPC8349EMITX)	+= mcu_mpc8349emitx.o

drivers/usb/Kconfig

+2 −0
Original line number Diff line number Diff line
@@ -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

0 → 100644
+31 −0
Original line number Diff line number Diff line 
#

# 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

CRA Git | Maintained and supported by SUSTech CRA and CCSE