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

Pull ARM soc cleanups, part 2 from Olof Johansson:
 "A shorter cleanup branch submitted separately due to dependencies with
  some of the previous topics.

  Major thing here is that the Broadcom bcmring platform is removed.
  It's an SoC that's used on some stationary VoIP platforms, and is in
  desperate need of some cleanup.  Broadcom came back and suggested that
  we just deprecate the platform for now, since they aren't going to
  spend the resources needed on cleaning it up, and there are no users
  of the platform directly from mainline."

Fix some conflicts due to BCM2835 getting added next to the removed
BCMRING, and removal of tegra files that had been converted to
devicetree.

* tag 'cleanup2' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc:
  ARM: Orion5x: ts78xx: Add IOMEM for virtual addresses.
  ARM: ux500: use __iomem pointers for MMIO
  ARM: Remove mach-bcmring
  ARM: clps711x: Remove board support for CEIVA
  ARM: clps711x: Fix register definitions
  ARM: clps711x: Fix lowlevel debug-macro
  ARM: clps711x: Added simple clock framework
  pinctrl: tegra: move pinconf-tegra.h content into drivers/pinctrl
  ARM: tegra: delete unused headers
  ARM: tegra: remove useless includes of <mach/*.h>
  ARM: tegra: remove dead code

diff --cc MAINTAINERS
Simple merge

diff --cc arch/arm/Kconfig
index 7362c9216b6d2e28be983c2855192dfb24ebab63,6de2c4fd7fa236d049ec8dff336ed425ee2e7037..0e8e536029b534146228c0bab6778027c075ac1c
--- 1/arch/arm/Kconfig
--- 2/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@@ -347,35 -350,6 +347,23 @@@ config ARCH_AT9
          This enables support for systems based on Atmel
          AT91RM9200 and AT91SAM9* processors.
  
- config ARCH_BCMRING
-       bool "Broadcom BCMRING"
-       depends on MMU
-       select CPU_V6
-       select ARM_AMBA
-       select ARM_TIMER_SP804
-       select CLKDEV_LOOKUP
-       select GENERIC_CLOCKEVENTS
-       select ARCH_WANT_OPTIONAL_GPIOLIB
-       help
-         Support for Broadcom's BCMRing platform.
- 
 +config ARCH_BCM2835
 +      bool "Broadcom BCM2835 family"
 +      select ARCH_WANT_OPTIONAL_GPIOLIB
 +      select ARM_AMBA
 +      select ARM_ERRATA_411920
 +      select ARM_TIMER_SP804
 +      select CLKDEV_LOOKUP
 +      select COMMON_CLK
 +      select CPU_V6
 +      select GENERIC_CLOCKEVENTS
 +      select MULTI_IRQ_HANDLER
 +      select SPARSE_IRQ
 +      select USE_OF
 +      help
 +        This enables support for the Broadcom BCM2835 SoC. This SoC is
 +        use in the Raspberry Pi, and Roku 2 devices.
 +
  config ARCH_HIGHBANK
        bool "Calxeda Highbank-based"
        select ARCH_WANT_OPTIONAL_GPIOLIB

diff --cc arch/arm/Makefile
index f47618252e5dde0ce35c8619216c431162dde2b4,81ce4f749a143488c2f1e56948dcaa404a011d0b..a2eb4fe068b989260c5800b9018152baa200cc40
--- 1/arch/arm/Makefile
--- 2/arch/arm/Makefile
+++ b/arch/arm/Makefile
@@@ -136,8 -136,6 +136,7 @@@ textofs-$(CONFIG_ARCH_MSM8960) := 0x002
  # Machine directory name.  This list is sorted alphanumerically
  # by CONFIG_* macro name.
  machine-$(CONFIG_ARCH_AT91)           := at91
- machine-$(CONFIG_ARCH_BCMRING)                := bcmring
 +machine-$(CONFIG_ARCH_BCM2835)                := bcm2835
  machine-$(CONFIG_ARCH_CLPS711X)               := clps711x
  machine-$(CONFIG_ARCH_CNS3XXX)                := cns3xxx
  machine-$(CONFIG_ARCH_DAVINCI)                := davinci

diff --cc arch/arm/mach-tegra/Makefile
Simple merge

diff --cc arch/arm/mach-tegra/tegra20_clocks.c
Simple merge

diff --cc arch/arm/mach-tegra/tegra20_clocks_data.c
Simple merge

diff --cc arch/arm/tools/mach-types
Simple merge

diff --cc drivers/video/Kconfig
Simple merge