Merge tag 'regmap-v3.11' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie...

[deliverable/linux.git] / arch / arm / boot / dts / tegra30-cardhu-a02.dts

diff --git a/arch/arm/boot/dts/tegra30-cardhu-a02.dts b/arch/arm/boot/dts/tegra30-cardhu-a02.dts
index e392bd2dab9b5af322d39a5363e4e9cd479ef723..1082c5ed90d18ecdd413cc43c5874cb7c27013ab 100644 (file)
--- a/arch/arm/boot/dts/tegra30-cardhu-a02.dts
+++ b/arch/arm/boot/dts/tegra30-cardhu-a02.dts
@@ -1,6 +1,6 @@
 /dts-v1/;
 
-/include/ "tegra30-cardhu.dtsi"
+#include "tegra30-cardhu.dtsi"
 
 /* This dts file support the cardhu A02 version of board */
 
@@ -22,7 +22,7 @@
                        regulator-always-on;
                        regulator-boot-on;
                        enable-active-high;
-                       gpio = <&pmic 6 0>;
+                       gpio = <&pmic 6 GPIO_ACTIVE_HIGH>;
                };
 
                sys_3v3_reg: regulator@101 {
@@ -34,7 +34,7 @@
                        regulator-always-on;
                        regulator-boot-on;
                        enable-active-high;
-                       gpio = <&pmic 7 0>;
+                       gpio = <&pmic 7 GPIO_ACTIVE_HIGH>;
                };
 
                usb1_vbus_reg: regulator@102 {
@@ -44,7 +44,7 @@
                        regulator-min-microvolt = <5000000>;
                        regulator-max-microvolt = <5000000>;
                        enable-active-high;
-                       gpio = <&gpio 68 0>; /* GPIO PI4 */
+                       gpio = <&gpio TEGRA_GPIO(I, 4) GPIO_ACTIVE_HIGH>;
                        gpio-open-drain;
                        vin-supply = <&vdd_5v0_reg>;
                };
@@ -56,7 +56,7 @@
                        regulator-min-microvolt = <5000000>;
                        regulator-max-microvolt = <5000000>;
                        enable-active-high;
-                       gpio = <&gpio 63 0>; /* GPIO PH7 */
+                       gpio = <&gpio TEGRA_GPIO(H, 7) GPIO_ACTIVE_HIGH>;
                        gpio-open-drain;
                        vin-supply = <&vdd_5v0_reg>;
                };
@@ -68,7 +68,7 @@
                        regulator-min-microvolt = <5000000>;
                        regulator-max-microvolt = <5000000>;
                        enable-active-high;
-                       gpio = <&pmic 2 0>;
+                       gpio = <&pmic 2 GPIO_ACTIVE_HIGH>;
                };
 
                vdd_bl_reg: regulator@105 {
@@ -80,13 +80,13 @@
                        regulator-always-on;
                        regulator-boot-on;
                        enable-active-high;
-                       gpio = <&gpio 83 0>; /* GPIO PK3 */
+                       gpio = <&gpio TEGRA_GPIO(K, 3) GPIO_ACTIVE_HIGH>;
                };
        };
 
        sdhci@78000400 {
                status = "okay";
-               power-gpios = <&gpio 28 0>; /* gpio PD4 */
+               power-gpios = <&gpio TEGRA_GPIO(D, 4) GPIO_ACTIVE_HIGH>;
                bus-width = <4>;
                keep-power-in-suspend;
        };