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

Pull ARM SoC cleanups from Olof Johansson:
 "This is a good healthy set of various code removals.  Total net delta
  is 8100 lines removed.

  Among the larger cleanups are:

   - Removal of old Samsung S3C DMA infrastructure by Arnd
   - Removal of the non-DT version of the 'lager' board by Magnus Damm
   - General stale code removal on OMAP and Davinci by Rickard Strandqvist
   - Removal of non-DT support on am3517 platforms by Tony Lindgren

  ... plus several other cleanups of various platforms across the board"

* tag 'cleanup-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (47 commits)
  ARM: sirf: drop redundant function and marco declaration
  arm: omap: specify PMUs are for ARMv7 CPUs
  arm: shmobile: specify PMUs are for ARMv7 CPUs
  arm: iop: specify PMUs are for XScale CPUs
  arm: pxa: specify PMUs are for XScale CPUs
  arm: realview: specify PMU types
  ARM: SAMSUNG: remove unused DMA infrastructure
  ARM: OMAP3: Add back Kconfig option MACH_OMAP3517EVM for ASoC
  ARM: davinci: Remove CDCE949 driver
  ARM: at91: remove useless at91rm9200_set_type()
  ARM: at91: remove useless at91rm9200_dt_initialize()
  ARM: at91: move debug-macro.S into the common space
  ARM: at91: remove useless at91_sysirq_mask_rtx
  ARM: at91: remove useless config MACH_AT91SAM9_DT
  ARM: at91: remove useless config MACH_AT91RM9200_DT
  ARM: at91: remove unused mach/memory.h
  ARM: at91: remove useless header file includes
  ARM: at91: remove unneeded header file
  rtc: at91/Kconfig: remove useless options
  ARM: at91/Documentation: add a README for Atmel SoCs
  ...

1 files changed, 0 insertions, 28 deletions

diff --git a/drivers/rtc/Kconfig b/drivers/rtc/Kconfig
index 0cf2e1d9cb17..cedb41c95dae 100644
--- a/drivers/rtc/Kconfig
+++ b/drivers/rtc/Kconfig
@@ -1242,34 +1242,6 @@ config RTC_DRV_AT91SAM9
           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
-        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.
-
-config RTC_DRV_AT91SAM9_GPBR
-        int
-        range 0 3
-        default 0
-        prompt "Backup Register Number"
-        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.
-
-          The RTC driver needs to use one of the General Purpose Backup
-          Registers (GPBRs) as well as the RTT. You can choose which one
-          will be used. The default of zero is normally OK to use, but
-          on some systems other software needs to use that register.
-
 config RTC_DRV_AU1XXX
         tristate "Au1xxx Counter0 RTC support"
         depends on MIPS_ALCHEMY