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

Pull ARM SoC late cleanups from Arnd Bergmann:
 "These could not be part of the first cleanup branch, because they
  either came too late in the cycle, or they have dependencies on other
  branches.  Important changes are:

   - The integrator platform is almost multiplatform capable after some
     reorganization (Linus Walleij)
   - Minor cleanups on Zynq (Michal Simek)
   - Lots of changes for Exynos and other Samsung platforms, including
     further preparations for multiplatform support and the clocks
     bindings are rearranged"

* tag 'tags/cleanup2-3.15' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (54 commits)
  devicetree: fix newly added exynos sata bindings
  ARM: EXYNOS: Fix compilation error in cpuidle.c
  ARM: S5P64X0: Explicitly include linux/serial_s3c.h in mach/pm-core.h
  ARM: EXYNOS: Remove hardware.h file
  ARM: SAMSUNG: Remove hardware.h inclusion
  ARM: S3C24XX: Remove invalid code from hardware.h
  dt-bindings: clock: Move exynos-audss-clk.h to dt-bindings/clock
  ARM: dts: Keep some essential LDOs enabled for arndale-octa board
  ARM: dts: Disable MDMA1 node for arndale-octa board
  ARM: S3C64XX: Fix build for implicit serial_s3c.h inclusion
  serial: s3c: Fix build of header without serial_core.h preinclusion
  ARM: EXYNOS: Allow wake-up using GIC interrupts
  ARM: EXYNOS: Stop using legacy Samsung PM code
  ARM: EXYNOS: Remove PM initcalls and useless indirection
  ARM: EXYNOS: Fix abuse of CONFIG_PM
  ARM: SAMSUNG: Move s3c_pm_check_* prototypes to plat/pm-common.h
  ARM: SAMSUNG: Move common save/restore helpers to separate file
  ARM: SAMSUNG: Move Samsung PM debug code into separate file
  ARM: SAMSUNG: Consolidate PM debug functions
  ARM: SAMSUNG: Use debug_ll_addr() to get UART base address
  ...

1 files changed, 21 insertions, 23 deletions

diff --git a/arch/arm/boot/dts/zynq-7000.dtsi b/arch/arm/boot/dts/zynq-7000.dtsi
index 286a840e3dce..511180769af5 100644
--- a/arch/arm/boot/dts/zynq-7000.dtsi
+++ b/arch/arm/boot/dts/zynq-7000.dtsi
@@ -129,30 +129,28 @@
                 } ;
 
                 slcr: slcr@f8000000 {
-                        compatible = "xlnx,zynq-slcr";
+                        #address-cells = <1>;
+                        #size-cells = <1>;
+                        compatible = "xlnx,zynq-slcr", "syscon";
                         reg = <0xF8000000 0x1000>;
-
-                        clocks {
-                                #address-cells = <1>;
-                                #size-cells = <0>;
-
-                                clkc: clkc {
-                                        #clock-cells = <1>;
-                                        compatible = "xlnx,ps7-clkc";
-                                        ps-clk-frequency = <33333333>;
-                                        fclk-enable = <0>;
-                                        clock-output-names = "armpll", "ddrpll", "iopll", "cpu_6or4x",
-                                                        "cpu_3or2x", "cpu_2x", "cpu_1x", "ddr2x", "ddr3x",
-                                                        "dci", "lqspi", "smc", "pcap", "gem0", "gem1",
-                                                        "fclk0", "fclk1", "fclk2", "fclk3", "can0", "can1",
-                                                        "sdio0", "sdio1", "uart0", "uart1", "spi0", "spi1",
-                                                        "dma", "usb0_aper", "usb1_aper", "gem0_aper",
-                                                        "gem1_aper", "sdio0_aper", "sdio1_aper",
-                                                        "spi0_aper", "spi1_aper", "can0_aper", "can1_aper",
-                                                        "i2c0_aper", "i2c1_aper", "uart0_aper", "uart1_aper",
-                                                        "gpio_aper", "lqspi_aper", "smc_aper", "swdt",
-                                                        "dbg_trc", "dbg_apb";
-                                };
+                        ranges;
+                        clkc: clkc@100 {
+                                #clock-cells = <1>;
+                                compatible = "xlnx,ps7-clkc";
+                                ps-clk-frequency = <33333333>;
+                                fclk-enable = <0>;
+                                clock-output-names = "armpll", "ddrpll", "iopll", "cpu_6or4x",
+                                                "cpu_3or2x", "cpu_2x", "cpu_1x", "ddr2x", "ddr3x",
+                                                "dci", "lqspi", "smc", "pcap", "gem0", "gem1",
+                                                "fclk0", "fclk1", "fclk2", "fclk3", "can0", "can1",
+                                                "sdio0", "sdio1", "uart0", "uart1", "spi0", "spi1",
+                                                "dma", "usb0_aper", "usb1_aper", "gem0_aper",
+                                                "gem1_aper", "sdio0_aper", "sdio1_aper",
+                                                "spi0_aper", "spi1_aper", "can0_aper", "can1_aper",
+                                                "i2c0_aper", "i2c1_aper", "uart0_aper", "uart1_aper",
+                                                "gpio_aper", "lqspi_aper", "smc_aper", "swdt",
+                                                "dbg_trc", "dbg_apb";
+                                reg = <0x100 0x100>;
                         };
                 };