Merge tag 'soc-for-3.16' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc into next

Pull part one of ARM SoC updates from Olof Johansson:
 "A quite large set of SoC updates this cycle.  In no particular order:

   - Multi-cluster power management for Samsung Exynos, adding support
     for big.LITTLE CPU switching on EXYNOS5

   - SMP support for Marvell Armada 375 and 38x

   - SMP rework on Allwinner A31

   - Xilinx Zynq support for SOC_BUS, big endian

   - Marvell orion5x platform cleanup, modernizing the implementation
     and moving to DT.

   - _Finally_ moving Samsung Exynos over to support MULTIPLATFORM, so
     that their platform can be enabled in the same kernel binary as
     most of the other v7 platforms in the tree.  \o/

     The work isn't quite complete, there's some driver fixes still
     needed, but the basics now work.

  New SoC support added:

   - Freescale i.MX6SX

   - LSI Axxia AXM55xx SoCs

   - Samsung EXYNOS 3250, 5260, 5410, 5420 and 5800

   - STi STIH407

  plus a large set of various smaller updates for different platforms.
  I'm probably missing some important one here"

* tag 'soc-for-3.16' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (281 commits)
  ARM: exynos: don't run exynos4 l2x0 setup on other platforms
  ARM: exynos: Fix "allmodconfig" build errors in mcpm and hotplug
  ARM: EXYNOS: mcpm rename the power_down_finish
  ARM: EXYNOS: Enable mcpm for dual-cluster exynos5800 SoC
  ARM: EXYNOS: Enable multi-platform build support
  ARM: EXYNOS: Consolidate Kconfig entries
  ARM: EXYNOS: Add support for EXYNOS5410 SoC
  ARM: EXYNOS: Support secondary CPU boot of Exynos3250
  ARM: EXYNOS: Add Exynos3250 SoC ID
  ARM: EXYNOS: Add 5800 SoC support
  ARM: EXYNOS: initial board support for exynos5260 SoC
  clk: exynos5410: register clocks using common clock framework
  ARM: debug: qcom: add UART addresses to Kconfig help for APQ8084
  ARM: sunxi: allow building without reset controller
  Documentation: devicetree: arm: sort enable-method entries
  ARM: rockchip: convert smp bringup to CPU_METHOD_OF_DECLARE
  clk: exynos5250: Add missing sysmmu clocks for DISP and ISP blocks
  ARM: dts: axxia: Add reset controller
  power: reset: Add Axxia system reset driver
  ARM: axxia: Adding defconfig for AXM55xx
  ...

1 files changed, 65 insertions, 20 deletions

diff --git a/arch/arm/boot/dts/exynos5420.dtsi b/arch/arm/boot/dts/exynos5420.dtsi
index b69fbcb7dcb8..5e36449a831c 100644
--- a/arch/arm/boot/dts/exynos5420.dtsi
+++ b/arch/arm/boot/dts/exynos5420.dtsi
@@ -58,6 +58,7 @@
                         compatible = "arm,cortex-a15";
                         reg = <0x0>;
                         clock-frequency = <1800000000>;
+                        cci-control-port = <&cci_control1>;
                 };
 
                 cpu1: cpu@1 {
@@ -65,6 +66,7 @@
                         compatible = "arm,cortex-a15";
                         reg = <0x1>;
                         clock-frequency = <1800000000>;
+                        cci-control-port = <&cci_control1>;
                 };
 
                 cpu2: cpu@2 {
@@ -72,6 +74,7 @@
                         compatible = "arm,cortex-a15";
                         reg = <0x2>;
                         clock-frequency = <1800000000>;
+                        cci-control-port = <&cci_control1>;
                 };
 
                 cpu3: cpu@3 {
@@ -79,6 +82,7 @@
                         compatible = "arm,cortex-a15";
                         reg = <0x3>;
                         clock-frequency = <1800000000>;
+                        cci-control-port = <&cci_control1>;
                 };
 
                 cpu4: cpu@100 {
@@ -86,6 +90,7 @@
                         compatible = "arm,cortex-a7";
                         reg = <0x100>;
                         clock-frequency = <1000000000>;
+                        cci-control-port = <&cci_control0>;
                 };
 
                 cpu5: cpu@101 {
@@ -93,6 +98,7 @@
                         compatible = "arm,cortex-a7";
                         reg = <0x101>;
                         clock-frequency = <1000000000>;
+                        cci-control-port = <&cci_control0>;
                 };
 
                 cpu6: cpu@102 {
@@ -100,6 +106,7 @@
                         compatible = "arm,cortex-a7";
                         reg = <0x102>;
                         clock-frequency = <1000000000>;
+                        cci-control-port = <&cci_control0>;
                 };
 
                 cpu7: cpu@103 {
@@ -107,6 +114,44 @@
                         compatible = "arm,cortex-a7";
                         reg = <0x103>;
                         clock-frequency = <1000000000>;
+                        cci-control-port = <&cci_control0>;
+                };
+        };
+
+        cci@10d20000 {
+                compatible = "arm,cci-400";
+                #address-cells = <1>;
+                #size-cells = <1>;
+                reg = <0x10d20000 0x1000>;
+                ranges = <0x0 0x10d20000 0x6000>;
+
+                cci_control0: slave-if@4000 {
+                        compatible = "arm,cci-400-ctrl-if";
+                        interface-type = "ace";
+                        reg = <0x4000 0x1000>;
+                };
+                cci_control1: slave-if@5000 {
+                        compatible = "arm,cci-400-ctrl-if";
+                        interface-type = "ace";
+                        reg = <0x5000 0x1000>;
+                };
+        };
+
+        sysram@02020000 {
+                compatible = "mmio-sram";
+                reg = <0x02020000 0x54000>;
+                #address-cells = <1>;
+                #size-cells = <1>;
+                ranges = <0 0x02020000 0x54000>;
+
+                smp-sysram@0 {
+                        compatible = "samsung,exynos4210-sysram";
+                        reg = <0x0 0x1000>;
+                };
+
+                smp-sysram@53000 {
+                        compatible = "samsung,exynos4210-sysram-ns";
+                        reg = <0x53000 0x1000>;
                 };
         };
 
@@ -125,7 +170,7 @@
                 clock-names = "pll_ref", "pll_in", "sclk_audio", "sclk_pcm_in";
         };
 
-        codec@11000000 {
+        mfc: codec@11000000 {
                 compatible = "samsung,mfc-v7";
                 reg = <0x11000000 0x10000>;
                 interrupts = <0 96 0>;
@@ -169,7 +214,7 @@
                 status = "disabled";
         };
 
-        mct@101C0000 {
+        mct: mct@101C0000 {
                 compatible = "samsung,exynos4210-mct";
                 reg = <0x101C0000 0x800>;
                 interrupt-controller;
@@ -260,7 +305,7 @@
                 interrupts = <0 47 0>;
         };
 
-        rtc@101E0000 {
+        rtc: rtc@101E0000 {
                 clocks = <&clock CLK_RTC>;
                 clock-names = "rtc";
                 status = "disabled";
@@ -427,22 +472,22 @@
                 status = "disabled";
         };
 
-        serial@12C00000 {
+        uart_0: serial@12C00000 {
                 clocks = <&clock CLK_UART0>, <&clock CLK_SCLK_UART0>;
                 clock-names = "uart", "clk_uart_baud0";
         };
 
-        serial@12C10000 {
+        uart_1: serial@12C10000 {
                 clocks = <&clock CLK_UART1>, <&clock CLK_SCLK_UART1>;
                 clock-names = "uart", "clk_uart_baud0";
         };
 
-        serial@12C20000 {
+        uart_2: serial@12C20000 {
                 clocks = <&clock CLK_UART2>, <&clock CLK_SCLK_UART2>;
                 clock-names = "uart", "clk_uart_baud0";
         };
 
-        serial@12C30000 {
+        uart_3: serial@12C30000 {
                 clocks = <&clock CLK_UART3>, <&clock CLK_SCLK_UART3>;
                 clock-names = "uart", "clk_uart_baud0";
         };
@@ -462,14 +507,14 @@
                 #phy-cells = <0>;
         };
 
-        dp-controller@145B0000 {
+        dp: dp-controller@145B0000 {
                 clocks = <&clock CLK_DP1>;
                 clock-names = "dp";
                 phys = <&dp_phy>;
                 phy-names = "dp";
         };
 
-        fimd@14400000 {
+        fimd: fimd@14400000 {
                 samsung,power-domain = <&disp_pd>;
                 clocks = <&clock CLK_SCLK_FIMD1>, <&clock CLK_FIMD1>;
                 clock-names = "sclk_fimd", "fimd";
@@ -546,7 +591,7 @@
                 #size-cells = <0>;
                 pinctrl-names = "default";
                 pinctrl-0 = <&i2c4_hs_bus>;
-                clocks = <&clock CLK_I2C4>;
+                clocks = <&clock CLK_USI0>;
                 clock-names = "hsi2c";
                 status = "disabled";
         };
@@ -559,7 +604,7 @@
                 #size-cells = <0>;
                 pinctrl-names = "default";
                 pinctrl-0 = <&i2c5_hs_bus>;
-                clocks = <&clock CLK_I2C5>;
+                clocks = <&clock CLK_USI1>;
                 clock-names = "hsi2c";
                 status = "disabled";
         };
@@ -572,7 +617,7 @@
                 #size-cells = <0>;
                 pinctrl-names = "default";
                 pinctrl-0 = <&i2c6_hs_bus>;
-                clocks = <&clock CLK_I2C6>;
+                clocks = <&clock CLK_USI2>;
                 clock-names = "hsi2c";
                 status = "disabled";
         };
@@ -585,7 +630,7 @@
                 #size-cells = <0>;
                 pinctrl-names = "default";
                 pinctrl-0 = <&i2c7_hs_bus>;
-                clocks = <&clock CLK_I2C7>;
+                clocks = <&clock CLK_USI3>;
                 clock-names = "hsi2c";
                 status = "disabled";
         };
@@ -598,7 +643,7 @@
                 #size-cells = <0>;
                 pinctrl-names = "default";
                 pinctrl-0 = <&i2c8_hs_bus>;
-                clocks = <&clock CLK_I2C8>;
+                clocks = <&clock CLK_USI4>;
                 clock-names = "hsi2c";
                 status = "disabled";
         };
@@ -611,7 +656,7 @@
                 #size-cells = <0>;
                 pinctrl-names = "default";
                 pinctrl-0 = <&i2c9_hs_bus>;
-                clocks = <&clock CLK_I2C9>;
+                clocks = <&clock CLK_USI5>;
                 clock-names = "hsi2c";
                 status = "disabled";
         };
@@ -624,12 +669,12 @@
                 #size-cells = <0>;
                 pinctrl-names = "default";
                 pinctrl-0 = <&i2c10_hs_bus>;
-                clocks = <&clock CLK_I2C10>;
+                clocks = <&clock CLK_USI6>;
                 clock-names = "hsi2c";
                 status = "disabled";
         };
 
-        hdmi@14530000 {
+        hdmi: hdmi@14530000 {
                 compatible = "samsung,exynos4212-hdmi";
                 reg = <0x14530000 0x70000>;
                 interrupts = <0 95 0>;
@@ -641,7 +686,7 @@
                 status = "disabled";
         };
 
-        mixer@14450000 {
+        mixer: mixer@14450000 {
                 compatible = "samsung,exynos5420-mixer";
                 reg = <0x14450000 0x10000>;
                 interrupts = <0 94 0>;
@@ -712,7 +757,7 @@
                 clock-names = "tmu_apbif", "tmu_triminfo_apbif";
         };
 
-        watchdog@101D0000 {
+        watchdog: watchdog@101D0000 {
                 compatible = "samsung,exynos5420-wdt";
                 reg = <0x101D0000 0x100>;
                 interrupts = <0 42 0>;
@@ -721,7 +766,7 @@
                 samsung,syscon-phandle = <&pmu_system_controller>;
         };
 
-        sss@10830000 {
+        sss: sss@10830000 {
                 compatible = "samsung,exynos4210-secss";
                 reg = <0x10830000 0x10000>;
                 interrupts = <0 112 0>;