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

Pull ARM SoC multiplatform conversion patches from Olof Johansson:
 "Here are more patches in the progression towards multiplatform, sparse
  irq conversions in particular.

  Tegra has a handful of cleanups and general groundwork, but is not
  quite there yet on full enablement.

  Platforms that are enabled through this branch are VT8500 and Zynq.
  Note that i.MX was converted in one of the earlier cleanup branches as
  well (before we started a separate topic for multiplatform).  And both
  new platforms for this merge window, sunxi and bcm, were merged with
  multiplatform support enabled."

Fix up conflicts mostly as per Olof.

* tag 'multiplatform' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (29 commits)
  ARM: zynq: Remove all unused mach headers
  ARM: zynq: add support for ARCH_MULTIPLATFORM
  ARM: zynq: make use of debug_ll_io_init()
  ARM: zynq: remove TTC early mapping
  ARM: tegra: move debug-macro.S to include/debug
  ARM: tegra: don't include iomap.h from debug-macro.S
  ARM: tegra: decouple uncompress.h and debug-macro.S
  ARM: tegra: simplify DEBUG_LL UART selection options
  ARM: tegra: select SPARSE_IRQ
  ARM: tegra: enhance timer.c to get IO address from device tree
  ARM: tegra: enhance timer.c to get IRQ info from device tree
  ARM: timer: fix checkpatch warnings
  ARM: tegra: add TWD to device tree
  ARM: tegra: define DT bindings for and instantiate RTC
  ARM: tegra: define DT bindings for and instantiate timer
  clocksource/mtu-nomadik: use apb_pclk
  clk: ux500: Register mtu apb_pclocks
  ARM: plat-nomadik: convert platforms to SPARSE_IRQ
  mfd/db8500-prcmu: use the irq_domain_add_simple()
  mfd/ab8500-core: use irq_domain_add_simple()
  ...

diff --cc arch/arm/Kconfig
Simple merge

diff --cc arch/arm/Kconfig.debug
index 512b394385484d6ff6fcc6928d1f78ddc85ecbb5,be70fe56bbeb02f967d34dd871412fab8bb21408..661030d6bc6c3d10f3ca35f6b8125d21adac7389
--- 1/arch/arm/Kconfig.debug
--- 2/arch/arm/Kconfig.debug
+++ b/arch/arm/Kconfig.debug
@@@ -365,20 -362,13 +365,27 @@@ choic
                  Say Y here if you want kernel low-level debugging support
                  on SOCFPGA based platforms.
  
 +      config DEBUG_SUNXI_UART0
 +              bool "Kernel low-level debugging messages via sunXi UART0"
 +              depends on ARCH_SUNXI
 +              help
 +                Say Y here if you want kernel low-level debugging support
 +                on Allwinner A1X based platforms on the UART0.
 +
 +      config DEBUG_SUNXI_UART1
 +              bool "Kernel low-level debugging messages via sunXi UART1"
 +              depends on ARCH_SUNXI
 +              help
 +                Say Y here if you want kernel low-level debugging support
 +                on Allwinner A1X based platforms on the UART1.
 +
+       config DEBUG_TEGRA_UART
+               depends on ARCH_TEGRA
+               bool "Use Tegra UART for low-level debug"
+               help
+                 Say Y here if you want kernel low-level debugging support
+                 on Tegra based platforms.
+ 
        config DEBUG_VEXPRESS_UART0_DETECT
                bool "Autodetect UART0 on Versatile Express Cortex-A core tiles"
                depends on ARCH_VEXPRESS && CPU_CP15_MMU
@@@ -443,15 -433,36 +450,45 @@@
  
  endchoice
  
 +config DEBUG_IMX6Q_UART_PORT
 +      int "i.MX6Q Debug UART Port (1-5)" if DEBUG_IMX6Q_UART
 +      range 1 5
 +      default 1
 +      depends on SOC_IMX6Q
 +      help
 +        Choose UART port on which kernel low-level debug messages
 +        should be output.
 +
+ choice
+       prompt "Low-level debug console UART"
+       depends on DEBUG_LL && DEBUG_TEGRA_UART
+ 
+       config TEGRA_DEBUG_UART_AUTO_ODMDATA
+       bool "Via ODMDATA"
+       help
+         Automatically determines which UART to use for low-level debug based
+         on the ODMDATA value. This value is part of the BCT, and is written
+         to the boot memory device using nvflash, or other flashing tool.
+         When bits 19:18 are 3, then bits 17:15 indicate which UART to use;
+         0/1/2/3/4 are UART A/B/C/D/E.
+ 
+       config TEGRA_DEBUG_UARTA
+               bool "UART A"
+ 
+       config TEGRA_DEBUG_UARTB
+               bool "UART B"
+ 
+       config TEGRA_DEBUG_UARTC
+               bool "UART C"
+ 
+       config TEGRA_DEBUG_UARTD
+               bool "UART D"
+ 
+       config TEGRA_DEBUG_UARTE
+               bool "UART E"
+ 
+ endchoice
+ 
  config DEBUG_LL_INCLUDE
        string
        default "debug/icedcc.S" if DEBUG_ICEDCC
@@@ -466,9 -470,10 +503,11 @@@
        default "debug/mvebu.S" if DEBUG_MVEBU_UART
        default "debug/picoxcell.S" if DEBUG_PICOXCELL_UART
        default "debug/socfpga.S" if DEBUG_SOCFPGA_UART
 +      default "debug/sunxi.S" if DEBUG_SUNXI_UART0 || DEBUG_SUNXI_UART1
        default "debug/vexpress.S" if DEBUG_VEXPRESS_UART0_DETECT || \
                DEBUG_VEXPRESS_UART0_CA9 || DEBUG_VEXPRESS_UART0_RS1
+       default "debug/tegra.S" if DEBUG_TEGRA_UART
+       default "debug/zynq.S" if DEBUG_ZYNQ_UART0 || DEBUG_ZYNQ_UART1
        default "mach/debug-macro.S"
  
  config EARLY_PRINTK

diff --cc arch/arm/Makefile
Simple merge

diff --cc arch/arm/boot/dts/tegra30.dtsi
Simple merge

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

diff --cc arch/arm/mach-ux500/board-mop500-audio.c
Simple merge

diff --cc arch/arm/mach-ux500/board-mop500.c
Simple merge

diff --cc arch/arm/mach-ux500/cpu-db8500.c
index 93442fcd9eb0cc997036261c26bf037b0813b9e3,8bff078c617c38045b1b75f75edf6fcbd6557d36..db0bb75e2c7620e9a7964c40d6a428cd66f9d4a8
--- 1/arch/arm/mach-ux500/cpu-db8500.c
--- 2/arch/arm/mach-ux500/cpu-db8500.c
+++ b/arch/arm/mach-ux500/cpu-db8500.c
@@@ -17,16 -17,11 +17,18 @@@
  #include <linux/platform_device.h>
  #include <linux/io.h>
  #include <linux/mfd/abx500/ab8500.h>
 -#include <linux/platform_data/usb-musb-ux500.h>
 +#include <linux/mfd/dbx500-prcmu.h>
 +#include <linux/of.h>
 +#include <linux/of_platform.h>
 +#include <linux/regulator/machine.h>
+ #include <linux/platform_data/pinctrl-nomadik.h>
 +#include <linux/random.h>
  
  #include <asm/pmu.h>
  #include <asm/mach/map.h>
 +#include <asm/mach/arch.h>
 +#include <asm/hardware/gic.h>
++
  #include <mach/hardware.h>
  #include <mach/setup.h>
  #include <mach/devices.h>

diff --cc arch/arm/mach-vt8500/vt8500.c
Simple merge

diff --cc drivers/char/hw_random/Kconfig
Simple merge

diff --cc drivers/clk/ux500/u8500_clk.c
Simple merge

diff --cc drivers/clocksource/Kconfig
index a0985732f1e244b94247a8ba14b0717189db38c1,c9f67de8b7b4900dd8f0d9d797a405befc985ced..7fdcbd3f4da5a7756f2f1fb01a467a11b107092b
--- 1/drivers/clocksource/Kconfig
--- 2/drivers/clocksource/Kconfig
+++ b/drivers/clocksource/Kconfig
@@@ -22,9 -22,21 +22,24 @@@ config DW_APB_TIMER_O
  config ARMADA_370_XP_TIMER
        bool
  
 +config SUNXI_TIMER
 +      bool
 +
+ config CLKSRC_NOMADIK_MTU
+       bool
+       depends on (ARCH_NOMADIK || ARCH_U8500)
+       select CLKSRC_MMIO
+       help
+         Support for Multi Timer Unit. MTU provides access
+         to multiple interrupt generating programmable
+         32-bit free running decrementing counters.
+ 
+ config CLKSRC_NOMADIK_MTU_SCHED_CLOCK
+       bool
+       depends on CLKSRC_NOMADIK_MTU
+       help
+         Use the Multi Timer Unit as the sched_clock.
+ 
  config CLKSRC_DBX500_PRCMU
        bool "Clocksource PRCMU Timer"
        depends on UX500_SOC_DB8500

diff --cc drivers/clocksource/Makefile
Simple merge

diff --cc drivers/mfd/ab8500-core.c
Simple merge

diff --cc drivers/mfd/db8500-prcmu.c
Simple merge

diff --cc drivers/mtd/nand/Kconfig
Simple merge

diff --cc drivers/pinctrl/pinctrl-nomadik.c
index 8ef3e85cb011ef5928e1668ea901cf1236784cbd,3ad23fb042b44b9b86277b407d68f7800bb99c96..ef66f98e9202c28b2b13ede8fac9bd5d7d3e55bc
--- 1/drivers/pinctrl/pinctrl-nomadik.c
--- 2/drivers/pinctrl/pinctrl-nomadik.c
+++ b/drivers/pinctrl/pinctrl-nomadik.c
@@@ -30,10 -30,23 +30,9 @@@
  #include <linux/pinctrl/pinconf.h>
  /* Since we request GPIOs from ourself */
  #include <linux/pinctrl/consumer.h>
 -/*
 - * For the U8500 archs, use the PRCMU register interface, for the older
 - * Nomadik, provide some stubs. The functions using these will only be
 - * called on the U8500 series.
 - */
 -#ifdef CONFIG_ARCH_U8500
 -#include <linux/mfd/dbx500-prcmu.h>
 -#else
 -static inline u32 prcmu_read(unsigned int reg) {
 -      return 0;
 -}
 -static inline void prcmu_write(unsigned int reg, u32 value) {}
 -static inline void prcmu_write_masked(unsigned int reg, u32 mask, u32 value) {}
 -#endif
  #include <linux/platform_data/pinctrl-nomadik.h>
- 
  #include <asm/mach/irq.h>
- 
+ #include <mach/irqs.h>
  #include "pinctrl-nomadik.h"
  
  /*