From: Jason Cooper <jason@lakedaemon.net>
Date: Mon, 19 Aug 2013 21:28:44 +0000 (+0000)
Subject: Merge branch 'mvebu/dt' into for-next
X-Git-Tag: next-20130822~13^2~2
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=f34943eae9f389e5f58324b0424639ea12386c8f;p=karo-tx-linux.git

Merge branch 'mvebu/dt' into for-next

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

f34943eae9f389e5f58324b0424639ea12386c8f
diff --cc arch/arm/boot/dts/Makefile
index 8522958165bc,3d4b882a0e29..984a99777da7
--- a/arch/arm/boot/dts/Makefile
+++ b/arch/arm/boot/dts/Makefile
@@@ -102,8 -101,8 +103,9 @@@ dtb-$(CONFIG_ARCH_MSM) += msm8660-surf.
  	msm8960-cdp.dtb
  dtb-$(CONFIG_ARCH_MVEBU) += armada-370-db.dtb \
  	armada-370-mirabox.dtb \
+ 	armada-370-netgear-rn102.dtb \
  	armada-370-rd.dtb \
 +	armada-xp-axpwifiap.dtb \
  	armada-xp-db.dtb \
  	armada-xp-gp.dtb \
  	armada-xp-openblocks-ax3-4.dtb
diff --cc arch/arm/boot/dts/armada-xp-mv78230.dtsi
index 0963bc589b68,ab40f961384f..3f5e6121c730
--- a/arch/arm/boot/dts/armada-xp-mv78230.dtsi
+++ b/arch/arm/boot/dts/armada-xp-mv78230.dtsi
@@@ -193,9 -74,113 +193,9 @@@
  				gpio-controller;
  				#gpio-cells = <2>;
  				interrupt-controller;
- 				#interrupts-cells = <2>;
+ 				#interrupt-cells = <2>;
  				interrupts = <87>, <88>, <89>;
  			};
 -
 -			/*
 -			 * MV78230 has 2 PCIe units Gen2.0: One unit can be
 -			 * configured as x4 or quad x1 lanes. One unit is
 -			 * x4/x1.
 -			 */
 -			pcie-controller {
 -				compatible = "marvell,armada-xp-pcie";
 -				status = "disabled";
 -				device_type = "pci";
 -
 -#address-cells = <3>;
 -#size-cells = <2>;
 -
 -				bus-range = <0x00 0xff>;
 -
 -				ranges = <0x82000000 0 0x40000 0x40000 0 0x00002000   /* Port 0.0 registers */
 -					0x82000000 0 0x42000 0x42000 0 0x00002000   /* Port 2.0 registers */
 -					0x82000000 0 0x44000 0x44000 0 0x00002000   /* Port 0.1 registers */
 -					0x82000000 0 0x48000 0x48000 0 0x00002000   /* Port 0.2 registers */
 -					0x82000000 0 0x4c000 0x4c000 0 0x00002000   /* Port 0.3 registers */
 -					0x82000000 0 0xe0000000 0xe0000000 0 0x08000000   /* non-prefetchable memory */
 -					0x81000000 0 0	  0xe8000000 0 0x00100000>; /* downstream I/O */
 -
 -				pcie@1,0 {
 -					device_type = "pci";
 -					assigned-addresses = <0x82000800 0 0x40000 0 0x2000>;
 -					reg = <0x0800 0 0 0 0>;
 -					#address-cells = <3>;
 -					#size-cells = <2>;
 -					#interrupt-cells = <1>;
 -					ranges;
 -					interrupt-map-mask = <0 0 0 0>;
 -					interrupt-map = <0 0 0 0 &mpic 58>;
 -					marvell,pcie-port = <0>;
 -					marvell,pcie-lane = <0>;
 -					clocks = <&gateclk 5>;
 -					status = "disabled";
 -				};
 -
 -				pcie@2,0 {
 -					device_type = "pci";
 -					assigned-addresses = <0x82000800 0 0x44000 0 0x2000>;
 -					reg = <0x1000 0 0 0 0>;
 -					#address-cells = <3>;
 -					#size-cells = <2>;
 -					#interrupt-cells = <1>;
 -					ranges;
 -					interrupt-map-mask = <0 0 0 0>;
 -					interrupt-map = <0 0 0 0 &mpic 59>;
 -					marvell,pcie-port = <0>;
 -					marvell,pcie-lane = <1>;
 -					clocks = <&gateclk 6>;
 -					status = "disabled";
 -				};
 -
 -				pcie@3,0 {
 -					device_type = "pci";
 -					assigned-addresses = <0x82000800 0 0x48000 0 0x2000>;
 -					reg = <0x1800 0 0 0 0>;
 -					#address-cells = <3>;
 -					#size-cells = <2>;
 -					#interrupt-cells = <1>;
 -					ranges;
 -					interrupt-map-mask = <0 0 0 0>;
 -					interrupt-map = <0 0 0 0 &mpic 60>;
 -					marvell,pcie-port = <0>;
 -					marvell,pcie-lane = <2>;
 -					clocks = <&gateclk 7>;
 -					status = "disabled";
 -				};
 -
 -				pcie@4,0 {
 -					device_type = "pci";
 -					assigned-addresses = <0x82000800 0 0x4c000 0 0x2000>;
 -					reg = <0x2000 0 0 0 0>;
 -					#address-cells = <3>;
 -					#size-cells = <2>;
 -					#interrupt-cells = <1>;
 -					ranges;
 -					interrupt-map-mask = <0 0 0 0>;
 -					interrupt-map = <0 0 0 0 &mpic 61>;
 -					marvell,pcie-port = <0>;
 -					marvell,pcie-lane = <3>;
 -					clocks = <&gateclk 8>;
 -					status = "disabled";
 -				};
 -
 -				pcie@9,0 {
 -					device_type = "pci";
 -					assigned-addresses = <0x82000800 0 0x42000 0 0x2000>;
 -					reg = <0x4800 0 0 0 0>;
 -					#address-cells = <3>;
 -					#size-cells = <2>;
 -					#interrupt-cells = <1>;
 -					ranges;
 -					interrupt-map-mask = <0 0 0 0>;
 -					interrupt-map = <0 0 0 0 &mpic 99>;
 -					marvell,pcie-port = <2>;
 -					marvell,pcie-lane = <0>;
 -					clocks = <&gateclk 26>;
 -					status = "disabled";
 -				};
 -			};
  		};
  	};
  };