From: Olof Johansson <olof@lixom.net>
Date: Sat, 1 Jun 2013 06:19:45 +0000 (-0700)
Subject: Merge branch 'next/soc' into for-next
X-Git-Tag: next-20130607~15^2~7
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=796ba0d8ae693d3075754f4f274f369d7083492f;p=karo-tx-linux.git

Merge branch 'next/soc' into for-next

* next/soc:
  arm: kirkwood: convert db-88f6281/db-88f6282 to the Device Tree
  arm: kirkwood: convert QNAP TS219 to use DT for the PCIe interface
  arm: kirkwood: convert ZyXEL NSA310 to use DT for the PCIe interface
  arm: kirkwood: convert MPL CEC4 to use DT for the PCIe interface
  arm: kirkwood: convert Iomega Iconnect to use DT for the PCIe interface
  arm: kirkwood: add SoC-level Device Tree data for PCIe interfaces
  arm: kirkwood: move PCIe window init to legacy driver
  pci: mvebu: enable driver usage on Kirkwood

Signed-off-by: Olof Johansson <olof@lixom.net>
---

796ba0d8ae693d3075754f4f274f369d7083492f
diff --cc arch/arm/arm-soc-for-next-contents.txt
index 5bc6d3829cce,000000000000..0f041980939c
mode 100644,000000..100644
--- a/arch/arm/arm-soc-for-next-contents.txt
+++ b/arch/arm/arm-soc-for-next-contents.txt
@@@ -1,51 -1,0 +1,53 @@@
 +for-next contents for 3.11: 
 +Format is a little different from before in an attempt to make it easier to read:
 +
 +<next/* branch>
 +	<topic branch>
 +		<contents>
 +		<...>
 +	<...>
 +
 +next/fixes-non-critical
 +	mvebu/fixes-non-critical
 +		git://git.infradead.org/users/jcooper/linux.git tags/fixes-non-3.11-1
 +
 +next/cleanup
 +	at91/cleanup
 +		git://github.com/at91linux/linux-at91.git tags/at91-cleanup
 +	machdesc/cleanup
 +		git://github.com/mripard/linux.git tags/arm-soc-cleanups-for-3.11
 +	mvebu/cleanup
 +		git://git.infradead.org/users/jcooper/linux.git tags/cleanup-3.11-3
 +	dt/pci-helpers
 +		git://git.infradead.org/users/jcooper/linux.git tags/of_pci-3.11
 +
 +next/soc
 +	mvebu/soc
 +		git://git.infradead.org/users/jcooper/linux.git tags/soc-3.11-2
 +	mvebu/defconfig
 +		git://git.infradead.org/users/jcooper/linux.git tags/defconfig-3.11-3
 +	mvebu/pcie
 +		git://git.infradead.org/users/jcooper/linux.git tags/pcie-3.11-2
++	mvebu/pcie-kirkwood
++		git://git.infradead.org/users/jcooper/linux.git tags/pcie_kw-3.11
 +
 +next/boards
 +	mvebu/boards
 +		  git://git.infradead.org/users/jcooper/linux.git tags/boards-3.11-2
 +
 +
 +next/dt
 +	nomadik/dt
 +		git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-nomadik.git tags/nomadik-dt-for-arm-soc
 +	mvebu/dt
 +		git://git.infradead.org/users/jcooper/linux.git tags/dt-3.11-3
 +
 +next/drivers
 +	ux500/dma40
 +		git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-stericsson.git tags/ux500-dma40-for-arm-soc
 +
 +next/mailbox:
 +	mailbox/subsystem
 +		git://github.com/sumananna/mailbox.git dbx500-prcmu-mailbox
 +
 +
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/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-kirkwood/board-ts219.c
index 10fb3974de5a,4695d5f35fc9..860f44ab457d
--- a/arch/arm/mach-kirkwood/board-ts219.c
+++ b/arch/arm/mach-kirkwood/board-ts219.c
@@@ -37,14 -38,6 +37,4 @@@ void __init qnap_dt_ts219_init(void
  		qnap_ts219_ge00_data.phy_addr = MV643XX_ETH_PHY_ADDR(0);
  
  	kirkwood_ge00_init(&qnap_ts219_ge00_data);
 -
 -	pm_power_off = qnap_tsx1x_power_off;
  }
- 
- /* FIXME: Will not work with DT. Maybe use MPP40_GPIO? */
- static int __init ts219_pci_init(void)
- {
- 	if (machine_is_ts219())
- 		kirkwood_pcie_init(KW_PCIE0);
- 
- 	return 0;
- }
- subsys_initcall(ts219_pci_init);