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

Pull ARM SoC device tree changes from Arnd Bergmann:
 "These changes from 30 individual branches for the most part update
  device tree files, but there are also a few source code changes that
  have crept in this time, usually in order to atomically move over a
  driver from using hardcoded data to DT probing.

  A number of platforms change their DT files to use the C preprocessor,
  which is causing a bit of churn, but that is hopefully only this once"

* tag 'dt-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (372 commits)
  ARM: at91: dt: rm9200ek: add spi support
  ARM: at91: dt: rm9200: add spi support
  ARM: at91/DT: at91sam9n12: add SPI DMA client infos
  ARM: at91/DT: sama5d3: add SPI DMA client infos
  ARM: at91/DT: fix SPI compatibility string
  ARM: Kirkwood: Fix the internal register ranges translation
  ARM: dts: bcm281xx: change comment to C89 style
  ARM: mmc: bcm281xx SDHCI driver (dt mods)
  ARM: nomadik: add the new clocks to the device tree
  clk: nomadik: implement the Nomadik clocks properly
  ARM: dts: omap5-uevm: Provide USB Host PHY clock frequency
  ARM: dts: omap4-panda: Fix DVI EDID reads
  ARM: dts: omap4-panda: Add USB Host support
  arm: mvebu: enable mini-PCIe connectors on Armada 370 RD
  ARM: shmobile: irqpin: add a DT property to enable masking on parent
  ARM: dts: AM43x EPOS EVM support
  ARM: dts: OMAP5: Add bandgap DT entry
  ARM: dts: AM33XX: Add pinmux configuration for CPSW to am335x EVM
  ARM: dts: AM33XX: Add pinmux configuration for CPSW to EVMsk
  ARM: dts: AM33XX: Add pinmux configuration for CPSW to beaglebone
  ...

1 files changed, 17 insertions, 10 deletions

diff --git a/arch/arm/boot/dts/tegra20-colibri-512.dtsi b/arch/arm/boot/dts/tegra20-colibri-512.dtsi
index c12af78e479c..2fcb3f2ca160 100644
--- a/arch/arm/boot/dts/tegra20-colibri-512.dtsi
+++ b/arch/arm/boot/dts/tegra20-colibri-512.dtsi
@@ -1,4 +1,4 @@
-/include/ "tegra20.dtsi"
+#include "tegra20.dtsi"
 
 / {
         model = "Toradex Colibri T20 512MB";
@@ -14,7 +14,8 @@
                         pll-supply = <&hdmi_pll_reg>;
 
                         nvidia,ddc-i2c-bus = <&i2c_ddc>;
-                        nvidia,hpd-gpio = <&gpio 111 0>; /* PN7 */
+                        nvidia,hpd-gpio = <&gpio TEGRA_GPIO(N, 7)
+                                GPIO_ACTIVE_HIGH>;
                 };
         };
 
@@ -217,7 +218,7 @@
                 pmic: tps6586x@34 {
                         compatible = "ti,tps6586x";
                         reg = <0x34>;
-                        interrupts = <0 86 0x4>;
+                        interrupts = <GIC_SPI 86 IRQ_TYPE_LEVEL_HIGH>;
 
                         ti,system-power-controller;
 
@@ -443,21 +444,25 @@
 
         ac97: ac97 {
                 status = "okay";
-                nvidia,codec-reset-gpio = <&gpio 168 0>; /* gpio PV0 */
-                nvidia,codec-sync-gpio = <&gpio 120 0>; /* gpio PP0 */
+                nvidia,codec-reset-gpio = <&gpio TEGRA_GPIO(V, 0)
+                        GPIO_ACTIVE_HIGH>;
+                nvidia,codec-sync-gpio = <&gpio TEGRA_GPIO(P, 0)
+                        GPIO_ACTIVE_HIGH>;
         };
 
         usb@c5004000 {
                 status = "okay";
-                nvidia,phy-reset-gpio = <&gpio 169 1>; /* gpio PV1, active low */
+                nvidia,phy-reset-gpio = <&gpio TEGRA_GPIO(V, 1)
+                        GPIO_ACTIVE_LOW>;
         };
 
         usb-phy@c5004000 {
-                nvidia,phy-reset-gpio = <&gpio 169 1>; /* gpio PV1, active low */
+                nvidia,phy-reset-gpio = <&gpio TEGRA_GPIO(V, 1)
+                        GPIO_ACTIVE_LOW>;
         };
 
         sdhci@c8000600 {
-                cd-gpios = <&gpio 23 1>; /* gpio PC7 */
+                cd-gpios = <&gpio TEGRA_GPIO(C, 7) GPIO_ACTIVE_LOW>;
         };
 
         clocks {
@@ -487,7 +492,9 @@
 
                 nvidia,ac97-controller = <&ac97>;
 
-                clocks = <&tegra_car 112>, <&tegra_car 113>, <&tegra_car 94>;
+                clocks = <&tegra_car TEGRA20_CLK_PLL_A>,
+                         <&tegra_car TEGRA20_CLK_PLL_A_OUT0>,
+                         <&tegra_car TEGRA20_CLK_CDEV1>;
                 clock-names = "pll_a", "pll_a_out0", "mclk";
         };
 
@@ -514,7 +521,7 @@
                         enable-active-high;
                         regulator-boot-on;
                         regulator-always-on;
-                        gpio = <&gpio 217 0>;
+                        gpio = <&gpio TEGRA_GPIO(BB, 1) GPIO_ACTIVE_HIGH>;
                 };
         };
 };