Merge branch 'mvebu/pcie' into for-next

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

diff --cc arch/arm/boot/dts/Makefile
Simple merge

diff --cc arch/arm/boot/dts/kirkwood-mplcec4.dts
index bf3a58cfcccf34da7df7a6c7d0492aa60604d484,90501cf129bbee8b648fa9d808c45cfb5a58a93e..1c5be252db23f89e17f6a0c3f363b4c20694d86f
--- 1/arch/arm/boot/dts/kirkwood-mplcec4.dts
--- 2/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/boot/dts/kirkwood.dtsi
Simple merge

diff --cc arch/arm/mach-kirkwood/Kconfig
Simple merge

diff --cc arch/arm/mach-kirkwood/Makefile
index 8846abf8fc737c0dbf80f063d13fb199a5d865eb,2fdc3a7ad226fa91e270bc97d6ec321f06107a90..ac4cd75dd499d37117bfe1603dfc803ae6e5739f
--- 1/arch/arm/mach-kirkwood/Makefile
--- 2/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-kirkwood/board-dt.c
Simple merge

diff --cc arch/arm/mach-kirkwood/common.c
Simple merge

diff --cc arch/arm/mach-kirkwood/common.h
Simple merge

diff --cc arch/arm/mach-mvebu/Kconfig
index 80a8bcacd9d539c0a684e3beaa927b07dd720566,381062d90c1d2569f67599077f04d68556c6c3b0..fb827ac9d906291aa58d92584d0845a9708d3609
--- 1/arch/arm/mach-mvebu/Kconfig
--- 2/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