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 <[email protected]>

diff --cc arch/arm/boot/dts/armada-370-xp.dtsi
Simple merge

diff --cc arch/arm/boot/dts/armada-38x.dtsi
index ca8813bb99ba627d52e7c9d163005d39481f3e1a,cd60738e912e16e4bbf4efb6dc670f2c8b7335fb..6ee59a34408902e4ab8182ceff8a1900841090b3
--- 1/arch/arm/boot/dts/armada-38x.dtsi
--- 2/arch/arm/boot/dts/armada-38x.dtsi
+++ b/arch/arm/boot/dts/armada-38x.dtsi
@@@ -336,9 -365,24 +365,25 @@@
                                #size-cells = <0>;
                                compatible = "marvell,orion-mdio";
                                reg = <0x72004 0x4>;
 +                              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>;

diff --cc arch/arm/boot/dts/kirkwood-b3.dts
Simple merge

diff --cc arch/arm/boot/dts/kirkwood-cloudbox.dts
Simple merge

diff --cc arch/arm/boot/dts/kirkwood-dreamplug.dts
Simple merge

diff --cc arch/arm/boot/dts/kirkwood-laplug.dts
Simple merge

diff --cc arch/arm/boot/dts/kirkwood-mv88f6281gtw-ge.dts
Simple merge

diff --cc arch/arm/boot/dts/kirkwood-ns2-common.dtsi
Simple merge

diff --cc arch/arm/boot/dts/kirkwood-nsa310.dts
Simple merge

diff --cc arch/arm/boot/dts/kirkwood-nsa310a.dts
Simple merge

diff --cc arch/arm/boot/dts/kirkwood-openblocks_a6.dts
index 0650beafc1de0ac4a7e60fbc759ed7726982c22a,3dcb5c26b78b9dc60e56efb1ff2fddc8fa8dcb2c..fb9dc227255d91a2a4bdb58a7adfac3072a80521
--- 1/arch/arm/boot/dts/kirkwood-openblocks_a6.dts
--- 2/arch/arm/boot/dts/kirkwood-openblocks_a6.dts
+++ b/arch/arm/boot/dts/kirkwood-openblocks_a6.dts
@@@ -36,11 -33,9 +33,9 @@@
  
                i2c@11100 {
                        status = "okay";
-                       pinctrl-0 = <&pmx_twsi1>;
-                       pinctrl-names = "default";
  
                        s35390a: s35390a@30 {
 -                              compatible = "s35390a";
 +                              compatible = "sii,s35390a";
                                reg = <0x30>;
                        };
                };

diff --cc arch/arm/boot/dts/kirkwood-openblocks_a7.dts
index 38520a2875146d565c8016f69cc4f324098ff1ee,4e10e92b7822c374b6b562b0503cb3b8dbcf2d66..d5e3bc518968b4acf5e4b811d2944a84d12b79b8
--- 1/arch/arm/boot/dts/kirkwood-openblocks_a7.dts
--- 2/arch/arm/boot/dts/kirkwood-openblocks_a7.dts
+++ b/arch/arm/boot/dts/kirkwood-openblocks_a7.dts
@@@ -48,11 -45,9 +45,9 @@@
  
                i2c@11100 {
                        status = "okay";
-                       pinctrl-0 = <&pmx_twsi1>;
-                       pinctrl-names = "default";
  
                        s24c02: s24c02@50 {
 -                              compatible = "24c02";
 +                              compatible = "atmel,24c02";
                                reg = <0x50>;
                        };
                };