[PATCH] atmel_usba_udc: change way of specifying bias function

[PATCH] atmel_usba_udc: change way of specifying bias function

[Nicolas Ferre]

The toggle_bias() function was specified differently for avr32 and at91
architectures. Now, new at91 have the same behavior as avr32.
Consequently, we change to a particular chip function definition: only for
at91sam9rl.

Signed-off-by: Nicolas Ferre <nicolas.ferre@atmel.com>
Acked-by: Haavard Skinnemoen <haavard.skinnemoen@atmel.com>
---

 drivers/usb/gadget/atmel_usba_udc.c |   16 ++++++++--------
 1 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/drivers/usb/gadget/atmel_usba_udc.c b/drivers/usb/gadget/atmel_usba_udc.c
index 563d572..a31df12 100644
--- a/drivers/usb/gadget/atmel_usba_udc.c
+++ b/drivers/usb/gadget/atmel_usba_udc.c
@@ -326,13 +326,7 @@ static int vbus_is_present(struct usba_udc *udc)
 	return 1;
 }
 
-#if defined(CONFIG_AVR32)
-
-static void toggle_bias(int is_on)
-{
-}
-
-#elif defined(CONFIG_ARCH_AT91)
+#if defined(CONFIG_ARCH_AT91SAM9RL)
 
 #include <mach/at91_pmc.h>
 
@@ -346,7 +340,13 @@ static void toggle_bias(int is_on)
 		at91_sys_write(AT91_CKGR_UCKR, uckr & ~(AT91_PMC_BIASEN));
 }
 
-#endif /* CONFIG_ARCH_AT91 */
+#else
+
+static void toggle_bias(int is_on)
+{
+}
+
+#endif /* CONFIG_ARCH_AT91SAM9RL */
 
 static void next_fifo_transaction(struct usba_ep *ep, struct usba_request *req)
 {
-- 
1.5.3.7

Re: [PATCH] atmel_usba_udc: change way of specifying bias function

[David Brownell]

On Friday 05 June 2009, Nicolas Ferre wrote:
> The toggle_bias() function was specified differently for avr32 and at91
> architectures. Now, new at91 have the same behavior as avr32.
> Consequently, we change to a particular chip function definition: only for
> at91sam9rl.
> 
> Signed-off-by: Nicolas Ferre <nicolas.ferre@atmel.com>
> Acked-by: Haavard Skinnemoen <haavard.skinnemoen@atmel.com>

Acked-by: David Brownell <dbrownell@users.sourceforge.net>



> ---
> 
>  drivers/usb/gadget/atmel_usba_udc.c |   16 ++++++++--------
>  1 files changed, 8 insertions(+), 8 deletions(-)
> 
> diff --git a/drivers/usb/gadget/atmel_usba_udc.c b/drivers/usb/gadget/atmel_usba_udc.c
> index 563d572..a31df12 100644
> --- a/drivers/usb/gadget/atmel_usba_udc.c
> +++ b/drivers/usb/gadget/atmel_usba_udc.c
> @@ -326,13 +326,7 @@ static int vbus_is_present(struct usba_udc *udc)
>  	return 1;
>  }
>  
> -#if defined(CONFIG_AVR32)
> -
> -static void toggle_bias(int is_on)
> -{
> -}
> -
> -#elif defined(CONFIG_ARCH_AT91)
> +#if defined(CONFIG_ARCH_AT91SAM9RL)
>  
>  #include <mach/at91_pmc.h>
>  
> @@ -346,7 +340,13 @@ static void toggle_bias(int is_on)
>  		at91_sys_write(AT91_CKGR_UCKR, uckr & ~(AT91_PMC_BIASEN));
>  }
>  
> -#endif /* CONFIG_ARCH_AT91 */
> +#else
> +
> +static void toggle_bias(int is_on)
> +{
> +}
> +
> +#endif /* CONFIG_ARCH_AT91SAM9RL */
>  
>  static void next_fifo_transaction(struct usba_ep *ep, struct usba_request *req)
>  {
> -- 
> 1.5.3.7
> 
>