Merge tag 'mvebu-dt-3.16' of git://git.infradead.org/linux-mvebu into next/dt

Merge "ARM: mvebu: DT changes for v3.16" from Jason Cooper:

mvebu DT changes for v3.16

 - kirkwood
    - rework nsa3x0 board to add nsa320
    - large cleanup to facilitate use in barebox
    - guruplug phy updates
    - audio updates for t5325

 - mvebu
    - use clocks vice clock-frequency for uart nodes

    - armada 375/380/385
       - add watchdog node
       - add coherency fabric
       - add smp support
       - add sdhci
       - add ahci
       - add thermal sensor

    - armada 370/XP
       - and pmsu

* tag 'mvebu-dt-3.16' of git://git.infradead.org/linux-mvebu: (35 commits)
  ARM: Kirkwood: t5325: Use simple card to instantiate audio
  ARM: Kirkwood: DT: Add missing #sound-dai-cells property
  ARM: Kirkwood: Add node for audio codec
  ARM: dts: kirkwood: set Guruplug phy-connection-type to rgmii-id
  ARM: dts: kirkwood: set Guruplug ethernet PHY compatible
  ARM: dts: kirkwood: set default pinctrl for I2C1 on 6282
  ARM: dts: kirkwood: set default pinctrl for I2C0
  ARM: dts: kirkwood: set default pinctrl for NAND
  ARM: dts: kirkwood: set default pinctrl for SPI0
  ARM: dts: kirkwood: set default pinctrl for UART0/1
  ARM: dts: kirkwood: set default pinctrl for GBE1
  ARM: dts: kirkwood: consolidate common pinctrl settings
  ARM: dts: kirkwood: add pinctrl node to common SoC include
  ARM: dts: kirkwood: rename pin-controller nodes
  ARM: dts: kirkwood: remove clock-frequency properties from UART nodes
  ARM: dts: kirkwood: add stdout-path property to all boards
  ARM: dts: kirkwood: add node labels
  ARM: mvebu: Enable the thermal sensor in Armada 380/385 SoC
  ARM: mvebu: Enable the thermal sensor in Armada 375 SoC
  ARM: mvebu: don't use clocks property in UART node for Netgear RN2120
  ...

Signed-off-by: Olof Johansson <olof@lixom.net>

1 files changed, 60 insertions, 0 deletions

diff --git a/arch/arm/boot/dts/armada-38x.dtsi b/arch/arm/boot/dts/armada-38x.dtsi
index ca8813bb99ba..6ee59a344089 100644
--- a/arch/arm/boot/dts/armada-38x.dtsi
+++ b/arch/arm/boot/dts/armada-38x.dtsi
@@ -108,6 +108,11 @@
                                 cache-level = <2>;
                         };
 
+                        scu@c000 {
+                                compatible = "arm,cortex-a9-scu";
+                                reg = <0xc000 0x58>;
+                        };
+
                         timer@c600 {
                                 compatible = "arm,cortex-a9-twd-timer";
                                 reg = <0xc600 0x20>;
@@ -174,6 +179,7 @@
                                 reg-shift = <2>;
                                 interrupts = <GIC_SPI 12 IRQ_TYPE_LEVEL_HIGH>;
                                 reg-io-width = <1>;
+                                clocks = <&coreclk 0>;
                                 status = "disabled";
                         };
 
@@ -183,6 +189,7 @@
                                 reg-shift = <2>;
                                 interrupts = <GIC_SPI 13 IRQ_TYPE_LEVEL_HIGH>;
                                 reg-io-width = <1>;
+                                clocks = <&coreclk 0>;
                                 status = "disabled";
                         };
 
@@ -267,6 +274,28 @@
                                 clock-names = "nbclk", "fixed";
                         };
 
+                        watchdog@20300 {
+                                compatible = "marvell,armada-380-wdt";
+                                reg = <0x20300 0x34>, <0x20704 0x4>, <0x18260 0x4>;
+                                clocks = <&coreclk 2>, <&refclk>;
+                                clock-names = "nbclk", "fixed";
+                        };
+
+                        cpurst@20800 {
+                                compatible = "marvell,armada-370-cpu-reset";
+                                reg = <0x20800 0x10>;
+                        };
+
+                        coherency-fabric@21010 {
+                                compatible = "marvell,armada-380-coherency-fabric";
+                                reg = <0x21010 0x1c>;
+                        };
+
+                        pmsu@22000 {
+                                compatible = "marvell,armada-380-pmsu";
+                                reg = <0x22000 0x1000>;
+                        };
+
                         eth1: ethernet@30000 {
                                 compatible = "marvell,armada-370-neta";
                                 reg = <0x30000 0x4000>;
@@ -339,6 +368,22 @@
                                 clocks = <&gateclk 4>;
                         };
 
+                        sata@a8000 {
+                                compatible = "marvell,armada-380-ahci";
+                                reg = <0xa8000 0x2000>;
+                                interrupts = <GIC_SPI 26 IRQ_TYPE_LEVEL_HIGH>;
+                                clocks = <&gateclk 15>;
+                                status = "disabled";
+                        };
+
+                        sata@e0000 {
+                                compatible = "marvell,armada-380-ahci";
+                                reg = <0xe0000 0x2000>;
+                                interrupts = <GIC_SPI 28 IRQ_TYPE_LEVEL_HIGH>;
+                                clocks = <&gateclk 30>;
+                                status = "disabled";
+                        };
+
                         coredivclk: clock@e4250 {
                                 compatible = "marvell,armada-380-corediv-clock";
                                 reg = <0xe4250 0xc>;
@@ -347,6 +392,12 @@
                                 clock-output-names = "nand";
                         };
 
+                        thermal@e8078 {
+                                compatible = "marvell,armada380-thermal";
+                                reg = <0xe4078 0x4>, <0xe4074 0x4>;
+                                status = "okay";
+                        };
+
                         flash@d0000 {
                                 compatible = "marvell,armada370-nand";
                                 reg = <0xd0000 0x54>;
@@ -356,6 +407,15 @@
                                 clocks = <&coredivclk 0>;
                                 status = "disabled";
                         };
+
+                        sdhci@d8000 {
+                                compatible = "marvell,armada-380-sdhci";
+                                reg = <0xd8000 0x1000>, <0xdc000 0x100>;
+                                interrupts = <0 25 0x4>;
+                                clocks = <&gateclk 17>;
+                                mrvl,clk-delay-cycles = <0x1F>;
+                                status = "disabled";
+                        };
                 };
         };