ARM: OMAP1: fix USB configuration for device-only setups
diff mbox series

Message ID 20181204175742.2634-1-aaro.koskinen@iki.fi
State Accepted
Commit c7b7b5cbd0c859b1546a5a3455d457708bdadf4c
Headers show
Series
  • ARM: OMAP1: fix USB configuration for device-only setups
Related show

Commit Message

Aaro Koskinen Dec. 4, 2018, 5:57 p.m. UTC
Currently we do USB configuration only if the host mode (CONFIG_USB)
is enabled. But it should be done also in the case of device-only setups,
so change the condition to CONFIG_USB_SUPPORT. This allows to use
omap_udc on Palm Tungsten E.

Signed-off-by: Aaro Koskinen <aaro.koskinen@iki.fi>
---
 arch/arm/mach-omap1/Makefile           | 2 +-
 arch/arm/mach-omap1/include/mach/usb.h | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

Comments

Tony Lindgren Dec. 11, 2018, 4:17 p.m. UTC | #1
* Aaro Koskinen <aaro.koskinen@iki.fi> [181204 09:58]:
> Currently we do USB configuration only if the host mode (CONFIG_USB)
> is enabled. But it should be done also in the case of device-only setups,
> so change the condition to CONFIG_USB_SUPPORT. This allows to use
> omap_udc on Palm Tungsten E.

I'll apply this into omap-for-v4.21/omap1 as it seems that it's
been broken for ages :) Let me know if there is urgent need for
the -rc cycle.

Regards,

Tony

Patch
diff mbox series

diff --git a/arch/arm/mach-omap1/Makefile b/arch/arm/mach-omap1/Makefile
index e8ccf51c6f29..ec0235899de2 100644
--- a/arch/arm/mach-omap1/Makefile
+++ b/arch/arm/mach-omap1/Makefile
@@ -25,7 +25,7 @@  obj-y					+= $(i2c-omap-m) $(i2c-omap-y)
 
 led-y := leds.o
 
-usb-fs-$(CONFIG_USB)			:= usb.o
+usb-fs-$(CONFIG_USB_SUPPORT)		:= usb.o
 obj-y					+= $(usb-fs-m) $(usb-fs-y)
 
 # Specific board support
diff --git a/arch/arm/mach-omap1/include/mach/usb.h b/arch/arm/mach-omap1/include/mach/usb.h
index 77867778d4ec..5429d86c7190 100644
--- a/arch/arm/mach-omap1/include/mach/usb.h
+++ b/arch/arm/mach-omap1/include/mach/usb.h
@@ -11,7 +11,7 @@ 
 
 #include <linux/platform_data/usb-omap1.h>
 
-#if IS_ENABLED(CONFIG_USB)
+#if IS_ENABLED(CONFIG_USB_SUPPORT)
 void omap1_usb_init(struct omap_usb_config *pdata);
 #else
 static inline void omap1_usb_init(struct omap_usb_config *pdata)