From: Jason Cooper <jason@lakedaemon.net>
Date: Fri, 16 May 2014 18:00:50 +0000 (+0000)
Subject: Merge branch 'mvebu/dt' into for-next
X-Git-Tag: next-20140519~107^2
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=74be6be684a8c5b36665a927cb301ee0b584ecad;p=karo-tx-linux.git

Merge branch 'mvebu/dt' into for-next

Conflicts:
	arch/arm/boot/dts/kirkwood-t5325.dts
---

74be6be684a8c5b36665a927cb301ee0b584ecad
diff --cc arch/arm/boot/dts/armada-38x.dtsi
index ca8813bb99ba,28d7c02be805..3de364e81b52
--- a/arch/arm/boot/dts/armada-38x.dtsi
+++ b/arch/arm/boot/dts/armada-38x.dtsi
@@@ -336,9 -373,24 +373,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-mv88f6281gtw-ge.dts
index b939f4f52d16,343dbb44b3d2..8f76d28759a3
--- a/arch/arm/boot/dts/kirkwood-mv88f6281gtw-ge.dts
+++ b/arch/arm/boot/dts/kirkwood-mv88f6281gtw-ge.dts
@@@ -28,20 -28,11 +28,21 @@@
  
  	chosen {
  		bootargs = "console=ttyS0,115200n8 earlyprintk";
+ 		stdout-path = &uart0;
  	};
  
 +	mbus {
 +		pcie-controller {
 +			status = "okay";
 +
 +			pcie@1,0 {
 +				status = "okay";
 +			};
 +		};
 +        };
 +
  	ocp@f1000000 {
- 		pinctrl@10000 {
+ 		pin-controller@10000 {
  			pmx_usb_led: pmx-usb-led {
  				marvell,pins = "mpp12";
  				marvell,function = "gpo";
diff --cc arch/arm/boot/dts/kirkwood-nsa3x0-common.dtsi
index e2cc85cc3b87,9cb083b72404..2075a2e828f1
--- a/arch/arm/boot/dts/kirkwood-nsa3x0-common.dtsi
+++ b/arch/arm/boot/dts/kirkwood-nsa3x0-common.dtsi
@@@ -4,20 -4,10 +4,20 @@@
  / {
  	model = "ZyXEL NSA310";
  
 +	mbus {
 +		pcie-controller {
 +			status = "okay";
 +
 +			pcie@1,0 {
 +				status = "okay";
 +			};
 +		};
 +	};
 +
  	ocp@f1000000 {
- 		pinctrl: pinctrl@10000 {
+ 		pinctrl: pin-controller@10000 {
  
- 			pmx_usb_power_off: pmx-usb-power-off {
+ 			pmx_usb_power: pmx-usb-power {
  				marvell,pins = "mpp21";
  				marvell,function = "gpio";
  			};
diff --cc arch/arm/boot/dts/kirkwood-openblocks_a6.dts
index 0650beafc1de,3dcb5c26b78b..fb9dc227255d
--- a/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 38520a287514,4e10e92b7822..d5e3bc518968
--- a/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>;
  			};
  		};