From: Tony Lindgren <tony@atomide.com>
To: Aaro Koskinen <aaro.koskinen@iki.fi>
Cc: linux-arm-kernel@lists.infradead.org, linux-omap@vger.kernel.org,
Felipe Balbi <balbi@ti.com>
Subject: Re: [PATCH v2 RESEND] ARM: OMAP1: fix omap_udc registration
Date: Mon, 8 Apr 2013 14:46:03 -0700 [thread overview]
Message-ID: <20130408214603.GW10155@atomide.com> (raw)
In-Reply-To: <1364846580-5256-1-git-send-email-aaro.koskinen@iki.fi>
* Aaro Koskinen <aaro.koskinen@iki.fi> [130401 13:07]:
> omap_udc platform device is not registered properly anymore:
> CONFIG_USB_GADGET_OMAP was deleted by 193ab2a6 (usb: gadget: allow
> multiple gadgets to be built) already in v3.1.
>
> Fix by using CONFIG_USB_OMAP instead. Tested on Nokia 770 by checking
> that omap_udc is probed & working properly when built as a module.
Thanks, applying into omap-for-v3.10/board.
Tony
> Acked-by: Felipe Balbi <balbi@ti.com>
> Signed-off-by: Aaro Koskinen <aaro.koskinen@iki.fi>
> ---
>
> Patch history:
>
> v2: http://marc.info/?t=136266319800006&r=1&w=2
> - use IS_ENABLED()
>
> v1: http://marc.info/?t=136260886600006&r=1&w=2
>
> arch/arm/mach-omap1/include/mach/usb.h | 2 +-
> arch/arm/mach-omap1/usb.c | 6 +++---
> 2 files changed, 4 insertions(+), 4 deletions(-)
>
> diff --git a/arch/arm/mach-omap1/include/mach/usb.h b/arch/arm/mach-omap1/include/mach/usb.h
> index 753cd5c..45e5ac7 100644
> --- a/arch/arm/mach-omap1/include/mach/usb.h
> +++ b/arch/arm/mach-omap1/include/mach/usb.h
> @@ -2,7 +2,7 @@
> * FIXME correct answer depends on hmc_mode,
> * as does (on omap1) any nonzero value for config->otg port number
> */
> -#ifdef CONFIG_USB_GADGET_OMAP
> +#if IS_ENABLED(CONFIG_USB_OMAP)
> #define is_usb0_device(config) 1
> #else
> #define is_usb0_device(config) 0
> diff --git a/arch/arm/mach-omap1/usb.c b/arch/arm/mach-omap1/usb.c
> index 1a1db59..4118db5 100644
> --- a/arch/arm/mach-omap1/usb.c
> +++ b/arch/arm/mach-omap1/usb.c
> @@ -123,7 +123,7 @@ omap_otg_init(struct omap_usb_config *config)
> syscon = omap_readl(OTG_SYSCON_1);
> syscon |= HST_IDLE_EN|DEV_IDLE_EN|OTG_IDLE_EN;
>
> -#ifdef CONFIG_USB_GADGET_OMAP
> +#if IS_ENABLED(CONFIG_USB_OMAP)
> if (config->otg || config->register_dev) {
> struct platform_device *udc_device = config->udc_device;
> int status;
> @@ -169,7 +169,7 @@ omap_otg_init(struct omap_usb_config *config)
> void omap_otg_init(struct omap_usb_config *config) {}
> #endif
>
> -#ifdef CONFIG_USB_GADGET_OMAP
> +#if IS_ENABLED(CONFIG_USB_OMAP)
>
> static struct resource udc_resources[] = {
> /* order is significant! */
> @@ -600,7 +600,7 @@ static void __init omap_1510_usb_init(struct omap_usb_config *config)
> while (!(omap_readw(ULPD_DPLL_CTRL) & DPLL_LOCK))
> cpu_relax();
>
> -#ifdef CONFIG_USB_GADGET_OMAP
> +#if IS_ENABLED(CONFIG_USB_OMAP)
> if (config->register_dev) {
> int status;
>
> --
> 1.7.10.4
>
> --
> To unsubscribe from this list: send the line "unsubscribe linux-omap" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at http://vger.kernel.org/majordomo-info.html
WARNING: multiple messages have this Message-ID (diff)
From: tony@atomide.com (Tony Lindgren)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH v2 RESEND] ARM: OMAP1: fix omap_udc registration
Date: Mon, 8 Apr 2013 14:46:03 -0700 [thread overview]
Message-ID: <20130408214603.GW10155@atomide.com> (raw)
In-Reply-To: <1364846580-5256-1-git-send-email-aaro.koskinen@iki.fi>
* Aaro Koskinen <aaro.koskinen@iki.fi> [130401 13:07]:
> omap_udc platform device is not registered properly anymore:
> CONFIG_USB_GADGET_OMAP was deleted by 193ab2a6 (usb: gadget: allow
> multiple gadgets to be built) already in v3.1.
>
> Fix by using CONFIG_USB_OMAP instead. Tested on Nokia 770 by checking
> that omap_udc is probed & working properly when built as a module.
Thanks, applying into omap-for-v3.10/board.
Tony
> Acked-by: Felipe Balbi <balbi@ti.com>
> Signed-off-by: Aaro Koskinen <aaro.koskinen@iki.fi>
> ---
>
> Patch history:
>
> v2: http://marc.info/?t=136266319800006&r=1&w=2
> - use IS_ENABLED()
>
> v1: http://marc.info/?t=136260886600006&r=1&w=2
>
> arch/arm/mach-omap1/include/mach/usb.h | 2 +-
> arch/arm/mach-omap1/usb.c | 6 +++---
> 2 files changed, 4 insertions(+), 4 deletions(-)
>
> diff --git a/arch/arm/mach-omap1/include/mach/usb.h b/arch/arm/mach-omap1/include/mach/usb.h
> index 753cd5c..45e5ac7 100644
> --- a/arch/arm/mach-omap1/include/mach/usb.h
> +++ b/arch/arm/mach-omap1/include/mach/usb.h
> @@ -2,7 +2,7 @@
> * FIXME correct answer depends on hmc_mode,
> * as does (on omap1) any nonzero value for config->otg port number
> */
> -#ifdef CONFIG_USB_GADGET_OMAP
> +#if IS_ENABLED(CONFIG_USB_OMAP)
> #define is_usb0_device(config) 1
> #else
> #define is_usb0_device(config) 0
> diff --git a/arch/arm/mach-omap1/usb.c b/arch/arm/mach-omap1/usb.c
> index 1a1db59..4118db5 100644
> --- a/arch/arm/mach-omap1/usb.c
> +++ b/arch/arm/mach-omap1/usb.c
> @@ -123,7 +123,7 @@ omap_otg_init(struct omap_usb_config *config)
> syscon = omap_readl(OTG_SYSCON_1);
> syscon |= HST_IDLE_EN|DEV_IDLE_EN|OTG_IDLE_EN;
>
> -#ifdef CONFIG_USB_GADGET_OMAP
> +#if IS_ENABLED(CONFIG_USB_OMAP)
> if (config->otg || config->register_dev) {
> struct platform_device *udc_device = config->udc_device;
> int status;
> @@ -169,7 +169,7 @@ omap_otg_init(struct omap_usb_config *config)
> void omap_otg_init(struct omap_usb_config *config) {}
> #endif
>
> -#ifdef CONFIG_USB_GADGET_OMAP
> +#if IS_ENABLED(CONFIG_USB_OMAP)
>
> static struct resource udc_resources[] = {
> /* order is significant! */
> @@ -600,7 +600,7 @@ static void __init omap_1510_usb_init(struct omap_usb_config *config)
> while (!(omap_readw(ULPD_DPLL_CTRL) & DPLL_LOCK))
> cpu_relax();
>
> -#ifdef CONFIG_USB_GADGET_OMAP
> +#if IS_ENABLED(CONFIG_USB_OMAP)
> if (config->register_dev) {
> int status;
>
> --
> 1.7.10.4
>
> --
> To unsubscribe from this list: send the line "unsubscribe linux-omap" in
> the body of a message to majordomo at vger.kernel.org
> More majordomo info at http://vger.kernel.org/majordomo-info.html
next prev parent reply other threads:[~2013-04-08 21:46 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-04-01 20:03 [PATCH v2 RESEND] ARM: OMAP1: fix omap_udc registration Aaro Koskinen
2013-04-01 20:03 ` Aaro Koskinen
2013-04-08 21:46 ` Tony Lindgren [this message]
2013-04-08 21:46 ` Tony Lindgren
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20130408214603.GW10155@atomide.com \
--to=tony@atomide.com \
--cc=aaro.koskinen@iki.fi \
--cc=balbi@ti.com \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-omap@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.