From: Jason Cooper <jason@lakedaemon.net>
Date: Mon, 20 May 2013 20:29:20 +0000 (+0000)
Subject: Merge branch 'mvebu/pcie' into for-next
X-Git-Tag: next-20130521~9^2~1
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=aa826a64949ae0b31f9c6e8ea60805f3359f169a;p=karo-tx-linux.git

Merge branch 'mvebu/pcie' into for-next

Conflicts:
	arch/arm/mach-mvebu/Kconfig
	 - add/add
---

aa826a64949ae0b31f9c6e8ea60805f3359f169a
diff --cc arch/arm/boot/dts/kirkwood-mplcec4.dts
index bf3a58cfcccf,90501cf129bb..1c5be252db23
--- a/arch/arm/boot/dts/kirkwood-mplcec4.dts
+++ b/arch/arm/boot/dts/kirkwood-mplcec4.dts
@@@ -136,9 -136,17 +136,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/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
diff --cc arch/arm/mach-mvebu/Kconfig
index 80a8bcacd9d5,381062d90c1d..fb827ac9d906
--- a/arch/arm/mach-mvebu/Kconfig
+++ b/arch/arm/mach-mvebu/Kconfig
@@@ -15,7 -15,8 +15,9 @@@ config ARCH_MVEB
  	select MVEBU_CLK_GATING
  	select MVEBU_MBUS
  	select ZONE_DMA if ARM_LPAE
 +	select ARCH_REQUIRE_GPIOLIB
+ 	select MIGHT_HAVE_PCI
+ 	select PCI_QUIRKS if PCI
  
  if ARCH_MVEBU