Merge tag 'at91-cleanup-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc

Pull ARM SoC cleanup on mach-at91 from Arnd Bergmann:
 "On Atmel AT91, the conversion to device tree is now considered
  complete, and all machines that were not already converted in 3.18 are
  assumed to be unused and dropped by the maintainer.

  All remaining board files that were written in C are dropped, and the
  ancient at91x40 sub-platform (based on an MMU-less ARM7) is removed
  altogether.  Cleaning up the last pieces was great fun, so I took the
  time to do some of the coding myself and removed several hundred code
  lines that ended up unused after the board files were done.

  There are still a couple of AT91 specific device drivers that are not
  converted to DT (CF, USB-OTG) and currently not working, and the
  platform itself is not "multiplatform"-enabled, but both issues are
  going to be taken care of in the 3.20 cycle.

  This is split out from the other cleanups purely based on the size of
  the branch"

* tag 'at91-cleanup-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (33 commits)
  ARM: at91: remove unused board.h file
  ARM: at91: remove unneeded header files
  ARM: at91/clocksource: remove !DT PIT initializations
  ARM: at91: at91rm9200 ST initialization is now DT only
  ARM: at91: remove old AT91-specific drivers
  ARM: at91: cleanup initilisation code by removing dead code
  ARM: at91/Kconfig: select board files automatically
  ARM: at91: remove unused IRQ function declarations
  ARM: at91: remove legacy IRQ driver and related code
  ARM: at91: remove old at91-specific clock driver
  ARM: at91: remove clock data in at91sam9n12.c and at91sam9x5.c files
  ARM: at91: remove all !DT related configuration options
  ARM: at91/trivial: update Kconfig comment to mention SAMA5
  ARM: at91: always USE_OF from now on
  ARM: at91/Kconfig: remove ARCH_AT91RM9200 option for drivers
  ARM: at91: switch configuration option to SOC_AT91RM9200
  ARM: at91: remove at91rm9200 legacy board support
  ARM: at91: remove at91rm9200 legacy boards files
  ARM: at91/Kconfig: remove useless fbdev Kconfig options
  ARM: at91: remove at91sam9261/at91sam9g10 legacy board support
  ...

8 files changed, 8 insertions, 60 deletions

diff --git a/drivers/clocksource/timer-atmel-pit.c b/drivers/clocksource/timer-atmel-pit.c
index d5289098b3df..b5b4d4585c9a 100644
--- a/drivers/clocksource/timer-atmel-pit.c
+++ b/drivers/clocksource/timer-atmel-pit.c
@@ -262,35 +262,3 @@ static void __init at91sam926x_pit_dt_init(struct device_node *node)
 }
 CLOCKSOURCE_OF_DECLARE(at91sam926x_pit, "atmel,at91sam9260-pit",
                        at91sam926x_pit_dt_init);
-
-static void __iomem *pit_base_addr;
-
-void __init at91sam926x_pit_init(int irq)
-{
-        struct pit_data *data;
-
-        data = kzalloc(sizeof(*data), GFP_KERNEL);
-        if (!data)
-                panic(pr_fmt("Unable to allocate memory\n"));
-
-        data->base = pit_base_addr;
-
-        data->mck = clk_get(NULL, "mck");
-        if (IS_ERR(data->mck))
-                panic(pr_fmt("Unable to get mck clk\n"));
-
-        data->irq = irq;
-
-        at91sam926x_pit_common_init(data);
-}
-
-void __init at91sam926x_ioremap_pit(u32 addr)
-{
-        if (of_have_populated_dt())
-                return;
-
-        pit_base_addr = ioremap(addr, 16);
-
-        if (!pit_base_addr)
-                panic(pr_fmt("Impossible to ioremap PIT\n"));
-}
diff --git a/drivers/misc/Kconfig b/drivers/misc/Kconfig
index bbeb4516facf..006242c8bca0 100644
--- a/drivers/misc/Kconfig
+++ b/drivers/misc/Kconfig
@@ -75,7 +75,7 @@ config ATMEL_TCB_CLKSRC
 config ATMEL_TCB_CLKSRC_BLOCK
         int
         depends on ATMEL_TCB_CLKSRC
-        prompt "TC Block" if ARCH_AT91RM9200 || ARCH_AT91SAM9260 || CPU_AT32AP700X
+        prompt "TC Block" if CPU_AT32AP700X
         default 0
         range 0 1
         help
diff --git a/drivers/net/ethernet/cadence/Kconfig b/drivers/net/ethernet/cadence/Kconfig
index 9e089d24466e..3564fe9d3f69 100644
--- a/drivers/net/ethernet/cadence/Kconfig
+++ b/drivers/net/ethernet/cadence/Kconfig
@@ -22,7 +22,7 @@ if NET_CADENCE
 
 config ARM_AT91_ETHER
         tristate "AT91RM9200 Ethernet support"
-        depends on HAS_DMA && (ARCH_AT91RM9200 || COMPILE_TEST)
+        depends on HAS_DMA && (ARCH_AT91 || COMPILE_TEST)
         select MACB
         ---help---
           If you wish to compile a kernel for the AT91RM9200 and enable
diff --git a/drivers/power/reset/at91-reset.c b/drivers/power/reset/at91-reset.c
index 3cb36693343a..69a75d99ae92 100644
--- a/drivers/power/reset/at91-reset.c
+++ b/drivers/power/reset/at91-reset.c
@@ -19,8 +19,8 @@
 
 #include <asm/system_misc.h>
 
-#include <mach/at91sam9_ddrsdr.h>
-#include <mach/at91sam9_sdramc.h>
+#include <soc/at91/at91sam9_ddrsdr.h>
+#include <soc/at91/at91sam9_sdramc.h>
 
 #define AT91_RSTC_CR    0x00            /* Reset Controller Control Register */
 #define AT91_RSTC_PROCRST       BIT(0)          /* Processor Reset */
diff --git a/drivers/rtc/Kconfig b/drivers/rtc/Kconfig
index 6dd12ddbabc6..da5a1c789f36 100644
--- a/drivers/rtc/Kconfig
+++ b/drivers/rtc/Kconfig
@@ -1110,7 +1110,7 @@ config RTC_DRV_AT91RM9200
 
 config RTC_DRV_AT91SAM9
         tristate "AT91SAM9x/AT91CAP9 RTT as RTC"
-        depends on ARCH_AT91 && !(ARCH_AT91RM9200 || ARCH_AT91X40)
+        depends on ARCH_AT91
         help
           RTC driver for the Atmel AT91SAM9x and AT91CAP9 internal RTT
           (Real Time Timer). These timers are powered by the backup power
@@ -1124,7 +1124,6 @@ config RTC_DRV_AT91SAM9_RTT
         int
         range 0 1
         default 0
-        prompt "RTT module Number" if ARCH_AT91SAM9263
         depends on RTC_DRV_AT91SAM9
         help
           More than one RTT module is available. You can choose which
@@ -1133,8 +1132,7 @@ config RTC_DRV_AT91SAM9_RTT
 
 config RTC_DRV_AT91SAM9_GPBR
         int
-        range 0 3 if !ARCH_AT91SAM9263
-        range 0 15 if ARCH_AT91SAM9263
+        range 0 3
         default 0
         prompt "Backup Register Number"
         depends on RTC_DRV_AT91SAM9
diff --git a/drivers/video/backlight/Kconfig b/drivers/video/backlight/Kconfig
index 8d03924749b8..efb09046a8cf 100644
--- a/drivers/video/backlight/Kconfig
+++ b/drivers/video/backlight/Kconfig
@@ -168,7 +168,6 @@ if BACKLIGHT_CLASS_DEVICE
 config BACKLIGHT_ATMEL_LCDC
         bool "Atmel LCDC Contrast-as-Backlight control"
         depends on FB_ATMEL
-        default y if MACH_AT91SAM9261EK || MACH_AT91SAM9G10EK || MACH_AT91SAM9263EK
         help
           This provides a backlight control internal to the Atmel LCDC
           driver.  If the LCD "contrast control" on your board is wired
diff --git a/drivers/video/fbdev/Kconfig b/drivers/video/fbdev/Kconfig
index c7bf606a8706..c78bfd1d1b34 100644
--- a/drivers/video/fbdev/Kconfig
+++ b/drivers/video/fbdev/Kconfig
@@ -999,23 +999,6 @@ config FB_ATMEL
         help
           This enables support for the AT91/AT32 LCD Controller.
 
-config FB_INTSRAM
-        bool "Frame Buffer in internal SRAM"
-        depends on FB_ATMEL && ARCH_AT91SAM9261
-        help
-          Say Y if you want to map Frame Buffer in internal SRAM. Say N if you want
-          to let frame buffer in external SDRAM.
-
-config FB_ATMEL_STN
-        bool "Use a STN display with AT91/AT32 LCD Controller"
-        depends on FB_ATMEL && (MACH_AT91SAM9261EK || MACH_AT91SAM9G10EK)
-        default n
-        help
-          Say Y if you want to connect a STN LCD display to the AT91/AT32 LCD
-          Controller. Say N if you want to connect a TFT.
-
-          If unsure, say N.
-
 config FB_NVIDIA
         tristate "nVidia Framebuffer Support"
         depends on FB && PCI
diff --git a/drivers/watchdog/Kconfig b/drivers/watchdog/Kconfig
index d0107d424ee4..08f41add1461 100644
--- a/drivers/watchdog/Kconfig
+++ b/drivers/watchdog/Kconfig
@@ -154,14 +154,14 @@ config ARM_SP805_WATCHDOG
 
 config AT91RM9200_WATCHDOG
         tristate "AT91RM9200 watchdog"
-        depends on ARCH_AT91RM9200
+        depends on SOC_AT91RM9200
         help
           Watchdog timer embedded into AT91RM9200 chips. This will reboot your
           system when the timeout is reached.
 
 config AT91SAM9X_WATCHDOG
         tristate "AT91SAM9X / AT91CAP9 watchdog"
-        depends on ARCH_AT91 && !ARCH_AT91RM9200
+        depends on ARCH_AT91
         select WATCHDOG_CORE
         help
           Watchdog timer embedded into AT91SAM9X and AT91CAP9 chips. This will