Skip to content

Commit 46ddd79

Browse files
andy-shevFelipe Balbi
authored andcommitted
usb: gadget: udc: atmel: Remove AVR32 bits from the driver
AVR32 is gone. Now it's time to clean up the driver by removing leftovers that was used by AVR32 related code. Signed-off-by: Andy Shevchenko <[email protected]> Signed-off-by: Felipe Balbi <[email protected]>
1 parent e6d3856 commit 46ddd79

File tree

2 files changed

+1
-12
lines changed

2 files changed

+1
-12
lines changed

drivers/usb/gadget/udc/Kconfig

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ config USB_LPC32XX
5555

5656
config USB_ATMEL_USBA
5757
tristate "Atmel USBA"
58-
depends on ((AVR32 && !OF) || ARCH_AT91)
58+
depends on ARCH_AT91
5959
help
6060
USBA is the integrated high-speed USB Device controller on
6161
the AT32AP700x, some AT91SAM9 and AT91CAP9 processors from Atmel.

drivers/usb/gadget/udc/atmel_usba_udc.h

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -43,13 +43,8 @@
4343
#define USBA_REMOTE_WAKE_UP (1 << 10)
4444
#define USBA_PULLD_DIS (1 << 11)
4545

46-
#if defined(CONFIG_AVR32)
47-
#define USBA_ENABLE_MASK USBA_EN_USBA
48-
#define USBA_DISABLE_MASK 0
49-
#elif defined(CONFIG_ARCH_AT91)
5046
#define USBA_ENABLE_MASK (USBA_EN_USBA | USBA_PULLD_DIS)
5147
#define USBA_DISABLE_MASK USBA_DETACH
52-
#endif /* CONFIG_ARCH_AT91 */
5348

5449
/* Bitfields in FNUM */
5550
#define USBA_MICRO_FRAME_NUM_OFFSET 0
@@ -191,15 +186,9 @@
191186
| USBA_BF(name, value))
192187

193188
/* Register access macros */
194-
#ifdef CONFIG_AVR32
195-
#define usba_io_readl __raw_readl
196-
#define usba_io_writel __raw_writel
197-
#define usba_io_writew __raw_writew
198-
#else
199189
#define usba_io_readl readl_relaxed
200190
#define usba_io_writel writel_relaxed
201191
#define usba_io_writew writew_relaxed
202-
#endif
203192

204193
#define usba_readl(udc, reg) \
205194
usba_io_readl((udc)->regs + USBA_##reg)

0 commit comments

Comments
 (0)