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

Merge branch 'mvebu/pcie_kirkwood' into for-next

Conflicts:
	arch/arm/boot/dts/kirkwood-6281.dtsi
	arch/arm/boot/dts/kirkwood.dtsi
	arch/arm/mach-kirkwood/board-ts219.c
---

332dbb665f0d4bb27a8057a804d98df5fa387d8f
diff --cc arch/arm/boot/dts/kirkwood-6281.dtsi
index 0ed2f56a91f1,51376683dbcd..c40b779f54f4
--- a/arch/arm/boot/dts/kirkwood-6281.dtsi
+++ b/arch/arm/boot/dts/kirkwood-6281.dtsi
@@@ -41,32 -41,35 +41,63 @@@
  			};
  		};
  
 +		rtc@10300 {
 +			compatible = "marvell,kirkwood-rtc", "marvell,orion-rtc";
 +			reg = <0x10300 0x20>;
 +			interrupts = <53>;
 +			clocks = <&gate_clk 7>;
 +		};
 +
 +		sata@80000 {
 +			compatible = "marvell,orion-sata";
 +			reg = <0x80000 0x5000>;
 +			interrupts = <21>;
 +			clocks = <&gate_clk 14>, <&gate_clk 15>;
 +			clock-names = "0", "1";
 +			status = "disabled";
 +		};
 +
 +		mvsdio@90000 {
 +			compatible = "marvell,orion-sdio";
 +			reg = <0x90000 0x200>;
 +			interrupts = <28>;
 +			clocks = <&gate_clk 4>;
 +			bus-width = <4>;
 +			cap-sdio-irq;
 +			cap-sd-highspeed;
 +			cap-mmc-highspeed;
 +			status = "disabled";
 +		};
++
+ 		pcie-controller {
+ 			compatible = "marvell,kirkwood-pcie";
+ 			status = "disabled";
+ 			device_type = "pci";
+ 
+ 			#address-cells = <3>;
+ 			#size-cells = <2>;
+ 
+ 			bus-range = <0x00 0xff>;
+ 
+ 			ranges = <0x82000000 0 0x00040000 0x00040000 0 0x00002000   /* Port 0.0 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 0x00040000 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 &intc 9>;
+ 				marvell,pcie-port = <0>;
+ 				marvell,pcie-lane = <0>;
+ 				clocks = <&gate_clk 2>;
+ 				status = "disabled";
+ 			};
+ 		};
  	};
  };
diff --cc arch/arm/boot/dts/kirkwood-mplcec4.dts
index 211916a5a0fe,90501cf129bb..6179333fd71f
--- a/arch/arm/boot/dts/kirkwood-mplcec4.dts
+++ b/arch/arm/boot/dts/kirkwood-mplcec4.dts
@@@ -131,9 -136,17 +131,17 @@@
  			pinctrl-0 = <&pmx_sdio &pmx_sdio_cd>;
  			pinctrl-names = "default";
  			status = "okay";
 -			cd-gpios = <&gpio1 15 0>;
 +			cd-gpios = <&gpio1 15 1>;
  			/* No WP GPIO */
  		};
+ 
+ 		pcie-controller {
+ 			status = "okay";
+ 
+ 			pcie@1,0 {
+ 				status = "okay";
+ 			};
+ 		};
  	};
  
  	gpio-leds {
diff --cc arch/arm/boot/dts/kirkwood.dtsi
index 1ae3eb2dea2e,7eef88f00fea..9809fc1f105c
--- a/arch/arm/boot/dts/kirkwood.dtsi
+++ b/arch/arm/boot/dts/kirkwood.dtsi
@@@ -30,8 -18,8 +30,9 @@@
  
  	ocp@f1000000 {
  		compatible = "simple-bus";
 -		ranges = <0x00000000 0xf1000000 0x4000000
 +		ranges = <0x00000000 0xf1000000 0x0100000
+ 		          0xe0000000 0xe0000000 0x8100000 /* PCIE */
 +		          0xf4000000 0xf4000000 0x0000400
  		          0xf5000000 0xf5000000 0x0000400>;
  		#address-cells = <1>;
  		#size-cells = <1>;
diff --cc arch/arm/mach-kirkwood/Makefile
index 8846abf8fc73,2fdc3a7ad226..ac4cd75dd499
--- a/arch/arm/mach-kirkwood/Makefile
+++ b/arch/arm/mach-kirkwood/Makefile
@@@ -37,9 -37,7 +37,8 @@@ obj-$(CONFIG_MACH_NETSPACE_LITE_V2_DT)	
  obj-$(CONFIG_MACH_NETSPACE_MAX_V2_DT)	+= board-ns2.o
  obj-$(CONFIG_MACH_NETSPACE_MINI_V2_DT)	+= board-ns2.o
  obj-$(CONFIG_MACH_NETSPACE_V2_DT)	+= board-ns2.o
- obj-$(CONFIG_MACH_NSA310_DT)		+= board-nsa310.o
  obj-$(CONFIG_MACH_OPENBLOCKS_A6_DT)	+= board-openblocks_a6.o
  obj-$(CONFIG_MACH_READYNAS_DT)		+= board-readynas.o
 +obj-$(CONFIG_MACH_SHEEVAPLUG_DT)	+= board-sheevaplug.o
  obj-$(CONFIG_MACH_TOPKICK_DT)		+= board-usi_topkick.o
  obj-$(CONFIG_MACH_TS219_DT)		+= board-ts219.o tsx1x-common.o