From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Tue, 24 May 2016 22:46:06 +0000 (-0700)
Subject: Merge tag 'armsoc-late' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc
X-Git-Tag: v4.7-rc1~60
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=08344f3b43a6bfaf2926122cef44d9a9583c2a4e;p=platform%2Fkernel%2Flinux-exynos.git

Merge tag 'armsoc-late' of git://git./linux/kernel/git/arm/arm-soc

Pull ARM SoC late DT updates from Arnd Bergmann:
 "This is a collection of a few late fixes and other misc stuff that had
  dependencies on things being merged from other trees.

  The Renesas R-Car power domain handling, and the Nvidia Tegra USB
  support both hand notable changes that required changing the DT
  binding in a way that only provides compatibility with old DT blobs on
  new kernels but not vice versa.  As a consequence, the DT changes are
  based on top of the driver changes and are now in this branch.

  For NXP i.MX and Samsung Exynos, the changes in here depend on other
  changes that got merged through the clk maintainer tree"

* tag 'armsoc-late' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (35 commits)
  ARM: dts: exynos: Add support of Bus frequency using VDD_INT for exynos5422-odroidxu3
  ARM: dts: exynos: Add bus nodes using VDD_INT for Exynos542x SoC
  ARM: dts: exynos: Add NoC Probe dt node for Exynos542x SoC
  ARM: dts: exynos: Add support of bus frequency for exynos4412-trats/odroidu3
  ARM: dts: exynos: Expand the voltage range of buck1/3 regulator for exynos4412-odroidu3
  ARM: dts: exynos: Add support of bus frequency using VDD_INT for exynos3250-rinato
  ARM: dts: exynos: Add exynos4412-ppmu-common dtsi to delete duplicate PPMU nodes
  ARM: dts: exynos: Add bus nodes using VDD_MIF for Exynos4210
  ARM: dts: exynos: Add bus nodes using VDD_INT for Exynos4x12
  ARM: dts: exynos: Add bus nodes using VDD_MIF for Exynos4x12
  ARM: dts: exynos: Add bus nodes using VDD_INT for Exynos3250
  ARM: dts: exynos: Add DMC bus frequency for exynos3250-rinato/monk
  ARM: dts: exynos: Add DMC bus node for Exynos3250
  ARM: tegra: Enable XUSB on Nyan
  ARM: tegra: Enable XUSB on Jetson TK1
  ARM: tegra: Enable XUSB on Venice2
  ARM: tegra: Add Tegra124 XUSB controller
  ARM: tegra: Move Tegra124 to the new XUSB pad controller binding
  ARM: dts: r8a7794: Use SYSC "always-on" PM Domain
  ARM: dts: r8a7793: Use SYSC "always-on" PM Domain
  ...
---

08344f3b43a6bfaf2926122cef44d9a9583c2a4e
diff --cc arch/arm/boot/dts/Makefile
index 0f89d87,65e99f8..06b6c2d
--- a/arch/arm/boot/dts/Makefile
+++ b/arch/arm/boot/dts/Makefile
@@@ -386,19 -370,14 +386,20 @@@ dtb-$(CONFIG_SOC_IMX6SL) += 
  	imx6sl-evk.dtb \
  	imx6sl-warp.dtb
  dtb-$(CONFIG_SOC_IMX6SX) += \
 +	imx6sx-nitrogen6sx.dtb \
  	imx6sx-sabreauto.dtb \
  	imx6sx-sdb-reva.dtb \
 +	imx6sx-sdb-sai.dtb \
  	imx6sx-sdb.dtb
  dtb-$(CONFIG_SOC_IMX6UL) += \
 -	imx6ul-14x14-evk.dtb
 +	imx6ul-14x14-evk.dtb \
 +	imx6ul-pico-hobbit.dtb \
 +	imx6ul-tx6ul-0010.dtb \
 +	imx6ul-tx6ul-0011.dtb \
 +	imx6ul-tx6ul-mainboard.dtb
  dtb-$(CONFIG_SOC_IMX7D) += \
  	imx7d-cl-som-imx7.dtb \
+ 	imx7d-nitrogen7.dtb \
  	imx7d-sbc-imx7.dtb \
  	imx7d-sdb.dtb
  dtb-$(CONFIG_SOC_LS1021A) += \
diff --cc arch/arm/boot/dts/exynos5422-odroidxu3-common.dtsi
index 20fa761,d32984c..2a4e10b
--- a/arch/arm/boot/dts/exynos5422-odroidxu3-common.dtsi
+++ b/arch/arm/boot/dts/exynos5422-odroidxu3-common.dtsi
@@@ -357,10 -442,24 +440,26 @@@
  	pinctrl-0 = <&sd2_clk &sd2_cmd &sd2_cd &sd2_bus1 &sd2_bus4>;
  	bus-width = <4>;
  	cap-sd-highspeed;
 +	vmmc-supply = <&ldo19_reg>;
 +	vqmmc-supply = <&ldo13_reg>;
  };
  
+ &nocp_mem0_0 {
+ 	status = "okay";
+ };
+ 
+ &nocp_mem0_1 {
+ 	status = "okay";
+ };
+ 
+ &nocp_mem1_0 {
+ 	status = "okay";
+ };
+ 
+ &nocp_mem1_1 {
+ 	status = "okay";
+ };
+ 
  &pinctrl_0 {
  	hdmi_hpd_irq: hdmi-hpd-irq {
  		samsung,pins = "gpx3-7";