mirror of
https://github.com/torvalds/linux
synced 2024-09-22 12:26:27 +00:00
USB: atmel_usba_udc: change way of specifying bias function
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> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
This commit is contained in:
parent
23a54e5675
commit
e60c65d359
|
@ -326,13 +326,7 @@ static int vbus_is_present(struct usba_udc *udc)
|
||||||
return 1;
|
return 1;
|
||||||
}
|
}
|
||||||
|
|
||||||
#if defined(CONFIG_AVR32)
|
#if defined(CONFIG_ARCH_AT91SAM9RL)
|
||||||
|
|
||||||
static void toggle_bias(int is_on)
|
|
||||||
{
|
|
||||||
}
|
|
||||||
|
|
||||||
#elif defined(CONFIG_ARCH_AT91)
|
|
||||||
|
|
||||||
#include <mach/at91_pmc.h>
|
#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));
|
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)
|
static void next_fifo_transaction(struct usba_ep *ep, struct usba_request *req)
|
||||||
{
|
{
|
||||||
|
|
Loading…
Reference in a new issue