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 <andriy.shevchenko@linux.intel.com>
Signed-off-by: Felipe Balbi <felipe.balbi@linux.intel.com>

diff --git a/drivers/usb/gadget/udc/Kconfig b/drivers/usb/gadget/udc/Kconfig
index e5d3ba9a8604d3e5d7b1954a1c5a418434bb06ba..9ffb11ec9ed961eb157a7c35e43a5d3a01b651b8 100644 (file)
--- a/drivers/usb/gadget/udc/Kconfig
+++ b/drivers/usb/gadget/udc/Kconfig
@@ -55,7 +55,7 @@ config USB_LPC32XX
 
 config USB_ATMEL_USBA
        tristate "Atmel USBA"
-       depends on ((AVR32 && !OF) || ARCH_AT91)
+       depends on ARCH_AT91
        help
          USBA is the integrated high-speed USB Device controller on
          the AT32AP700x, some AT91SAM9 and AT91CAP9 processors from Atmel.

diff --git a/drivers/usb/gadget/udc/atmel_usba_udc.h b/drivers/usb/gadget/udc/atmel_usba_udc.h
index 9551b704bfd3e7df9bc8f12fdbed89b28fac012f..433bed0c481ed00a18c63f8a08030319ce81e3b9 100644 (file)
--- a/drivers/usb/gadget/udc/atmel_usba_udc.h
+++ b/drivers/usb/gadget/udc/atmel_usba_udc.h
@@ -43,13 +43,8 @@
 #define USBA_REMOTE_WAKE_UP                    (1 << 10)
 #define USBA_PULLD_DIS                         (1 << 11)
 
-#if defined(CONFIG_AVR32)
-#define USBA_ENABLE_MASK                       USBA_EN_USBA
-#define USBA_DISABLE_MASK                      0
-#elif defined(CONFIG_ARCH_AT91)
 #define USBA_ENABLE_MASK                       (USBA_EN_USBA | USBA_PULLD_DIS)
 #define USBA_DISABLE_MASK                      USBA_DETACH
-#endif /* CONFIG_ARCH_AT91 */
 
 /* Bitfields in FNUM */
 #define USBA_MICRO_FRAME_NUM_OFFSET            0
@@ -191,15 +186,9 @@
         | USBA_BF(name, value))
 
 /* Register access macros */
-#ifdef CONFIG_AVR32
-#define usba_io_readl  __raw_readl
-#define usba_io_writel __raw_writel
-#define usba_io_writew __raw_writew
-#else
 #define usba_io_readl  readl_relaxed
 #define usba_io_writel writel_relaxed
 #define usba_io_writew writew_relaxed
-#endif
 
 #define usba_readl(udc, reg)                                   \
        usba_io_readl((udc)->regs + USBA_##reg)