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

Pull ARM SoC updates for Marvell mvebu/kirkwood from Olof Johansson:
 "This is a branch with updates for Marvell's mvebu/kirkwood platforms.
  They came in late-ish, and were heavily interdependent such that it
  didn't make sense to split them up across the cross-platform topic
  branches.  So here they are (for the second release in a row) in a
  branch on their own."

* tag 'mvebu' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (88 commits)
  arm: l2x0: add aurora related properties to OF binding
  arm: mvebu: add Aurora L2 Cache Controller to the DT
  arm: mvebu: add L2 cache support
  dma: mv_xor: fix error handling path
  dma: mv_xor: fix error checking of irq_of_parse_and_map()
  dma: mv_xor: use request_irq() instead of devm_request_irq()
  dma: mv_xor: clear the window override control registers
  arm: mvebu: fix address decoding armada_cfg_base() function
  ARM: mvebu: update defconfig with I2C and RTC support
  ARM: mvebu: Add SATA support for OpenBlocks AX3-4
  ARM: mvebu: Add support for the RTC in OpenBlocks AX3-4
  ARM: mvebu: Add support for I2C on OpenBlocks AX3-4
  ARM: mvebu: Add support for I2C controllers in Armada 370/XP
  arm: mvebu: Add hardware I/O Coherency support
  arm: plat-orion: Add coherency attribute when setup mbus target
  arm: dma mapping: Export a dma ops function arm_dma_set_mask
  arm: mvebu: Add SMP support for Armada XP
  arm: mm: Add support for PJ4B cpu and init routines
  arm: mvebu: Add IPI support via doorbells
  arm: mvebu: Add initial support for power managmement service unit
  ...

1 files changed, 62 insertions, 0 deletions

diff --git a/arch/arm/boot/dts/kirkwood.dtsi b/arch/arm/boot/dts/kirkwood.dtsi
index a990c30f0a26..7735cee4a9c6 100644
--- a/arch/arm/boot/dts/kirkwood.dtsi
+++ b/arch/arm/boot/dts/kirkwood.dtsi
@@ -23,6 +23,12 @@
                 #address-cells = <1>;
                 #size-cells = <1>;
 
+                core_clk: core-clocks@10030 {
+                        compatible = "marvell,kirkwood-core-clock";
+                        reg = <0x10030 0x4>;
+                        #clock-cells = <1>;
+                };
+
                 gpio0: gpio@10100 {
                         compatible = "marvell,orion-gpio";
                         #gpio-cells = <2>;
@@ -48,6 +54,7 @@
                         reg = <0x12000 0x100>;
                         reg-shift = <2>;
                         interrupts = <33>;
+                        clocks = <&gate_clk 7>;
                         /* set clock-frequency in board dts */
                         status = "disabled";
                 };
@@ -57,6 +64,7 @@
                         reg = <0x12100 0x100>;
                         reg-shift = <2>;
                         interrupts = <34>;
+                        clocks = <&gate_clk 7>;
                         /* set clock-frequency in board dts */
                         status = "disabled";
                 };
@@ -74,13 +82,62 @@
                         cell-index = <0>;
                         interrupts = <23>;
                         reg = <0x10600 0x28>;
+                        clocks = <&gate_clk 7>;
                         status = "disabled";
                 };
 
+                gate_clk: clock-gating-control@2011c {
+                        compatible = "marvell,kirkwood-gating-clock";
+                        reg = <0x2011c 0x4>;
+                        clocks = <&core_clk 0>;
+                        #clock-cells = <1>;
+                };
+
                 wdt@20300 {
                         compatible = "marvell,orion-wdt";
                         reg = <0x20300 0x28>;
+                        clocks = <&gate_clk 7>;
+                        status = "okay";
+                };
+
+                xor@60800 {
+                        compatible = "marvell,orion-xor";
+                        reg = <0x60800 0x100
+                               0x60A00 0x100>;
+                        status = "okay";
+                        clocks = <&gate_clk 8>;
+
+                        xor00 {
+                              interrupts = <5>;
+                              dmacap,memcpy;
+                              dmacap,xor;
+                        };
+                        xor01 {
+                              interrupts = <6>;
+                              dmacap,memcpy;
+                              dmacap,xor;
+                              dmacap,memset;
+                        };
+                };
+
+                xor@60900 {
+                        compatible = "marvell,orion-xor";
+                        reg = <0x60900 0x100
+                               0xd0B00 0x100>;
                         status = "okay";
+                        clocks = <&gate_clk 16>;
+
+                        xor00 {
+                              interrupts = <7>;
+                              dmacap,memcpy;
+                              dmacap,xor;
+                        };
+                        xor01 {
+                              interrupts = <8>;
+                              dmacap,memcpy;
+                              dmacap,xor;
+                              dmacap,memset;
+                        };
                 };
 
                 ehci@50000 {
@@ -94,6 +151,8 @@
                         compatible = "marvell,orion-sata";
                         reg = <0x80000 0x5000>;
                         interrupts = <21>;
+                        clocks = <&gate_clk 14>, <&gate_clk 15>;
+                        clock-names = "0", "1";
                         status = "disabled";
                 };
 
@@ -107,6 +166,7 @@
                         reg = <0x3000000 0x400>;
                         chip-delay = <25>;
                         /* set partition map and/or chip-delay in board dts */
+                        clocks = <&gate_clk 7>;
                         status = "disabled";
                 };
 
@@ -117,6 +177,7 @@
                         #size-cells = <0>;
                         interrupts = <29>;
                         clock-frequency = <100000>;
+                        clocks = <&gate_clk 7>;
                         status = "disabled";
                 };
 
@@ -126,6 +187,7 @@
                               <0xf5000000 0x800>;
                         reg-names = "regs", "sram";
                         interrupts = <22>;
+                        clocks = <&gate_clk 17>;
                         status = "okay";
                 };
         };