From: nicolas.ferre@atmel.com (Nicolas Ferre)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH] ARM: at91: Fix USB AT91 gadget registration
Date: Wed, 30 Nov 2011 17:20:30 +0100 [thread overview]
Message-ID: <4ED657CE.8000905@atmel.com> (raw)
In-Reply-To: <1322639264-24333-1-git-send-email-anders@chargestorm.se>
On 11/30/2011 08:47 AM, Anders Darander :
> Since 193ab2a6070039e7ee2b9b9bebea754a7c52fd1b, various AT91 boards don't
> register at91_udc anymore due to depending on a now non-existing symbol.
> Fix the symbol name.
>
> Signed-off-by: Anders Darander<anders@chargestorm.se>
Signed-off-by: Nicolas Ferre <nicolas.ferre@atmel.com>
I integrate this patch in an at91 "fixes" branch on:
https://github.com/at91linux/linux-at91/commits/at91-fixes
BTW, I changed the subject of your patch because it was close to another
one the we had written for the high speed USB gadget controller...
Thanks, best regards,
> ---
>
> Patched based on 3.2-rc3, but should apply to older and newer trees as well.
>
> Verified on a custom, at91sam9g20 based board.
>
> ---
> arch/arm/mach-at91/at91rm9200_devices.c | 2 +-
> arch/arm/mach-at91/at91sam9260_devices.c | 2 +-
> arch/arm/mach-at91/at91sam9261_devices.c | 2 +-
> arch/arm/mach-at91/at91sam9263_devices.c | 2 +-
> 4 files changed, 4 insertions(+), 4 deletions(-)
>
> diff --git a/arch/arm/mach-at91/at91rm9200_devices.c b/arch/arm/mach-at91/at91rm9200_devices.c
> index 66591fa..ad93068 100644
> --- a/arch/arm/mach-at91/at91rm9200_devices.c
> +++ b/arch/arm/mach-at91/at91rm9200_devices.c
> @@ -83,7 +83,7 @@ void __init at91_add_device_usbh(struct at91_usbh_data *data) {}
> * USB Device (Gadget)
> * -------------------------------------------------------------------- */
>
> -#ifdef CONFIG_USB_GADGET_AT91
> +#ifdef CONFIG_USB_AT91
> static struct at91_udc_data udc_data;
>
> static struct resource udc_resources[] = {
> diff --git a/arch/arm/mach-at91/at91sam9260_devices.c b/arch/arm/mach-at91/at91sam9260_devices.c
> index 25e3464..629fa97 100644
> --- a/arch/arm/mach-at91/at91sam9260_devices.c
> +++ b/arch/arm/mach-at91/at91sam9260_devices.c
> @@ -84,7 +84,7 @@ void __init at91_add_device_usbh(struct at91_usbh_data *data) {}
> * USB Device (Gadget)
> * -------------------------------------------------------------------- */
>
> -#ifdef CONFIG_USB_GADGET_AT91
> +#ifdef CONFIG_USB_AT91
> static struct at91_udc_data udc_data;
>
> static struct resource udc_resources[] = {
> diff --git a/arch/arm/mach-at91/at91sam9261_devices.c b/arch/arm/mach-at91/at91sam9261_devices.c
> index ae78f4d..a178b58 100644
> --- a/arch/arm/mach-at91/at91sam9261_devices.c
> +++ b/arch/arm/mach-at91/at91sam9261_devices.c
> @@ -87,7 +87,7 @@ void __init at91_add_device_usbh(struct at91_usbh_data *data) {}
> * USB Device (Gadget)
> * -------------------------------------------------------------------- */
>
> -#ifdef CONFIG_USB_GADGET_AT91
> +#ifdef CONFIG_USB_AT91
> static struct at91_udc_data udc_data;
>
> static struct resource udc_resources[] = {
> diff --git a/arch/arm/mach-at91/at91sam9263_devices.c b/arch/arm/mach-at91/at91sam9263_devices.c
> index ad017eb..d5fbac9 100644
> --- a/arch/arm/mach-at91/at91sam9263_devices.c
> +++ b/arch/arm/mach-at91/at91sam9263_devices.c
> @@ -92,7 +92,7 @@ void __init at91_add_device_usbh(struct at91_usbh_data *data) {}
> * USB Device (Gadget)
> * -------------------------------------------------------------------- */
>
> -#ifdef CONFIG_USB_GADGET_AT91
> +#ifdef CONFIG_USB_AT91
> static struct at91_udc_data udc_data;
>
> static struct resource udc_resources[] = {
--
Nicolas Ferre
WARNING: multiple messages have this Message-ID (diff)
From: Nicolas Ferre <nicolas.ferre@atmel.com>
To: Anders Darander <anders@chargestorm.se>
Cc: linux@maxim.org.za, plagnioj@jcrosoft.com,
linux@arm.linux.org.uk, linux-arm-kernel@lists.infradead.org,
linux-kernel@vger.kernel.org
Subject: Re: [PATCH] ARM: at91: Fix USB AT91 gadget registration
Date: Wed, 30 Nov 2011 17:20:30 +0100 [thread overview]
Message-ID: <4ED657CE.8000905@atmel.com> (raw)
In-Reply-To: <1322639264-24333-1-git-send-email-anders@chargestorm.se>
On 11/30/2011 08:47 AM, Anders Darander :
> Since 193ab2a6070039e7ee2b9b9bebea754a7c52fd1b, various AT91 boards don't
> register at91_udc anymore due to depending on a now non-existing symbol.
> Fix the symbol name.
>
> Signed-off-by: Anders Darander<anders@chargestorm.se>
Signed-off-by: Nicolas Ferre <nicolas.ferre@atmel.com>
I integrate this patch in an at91 "fixes" branch on:
https://github.com/at91linux/linux-at91/commits/at91-fixes
BTW, I changed the subject of your patch because it was close to another
one the we had written for the high speed USB gadget controller...
Thanks, best regards,
> ---
>
> Patched based on 3.2-rc3, but should apply to older and newer trees as well.
>
> Verified on a custom, at91sam9g20 based board.
>
> ---
> arch/arm/mach-at91/at91rm9200_devices.c | 2 +-
> arch/arm/mach-at91/at91sam9260_devices.c | 2 +-
> arch/arm/mach-at91/at91sam9261_devices.c | 2 +-
> arch/arm/mach-at91/at91sam9263_devices.c | 2 +-
> 4 files changed, 4 insertions(+), 4 deletions(-)
>
> diff --git a/arch/arm/mach-at91/at91rm9200_devices.c b/arch/arm/mach-at91/at91rm9200_devices.c
> index 66591fa..ad93068 100644
> --- a/arch/arm/mach-at91/at91rm9200_devices.c
> +++ b/arch/arm/mach-at91/at91rm9200_devices.c
> @@ -83,7 +83,7 @@ void __init at91_add_device_usbh(struct at91_usbh_data *data) {}
> * USB Device (Gadget)
> * -------------------------------------------------------------------- */
>
> -#ifdef CONFIG_USB_GADGET_AT91
> +#ifdef CONFIG_USB_AT91
> static struct at91_udc_data udc_data;
>
> static struct resource udc_resources[] = {
> diff --git a/arch/arm/mach-at91/at91sam9260_devices.c b/arch/arm/mach-at91/at91sam9260_devices.c
> index 25e3464..629fa97 100644
> --- a/arch/arm/mach-at91/at91sam9260_devices.c
> +++ b/arch/arm/mach-at91/at91sam9260_devices.c
> @@ -84,7 +84,7 @@ void __init at91_add_device_usbh(struct at91_usbh_data *data) {}
> * USB Device (Gadget)
> * -------------------------------------------------------------------- */
>
> -#ifdef CONFIG_USB_GADGET_AT91
> +#ifdef CONFIG_USB_AT91
> static struct at91_udc_data udc_data;
>
> static struct resource udc_resources[] = {
> diff --git a/arch/arm/mach-at91/at91sam9261_devices.c b/arch/arm/mach-at91/at91sam9261_devices.c
> index ae78f4d..a178b58 100644
> --- a/arch/arm/mach-at91/at91sam9261_devices.c
> +++ b/arch/arm/mach-at91/at91sam9261_devices.c
> @@ -87,7 +87,7 @@ void __init at91_add_device_usbh(struct at91_usbh_data *data) {}
> * USB Device (Gadget)
> * -------------------------------------------------------------------- */
>
> -#ifdef CONFIG_USB_GADGET_AT91
> +#ifdef CONFIG_USB_AT91
> static struct at91_udc_data udc_data;
>
> static struct resource udc_resources[] = {
> diff --git a/arch/arm/mach-at91/at91sam9263_devices.c b/arch/arm/mach-at91/at91sam9263_devices.c
> index ad017eb..d5fbac9 100644
> --- a/arch/arm/mach-at91/at91sam9263_devices.c
> +++ b/arch/arm/mach-at91/at91sam9263_devices.c
> @@ -92,7 +92,7 @@ void __init at91_add_device_usbh(struct at91_usbh_data *data) {}
> * USB Device (Gadget)
> * -------------------------------------------------------------------- */
>
> -#ifdef CONFIG_USB_GADGET_AT91
> +#ifdef CONFIG_USB_AT91
> static struct at91_udc_data udc_data;
>
> static struct resource udc_resources[] = {
--
Nicolas Ferre
next prev parent reply other threads:[~2011-11-30 16:20 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-11-30 7:47 [PATCH] ARM: at91: Fix USB gadget registration Anders Darander
2011-11-30 7:47 ` Anders Darander
2011-11-30 16:20 ` Nicolas Ferre [this message]
2011-11-30 16:20 ` [PATCH] ARM: at91: Fix USB AT91 " Nicolas Ferre
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=4ED657CE.8000905@atmel.com \
--to=nicolas.ferre@atmel.com \
--cc=linux-arm-kernel@lists.infradead.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.