USB: OMAP: ISP1301 needs USB_PHY (c3c683ea) · Commits · 戴 / test

The Kconfig entry for USB_OMAP unconditionally selects USB_ISP1301, which is now only visible when USB_PHY is also enabled. This adds an appropriate dependency and enables USB_PHY in the omap1 defconfig, avoiding these build warnings: warning: (USB_OHCI_HCD && USB_OMAP) selects ISP1301_OMAP which has unmet direct dependencies (USB_SUPPORT && USB_PHY && I2C && ARCH_OMAP_OTG) Also fix a Makefile typo while we're at it. Signed-off-by:

Arnd Bergmann <arnd@arndb.de> Cc: Felipe Balbi <balbi@ti.com> Signed-off-by:

Greg Kroah-Hartman <gregkh@linuxfoundation.org>

arch/arm/configs/omap1_defconfig

+1 −0

Original line number	Diff line number	Diff line
		@@ -195,6 +195,7 @@ CONFIG_SND_SOC=y
		CONFIG_SND_OMAP_SOC=y
		# CONFIG_USB_HID is not set
		CONFIG_USB=y
		CONFIG_USB_PHY=y
		CONFIG_USB_DEBUG=y
		CONFIG_USB_DEVICEFS=y
		# CONFIG_USB_DEVICE_CLASS is not set

drivers/usb/gadget/Kconfig

+1 −0

Original line number	Diff line number	Diff line
		@@ -196,6 +196,7 @@ config USB_FUSB300
		config USB_OMAP
		tristate "OMAP USB Device Controller"
		depends on ARCH_OMAP1
		depends on USB_PHY
		select ISP1301_OMAP if MACH_OMAP_H2 \|\| MACH_OMAP_H3 \|\| MACH_OMAP_H4_OTG
		help
		Many Texas Instruments OMAP processors have flexible full

drivers/usb/phy/Makefile

+1 −1

Original line number	Diff line number	Diff line
		@@ -11,7 +11,7 @@ obj-$(CONFIG_USB_PHY) += phy.o
		obj-$(CONFIG_AB8500_USB) += phy-ab8500-usb.o
		phy-fsl-usb2-objs := phy-fsl-usb.o phy-fsm-usb.o
		obj-$(CONFIG_FSL_USB2_OTG) += phy-fsl-usb2.o
		obj-$(CONFIG_ISP1301_OMAP) += phy-isp1301.omap.o
		obj-$(CONFIG_ISP1301_OMAP) += phy-isp1301-omap.o
		obj-$(CONFIG_MV_U3D_PHY) += phy-mv-u3d-usb.o
		obj-$(CONFIG_NOP_USB_XCEIV) += phy-nop.o
		obj-$(CONFIG_OMAP_CONTROL_USB) += phy-omap-control.o

Admin message