From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 6 Sep 2013 20:26:27 +0000 (-0700)
Subject: Merge tag 'dt-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc
X-Git-Tag: next-20130912~140
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=dccfd1e439c11422d7aca0d834b0430d24650e85;p=karo-tx-linux.git

Merge tag 'dt-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc

Pull ARM SoC DT updates from Olof Johansson:
 "Device tree and bindings updates for 3.12.

  General additions of various on-chip and on-board peripherals on
  various platforms as support gets added.  Some of the bigger changes
  are:

   - Addition of (new) PCI-e support on Tegra.
   - More Tegra4 support, including PMC configuration for Dalmore.
   - Addition of a new board for Exynos4 (trats2) and more bindings for
     4x12 IP.
   - Addition of Allwinner A20 and A31 SoC and board files.
   - Move of the ST Ericsson device tree files to now use ste-* prefix.
   - More move of hardware description of shmobile platforms to DT.
   - Two new board dts files for Freescale MXs"

* tag 'dt-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (177 commits)
  dts: Rename DW APB timer compatible strings
  dts: Deprecate ALTR as a vendor prefix
  of: add vendor prefix for Altera Corp.
  ARM: at91/dt: sam9x5ek: add sound configuration
  ARM: at91/dt: sam9x5ek: enable SSC
  ARM: at91/dt: sam9x5ek: add WM8731 codec
  ARM: at91/dt: sam9x5: add SSC DMA parameters
  ARM: at91/dt: add at91rm9200 PQFP package version
  ARM: at91: at91rm9200: set default mmc0 pinctrl-names
  ARM: at91: at91sam9n12: correct pin number of gpio-key
  ARM: at91: at91sam9n12: add qt1070 support
  ARM: at91: at91sam9n12: add pinctrl of TWI
  ARM: at91: Add PMU support for sama5d3
  ARM: at91: at91sam9260: add missing pinctrl-names on mmc
  ARM: tegra: configure power off for Dalmore
  ARM: DT: binding fixup to align with vendor-prefixes.txt (DT)
  ARM: dts: add sdio blocks to bcm28155-ap board
  ARM: dts: align sdio numbers to HW definition
  ARM: sun7i: Add Olimex A20-Olinuxino-Micro support
  ARM: sun7i: Add Allwinner A20 DTSI
  ...
---

dccfd1e439c11422d7aca0d834b0430d24650e85
diff --cc arch/arm/boot/dts/exynos4x12.dtsi
index 3aa2f060ba61,954628c7f167..ad531fe6ab95
--- a/arch/arm/boot/dts/exynos4x12.dtsi
+++ b/arch/arm/boot/dts/exynos4x12.dtsi
@@@ -26,9 -26,16 +26,16 @@@
  		pinctrl1 = &pinctrl_1;
  		pinctrl2 = &pinctrl_2;
  		pinctrl3 = &pinctrl_3;
+ 		fimc-lite0 = &fimc_lite_0;
+ 		fimc-lite1 = &fimc_lite_1;
+ 	};
+ 
+ 	pd_isp: isp-power-domain@10023CA0 {
+ 		compatible = "samsung,exynos4210-pd";
+ 		reg = <0x10023CA0 0x20>;
  	};
  
 -	clock: clock-controller@0x10030000 {
 +	clock: clock-controller@10030000 {
  		compatible = "samsung,exynos4412-clock";
  		reg = <0x10030000 0x20000>;
  		#clock-cells = <1>;
diff --cc arch/arm/boot/dts/exynos5440.dtsi
index 1b81f36896bc,606da5f39269..5d6cf4965d6e
--- a/arch/arm/boot/dts/exynos5440.dtsi
+++ b/arch/arm/boot/dts/exynos5440.dtsi
@@@ -18,9 -18,12 +18,12 @@@
  
  	aliases {
  		spi0 = &spi_0;
+ 		tmuctrl0 = &tmuctrl_0;
+ 		tmuctrl1 = &tmuctrl_1;
+ 		tmuctrl2 = &tmuctrl_2;
  	};
  
 -	clock: clock-controller@0x160000 {
 +	clock: clock-controller@160000 {
  		compatible = "samsung,exynos5440-clock";
  		reg = <0x160000 0x1000>;
  		#clock-cells = <1>;
diff --cc arch/arm/boot/dts/tegra20-seaboard.dts
index c8242533268f,f44a9b8e23bf..315aae26c3cd
--- a/arch/arm/boot/dts/tegra20-seaboard.dts
+++ b/arch/arm/boot/dts/tegra20-seaboard.dts
@@@ -828,9 -829,7 +828,9 @@@
  			regulator-min-microvolt = <5000000>;
  			regulator-max-microvolt = <5000000>;
  			enable-active-high;
- 			gpio = <&gpio 24 0>; /* PD0 */
+ 			gpio = <&gpio TEGRA_GPIO(D, 0) 0>;
 +			regulator-always-on;
 +			regulator-boot-on;
  		};
  	};
  
diff --cc arch/arm/boot/dts/tegra20-trimslice.dts
index 1e9d33adb925,22e227f87e4c..78deea5c0d21
--- a/arch/arm/boot/dts/tegra20-trimslice.dts
+++ b/arch/arm/boot/dts/tegra20-trimslice.dts
@@@ -310,8 -310,19 +310,18 @@@
  		nvidia,sys-clock-req-active-high;
  	};
  
+ 	pcie-controller {
+ 		status = "okay";
+ 		pex-clk-supply = <&pci_clk_reg>;
+ 		vdd-supply = <&pci_vdd_reg>;
+ 
+ 		pci@1,0 {
+ 			status = "okay";
+ 		};
+ 	};
+ 
  	usb@c5000000 {
  		status = "okay";
 -		nvidia,vbus-gpio = <&gpio TEGRA_GPIO(V, 2) GPIO_ACTIVE_HIGH>;
  	};
  
  	usb-phy@c5000000 {
@@@ -410,10 -421,26 +420,28 @@@
  			regulator-min-microvolt = <5000000>;
  			regulator-max-microvolt = <5000000>;
  			enable-active-high;
- 			gpio = <&gpio 170 0>; /* PV2 */
+ 			gpio = <&gpio TEGRA_GPIO(V, 2) 0>;
 +			regulator-always-on;
 +			regulator-boot-on;
  		};
+ 
+ 		pci_clk_reg: regulator@3 {
+ 			compatible = "regulator-fixed";
+ 			reg = <3>;
+ 			regulator-name = "pci_clk";
+ 			regulator-min-microvolt = <3300000>;
+ 			regulator-max-microvolt = <3300000>;
+ 			regulator-always-on;
+ 		};
+ 
+ 		pci_vdd_reg: regulator@4 {
+ 			compatible = "regulator-fixed";
+ 			reg = <4>;
+ 			regulator-name = "pci_vdd";
+ 			regulator-min-microvolt = <1050000>;
+ 			regulator-max-microvolt = <1050000>;
+ 			regulator-always-on;
+ 		};
  	};
  
  	sound {