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

Pull first batch of arm-soc cleanups from Olof Johansson:
 "These cleanups are basically all over the place.  The idea is to
  collect changes with minimal impact but large number of changes so we
  can avoid them from distracting in the diffstat in the other series.

  A significant number of lines get removed here, in particular because
  the ixp2000 and ixp23xx platforms get removed.  These have never been
  extremely popular and have fallen into disuse over time with no active
  maintainer taking care of them.  The u5500 soc never made it into a
  product, so we are removing it from the ux500 platform.

  Many good cleanups also went into the at91 and omap platforms, as has
  been the case for a number of releases."

Trivial modify-delete conflicts in arch/arm/mach-{ixp2000,ixp23xx}

* tag 'cleanup' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (152 commits)
  ARM: clps711x: Cleanup IRQ handling
  ARM clps711x: Removed unused header mach/time.h
  ARM: clps711x: Added note about support EP731x CPU to Kconfig
  ARM: clps711x: Added missing register definitions
  ARM: clps711x: Used own subarch directory for store header file
  Dove: Fix Section mismatch warnings
  ARM: orion5x: ts78xx debugging changes
  ARM: orion5x: remove PM dependency from ts78xx
  ARM: orion5x: ts78xx fix NAND resource off by one
  ARM: orion5x: ts78xx whitespace cleanups
  Orion5x: Fix Section mismatch warnings
  Orion5x: Fix warning: struct pci_dev declared inside paramter list
  ARM: clps711x: Combine header files into one for clps711x-targets
  ARM: S3C24XX: Use common macro to define resources on mach-qt2410.c
  ARM: S3C24XX: Use common macro to define resources on mach-osiris.c
  ARM: EXYNOS: Adapt to cpuidle core time keeping and irq enable
  ARM: S5PV210: Use common macro to define resources on mach-smdkv210.c
  ARM: S5PV210: Use common macro to define resources on dev-audio.c
  ARM: S5PC100: Use common macro to define resources on dev-audio.c
  ARM: S5P64X0: Use common macro to define resources on dev-audio.c
  ...

1 files changed, 4 insertions, 30 deletions

diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index 002b1c8da225..11d9bb1bbbc5 100644
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -336,8 +336,8 @@ config ARCH_AT91
         select IRQ_DOMAIN
         select NEED_MACH_IO_H if PCCARD
         help
-          This enables support for systems based on the Atmel AT91RM9200,
-          AT91SAM9 processors.
+          This enables support for systems based on Atmel
+          AT91RM9200 and AT91SAM9* processors.
 
 config ARCH_BCMRING
         bool "Broadcom BCMRING"
@@ -369,12 +369,12 @@ config ARCH_HIGHBANK
           Support for the Calxeda Highbank SoC based boards.
 
 config ARCH_CLPS711X
-        bool "Cirrus Logic CLPS711x/EP721x-based"
+        bool "Cirrus Logic CLPS711x/EP721x/EP731x-based"
         select CPU_ARM720T
         select ARCH_USES_GETTIMEOFFSET
         select NEED_MACH_MEMORY_H
         help
-          Support for Cirrus Logic 711x/721x based boards.
+          Support for Cirrus Logic 711x/721x/731x based boards.
 
 config ARCH_CNS3XXX
         bool "Cavium Networks CNS3XXX family"
@@ -524,28 +524,6 @@ config ARCH_IOP33X
         help
           Support for Intel's IOP33X (XScale) family of processors.
 
-config ARCH_IXP23XX
-        bool "IXP23XX-based"
-        depends on MMU
-        select CPU_XSC3
-        select PCI
-        select ARCH_USES_GETTIMEOFFSET
-        select NEED_MACH_IO_H
-        select NEED_MACH_MEMORY_H
-        help
-          Support for Intel's IXP23xx (XScale) family of processors.
-
-config ARCH_IXP2000
-        bool "IXP2400/2800-based"
-        depends on MMU
-        select CPU_XSCALE
-        select PCI
-        select ARCH_USES_GETTIMEOFFSET
-        select NEED_MACH_IO_H
-        select NEED_MACH_MEMORY_H
-        help
-          Support for Intel's IXP2400/2800 (XScale) family of processors.
-
 config ARCH_IXP4XX
         bool "IXP4xx-based"
         depends on MMU
@@ -1039,10 +1017,6 @@ source "arch/arm/mach-iop13xx/Kconfig"
 
 source "arch/arm/mach-ixp4xx/Kconfig"
 
-source "arch/arm/mach-ixp2000/Kconfig"
-
-source "arch/arm/mach-ixp23xx/Kconfig"
-
 source "arch/arm/mach-kirkwood/Kconfig"
 
 source "arch/arm/mach-ks8695/Kconfig"