From: Olof Johansson <olof@lixom.net>
Date: Tue, 11 Jun 2013 04:42:48 +0000 (-0700)
Subject: Merge branch 'next/dt' into for-next
X-Git-Tag: next-20130617~16^2~49
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=e0bad6381e72d51cf235842f430b921188c9edf0;p=karo-tx-linux.git

Merge branch 'next/dt' into for-next

* next/dt:
  ARM: Kirkwood add cpus definition needed by cpufreq driver to dtsi
  ARM: kirkwood: add i2c-gpio controller for km_kirkwood
  ARM: kirkwood: refactor dtsi to largest common nodes

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

Conflicts:
	arch/arm/boot/dts/kirkwood-6281.dtsi
---

e0bad6381e72d51cf235842f430b921188c9edf0
diff --cc arch/arm/arm-soc-for-next-contents.txt
index 59f6aff696c1,000000000000..2cac1f209c69
mode 100644,000000..100644
--- a/arch/arm/arm-soc-for-next-contents.txt
+++ b/arch/arm/arm-soc-for-next-contents.txt
@@@ -1,79 -1,0 +1,81 @@@
 +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>
 +		<...>
 +	<...>
 +
 +depends/rmk-devel-stable
 +	http://ftp.arm.linux.org.uk/pub/linux/arm/kernel/git-cur/linux-arm.git devel-stable
 +
 +next/fixes-non-critical
 +	mvebu/fixes-non-critical
 +		git://git.infradead.org/users/jcooper/linux.git tags/fixes-non-3.11-1
 +	sirf/fixes-non-critical
 +		git://gitorious.org/sirfprima2-kernel/sirfprima2-kernel.git tags/sirf-arm-soc-v3.10-fixes
 +
 +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
 +	mvebu/pcie2
 +		git://git.infradead.org/users/jcooper/linux.git tags/pcie_bridge-3.11
 +	mvebu/clk-cleanup
 +		git://git.infradead.org/users/jcooper/linux.git tags/seb_clk-3.11
 +	vexpress/dual-cluster
 +		git://git.linaro.org/people/nico/linux VExpress_DCSCB
 +		depends on depends/rmk-devel-stable
 +		+patch "drivers/bus: arm-cci: fix combined ARMv6+v7 build"
 +	zynq/clk
 +		git://git.xilinx.com/linux-xlnx tags/zynq-clk-for-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
 +	patch
 +		"ARM: nomadik: fix clocksource warning"
 +	at91/dt
 +		git://github.com/at91linux/linux-at91.git tags/at91-dt
 +	vt8500/dt
 +		git://github.com/linux-wmt/linux-vtwm vt8500/dts-3.11
 +	cleanup/dts-cpus
 +		git://linux-arm.org/linux-2.6-lp dts-cpus-updates
 +	patch
 +		"ARM: dts: add missing cpu #address-cell values"
++	mvebu/dt4
++		git://git.infradead.org/users/jcooper/linux.git tags/dt-3.11-4
 +
 +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-6281.dtsi
index 51376683dbcd,0ed2f56a91f1..1e5bef0bead7
--- a/arch/arm/boot/dts/kirkwood-6281.dtsi
+++ b/arch/arm/boot/dts/kirkwood-6281.dtsi
@@@ -41,35 -41,32 +41,63 @@@
  			};
  		};
  
 +		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";
 +			};
 +		};
++
+ 		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";
+ 		};
  	};
  };