Merge tag 'at91-cleanup' of git://git.kernel.org/pub/scm/linux/kernel/git/nferre...

Merge "at91: cleanup for 3.19 #1" from Nicolas Ferre:

"The pull-request that was sent late for 3.18. It was removing the old
!MMU at91x40 and 2 board files plus the whole code in at91sam9g45 &
at91sam9rl files for implementing this deprecated method. For these
particular ones, the EK were the only one to use this code. We can use
these boards with DT right now."

First batch of cleanup/SoC for 3.19:
- removal of old at91x40 !MMU ARM7TDMI support which was kind of rusty
- removal of board-sam9m10g45ek.c and board-sam9rlek.c from mach-at91
  and the code related to these board C files + defconfigs. Use DT for them
  now!

* tag 'at91-cleanup' of git://git.kernel.org/pub/scm/linux/kernel/git/nferre/linux-at91:
  ARM: at91: remove at91sam9rl legacy board support
  ARM: at91: remove at91sam9g45/9m10 legacy board support
  ARM: at91: remove no-MMU at91x40 support

Signed-off-by: Olof Johansson <olof@lixom.net>

diff --combined drivers/rtc/Kconfig
index 6dd12ddbabc634b5b22fa8d4dac358c82557a4fd,7e024f1344c648f8541fe9d2bfe6a9f13170726c..4f8b9e95ef0ae057d9cfa440525960bd2c5f144f
--- 1/drivers/rtc/Kconfig
--- 2/drivers/rtc/Kconfig
+++ b/drivers/rtc/Kconfig
@@@ -1110,7 -1110,7 +1110,7 @@@ config RTC_DRV_AT91RM920
  
  config RTC_DRV_AT91SAM9
        tristate "AT91SAM9x/AT91CAP9 RTT as RTC"
-       depends on ARCH_AT91 && !(ARCH_AT91RM9200 || ARCH_AT91X40)
+       depends on ARCH_AT91 && !ARCH_AT91RM9200
        help
          RTC driver for the Atmel AT91SAM9x and AT91CAP9 internal RTT
          (Real Time Timer). These timers are powered by the backup power
@@@ -1320,7 -1320,7 +1320,7 @@@ config RTC_DRV_LPC32X
  
  config RTC_DRV_PM8XXX
        tristate "Qualcomm PMIC8XXX RTC"
 -      depends on MFD_PM8XXX
 +      depends on MFD_PM8XXX || MFD_SPMI_PMIC
        help
          If you say yes here you get support for the
          Qualcomm PMIC8XXX RTC.