lkml.org 
[lkml]   [2019]   [Nov]   [22]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH AUTOSEL 4.19 029/219] ARM: OMAP1: fix USB configuration for device-only setups
    Date
    From: Aaro Koskinen <aaro.koskinen@iki.fi>

    [ Upstream commit c7b7b5cbd0c859b1546a5a3455d457708bdadf4c ]

    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>
    Signed-off-by: Tony Lindgren <tony@atomide.com>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    arch/arm/mach-omap1/Makefile | 2 +-
    arch/arm/mach-omap1/include/mach/usb.h | 2 +-
    2 files changed, 2 insertions(+), 2 deletions(-)

    diff --git a/arch/arm/mach-omap1/Makefile b/arch/arm/mach-omap1/Makefile
    index e8ccf51c6f292..ec0235899de20 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 77867778d4ec7..5429d86c7190d 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)
    --
    2.20.1
    \
     
     \ /
      Last update: 2019-11-22 07:30    [W:4.159 / U:0.020 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site