* [PATCH] ARM: at91: Fix USB gadget registration
@ 2011-11-30 7:47 ` Anders Darander
0 siblings, 0 replies; 4+ messages in thread
From: Anders Darander @ 2011-11-30 7:47 UTC (permalink / raw)
To: linux, nicolas.ferre, plagnioj, linux
Cc: linux-arm-kernel, linux-kernel, 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>
---
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[] = {
--
1.7.7.3
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [PATCH] ARM: at91: Fix USB gadget registration
@ 2011-11-30 7:47 ` Anders Darander
0 siblings, 0 replies; 4+ messages in thread
From: Anders Darander @ 2011-11-30 7:47 UTC (permalink / raw)
To: linux-arm-kernel
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>
---
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[] = {
--
1.7.7.3
^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: [PATCH] ARM: at91: Fix USB AT91 gadget registration
2011-11-30 7:47 ` Anders Darander
@ 2011-11-30 16:20 ` Nicolas Ferre
-1 siblings, 0 replies; 4+ messages in thread
From: Nicolas Ferre @ 2011-11-30 16:20 UTC (permalink / raw)
To: Anders Darander; +Cc: linux, plagnioj, linux, linux-arm-kernel, linux-kernel
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
^ permalink raw reply [flat|nested] 4+ messages in thread
* [PATCH] ARM: at91: Fix USB AT91 gadget registration
@ 2011-11-30 16:20 ` Nicolas Ferre
0 siblings, 0 replies; 4+ messages in thread
From: Nicolas Ferre @ 2011-11-30 16:20 UTC (permalink / raw)
To: linux-arm-kernel
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
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2011-11-30 16:21 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
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 ` [PATCH] ARM: at91: Fix USB AT91 " Nicolas Ferre
2011-11-30 16:20 ` Nicolas Ferre
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.