From: Jason Cooper <jason@lakedaemon.net>
Date: Sun, 23 Jun 2013 21:53:05 +0000 (+0000)
Subject: Merge branch 'mvebu/dt' into for-next
X-Git-Tag: next-20130628~13^2~6
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=d4a74939d6c14d8c03e20e1523bd55ca1a63ecdb;p=karo-tx-linux.git

Merge branch 'mvebu/dt' into for-next
---

d4a74939d6c14d8c03e20e1523bd55ca1a63ecdb
diff --cc arch/arm/boot/dts/armada-370-xp.dtsi
index 52a1f5efc086,f7da39453d2f..bb6224c77c96
--- a/arch/arm/boot/dts/armada-370-xp.dtsi
+++ b/arch/arm/boot/dts/armada-370-xp.dtsi
@@@ -94,17 -98,17 +99,17 @@@
  				reg = <0x72004 0x4>;
  			};
  
- 			ethernet@70000 {
+ 			eth0: ethernet@70000 {
  				compatible = "marvell,armada-370-neta";
 -				reg = <0x70000 0x2500>;
 +				reg = <0x70000 0x4000>;
  				interrupts = <8>;
  				clocks = <&gateclk 4>;
  				status = "disabled";
  			};
  
- 			ethernet@74000 {
+ 			eth1: ethernet@74000 {
  				compatible = "marvell,armada-370-neta";
 -				reg = <0x74000 0x2500>;
 +				reg = <0x74000 0x4000>;
  				interrupts = <10>;
  				clocks = <&gateclk 3>;
  				status = "disabled";
diff --cc arch/arm/boot/dts/armada-xp-mv78460.dtsi
index 488ca5eb9a55,386f0ce48453..c7b1f4d5c1c7
--- a/arch/arm/boot/dts/armada-xp-mv78460.dtsi
+++ b/arch/arm/boot/dts/armada-xp-mv78460.dtsi
@@@ -105,9 -106,9 +106,9 @@@
  				interrupts = <91>;
  			};
  
- 			ethernet@34000 {
+ 			eth3: ethernet@34000 {
  				compatible = "marvell,armada-370-neta";
 -				reg = <0x34000 0x2500>;
 +				reg = <0x34000 0x4000>;
  				interrupts = <14>;
  				clocks = <&gateclk 1>;
  				status = "disabled";
diff --cc arch/arm/boot/dts/armada-xp.dtsi
index 1ee8540b0eba,6a82fe827ad8..416eb9481844
--- a/arch/arm/boot/dts/armada-xp.dtsi
+++ b/arch/arm/boot/dts/armada-xp.dtsi
@@@ -86,9 -90,9 +90,9 @@@
  				reg = <0x18200 0x500>;
  			};
  
- 			ethernet@30000 {
+ 			eth2: ethernet@30000 {
  				compatible = "marvell,armada-370-neta";
 -				reg = <0x30000 0x2500>;
 +				reg = <0x30000 0x4000>;
  				interrupts = <12>;
  				clocks = <&gateclk 2>;
  				status = "disabled";
diff --cc arch/arm/boot/dts/kirkwood-ts219.dtsi
index 4e29460baf04,b9325d45be78..47fb41bc3412
--- a/arch/arm/boot/dts/kirkwood-ts219.dtsi
+++ b/arch/arm/boot/dts/kirkwood-ts219.dtsi
@@@ -30,14 -34,13 +34,18 @@@
  		serial@12100 {
  			clock-frequency = <200000000>;
  			status = "okay";
+ 			pinctrl-0 = <&pmx_uart1>;
+ 			pinctrl-names = "default";
  		};
 +		poweroff@12100 {
 +			compatible = "qnap,power-off";
 +			reg = <0x12000 0x100>;
 +			clocks = <&gate_clk 7>;
 +		};
  		spi@10600 {
  			status = "okay";
+ 			pinctrl-0 = <&pmx_spi>;
+ 			pinctrl-names = "default";
  
  			m25p128@0 {
  				#address-cells = <1>;