Merge branch 'at91/cleanup5' into next/drivers

The at91 cleanups changed a lot of files, this merges in the
latest cleanups to resolve the conflicts

Conflicts:
	arch/arm/mach-at91/at91sam9260.c
	arch/arm/mach-at91/at91sam9261.c
	arch/arm/mach-at91/at91sam9263.c
	arch/arm/mach-at91/clock.c
	arch/arm/mach-at91/clock.h
	drivers/rtc/Kconfig

Signed-off-by: Arnd Bergmann <arnd@arndb.de>

diff --cc MAINTAINERS
Simple merge

diff --cc arch/arm/Kconfig
Simple merge

diff --cc drivers/rtc/Kconfig
index eb4669c,0b70488..b682651
--- 1/drivers/rtc/Kconfig
--- 2/drivers/rtc/Kconfig
+++ b/drivers/rtc/Kconfig
@@@ -1109,29 -1109,23 +1109,28 @@@ config RTC_DRV_AT91RM920
          this is powered by the backup power supply.
  
  config RTC_DRV_AT91SAM9
 -      tristate "AT91SAM9x/AT91CAP9 RTT as RTC"
 +      tristate "AT91SAM9 RTT as RTC"
-       depends on ARCH_AT91 && !ARCH_AT91RM9200
+       depends on ARCH_AT91
 +      select MFD_SYSCON
        help
 -        RTC driver for the Atmel AT91SAM9x and AT91CAP9 internal RTT
 -        (Real Time Timer). These timers are powered by the backup power
 -        supply (such as a small coin cell battery), but do not need to
 -        be used as RTCs.
 -
 -        (On AT91SAM9rl and AT91SAM9G45 chips you probably want to use the
 -        dedicated RTC module and leave the RTT available for other uses.)
 +        Some AT91SAM9 SoCs provide an RTT (Real Time Timer) block which
 +        can be used as an RTC thanks to the backup power supply (e.g. a
 +        small coin cell battery) which keeps this block and the GPBR
 +        (General Purpose Backup Registers) block powered when the device
 +        is shutdown.
 +        Some AT91SAM9 SoCs provide a real RTC block, on those ones you'd
 +        probably want to use the real RTC block instead of the "RTT as an
 +        RTC" driver.
  
  config RTC_DRV_AT91SAM9_RTT
        int
        range 0 1
        default 0
-       prompt "RTT module Number" if ARCH_AT91SAM9263
        depends on RTC_DRV_AT91SAM9
        help
 +        This option is only relevant for legacy board support and
 +        won't be used when booting a DT board.
 +
          More than one RTT module is available. You can choose which
          one will be used as an RTC. The default of zero is normally
          OK to use, though some systems use that for non-RTC purposes.