From: Kevin Hilman <khilman@linaro.org>
Date: Thu, 25 Jun 2015 04:32:26 +0000 (-0700)
Subject: Merge tag 'armsoc-drivers' into test-merge
X-Git-Tag: v4.2-rc1~31^2~10
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=32270e805a1e0baf39aa040177ef1896f03b7266;p=platform%2Fkernel%2Flinux-exynos.git

Merge tag 'armsoc-drivers' into test-merge

ARM: SoC: driver updates for v4.2

Some of these are for drivers/soc, where we're now putting
SoC-specific drivers these days. Some are for other driver subsystems
where we have received acks from the appropriate maintainers.

Some highlights:

- simple-mfd: document DT bindings and misc updates
- migrate mach-berlin to simple-mfd for clock, pinctrl and reset
- memory: support for Tegra132 SoC
- memory: introduce tegra EMC driver for scaling memory frequency
- misc. updates for ARM CCI and CCN busses

 Conflicts:
	arch/arm64/boot/dts/arm/juno-motherboard.dtsi

 Trivial add/add conflict with our dt branch.
 Resolution: take both sides.

# gpg: Signature made Wed Jun 24 21:32:17 2015 PDT using RSA key ID D3FBC665
# gpg: Good signature from "Kevin Hilman <khilman@deeprootsystems.com>"
# gpg:                 aka "Kevin Hilman <khilman@linaro.org>"
# gpg:                 aka "Kevin Hilman <khilman@kernel.org>"

# Conflicts:
#	arch/arm64/boot/dts/arm/juno-motherboard.dtsi
---

32270e805a1e0baf39aa040177ef1896f03b7266
diff --cc arch/arm64/boot/dts/arm/juno-motherboard.dtsi
index fde0cfa,5ce111d..021e0f4
--- a/arch/arm64/boot/dts/arm/juno-motherboard.dtsi
+++ b/arch/arm64/boot/dts/arm/juno-motherboard.dtsi
@@@ -129,14 -66,73 +129,82 @@@
  				#size-cells = <1>;
  				ranges = <0 3 0 0x200000>;
  
 +				v2m_sysctl: sysctl@020000 {
 +					compatible = "arm,sp810", "arm,primecell";
 +					reg = <0x020000 0x1000>;
 +					clocks = <&v2m_refclk32khz>, <&v2m_refclk1mhz>, <&mb_clk24mhz>;
 +					clock-names = "refclk", "timclk", "apb_pclk";
 +					#clock-cells = <1>;
 +					clock-output-names = "timerclken0", "timerclken1", "timerclken2", "timerclken3";
 +				};
++
+ 				apbregs@010000 {
+ 					compatible = "syscon", "simple-mfd";
+ 					reg = <0x010000 0x1000>;
+ 
+ 					led@08.0 {
+ 						compatible = "register-bit-led";
+ 						offset = <0x08>;
+ 						mask = <0x01>;
+ 						label = "vexpress:0";
+ 						linux,default-trigger = "heartbeat";
+ 						default-state = "on";
+ 					};
+ 					led@08.1 {
+ 						compatible = "register-bit-led";
+ 						offset = <0x08>;
+ 						mask = <0x02>;
+ 						label = "vexpress:1";
+ 						linux,default-trigger = "mmc0";
+ 						default-state = "off";
+ 					};
+ 					led@08.2 {
+ 						compatible = "register-bit-led";
+ 						offset = <0x08>;
+ 						mask = <0x04>;
+ 						label = "vexpress:2";
+ 						linux,default-trigger = "cpu0";
+ 						default-state = "off";
+ 					};
+ 					led@08.3 {
+ 						compatible = "register-bit-led";
+ 						offset = <0x08>;
+ 						mask = <0x08>;
+ 						label = "vexpress:3";
+ 						linux,default-trigger = "cpu1";
+ 						default-state = "off";
+ 					};
+ 					led@08.4 {
+ 						compatible = "register-bit-led";
+ 						offset = <0x08>;
+ 						mask = <0x10>;
+ 						label = "vexpress:4";
+ 						linux,default-trigger = "cpu2";
+ 						default-state = "off";
+ 					};
+ 					led@08.5 {
+ 						compatible = "register-bit-led";
+ 						offset = <0x08>;
+ 						mask = <0x20>;
+ 						label = "vexpress:5";
+ 						linux,default-trigger = "cpu3";
+ 						default-state = "off";
+ 					};
+ 					led@08.6 {
+ 						compatible = "register-bit-led";
+ 						offset = <0x08>;
+ 						mask = <0x40>;
+ 						label = "vexpress:6";
+ 						default-state = "off";
+ 					};
+ 					led@08.7 {
+ 						compatible = "register-bit-led";
+ 						offset = <0x08>;
+ 						mask = <0x80>;
+ 						label = "vexpress:7";
+ 						default-state = "off";
+ 					};
+ 				};
  
  				mmci@050000 {
  					compatible = "arm,pl180", "arm,primecell";