ARM: tegra: dts: fix lock, io-reset and open-drain properties

Signed-off-by: Svyatoslav Ryhel <clamor95@gmail.com>

diff --git a/arch/arm/dts/tegra124-xiaomi-mocha.dts b/arch/arm/dts/tegra124-xiaomi-mocha.dts
index 6cb1781..64386f2 100644 (file)
--- a/arch/arm/dts/tegra124-xiaomi-mocha.dts
+++ b/arch/arm/dts/tegra124-xiaomi-mocha.dts
@@ -215,8 +215,8 @@
                                nvidia,pull = <TEGRA_PIN_PULL_NONE>;
                                nvidia,tristate = <TEGRA_PIN_DISABLE>;
                                nvidia,enable-input = <TEGRA_PIN_ENABLE>;
-                               nvidia,lock = <1>;
-                               nvidia,open-drain = <1>;
+                               nvidia,lock = <TEGRA_PIN_DISABLE>;
+                               nvidia,open-drain = <TEGRA_PIN_DISABLE>;
                        };
                        gen2-i2c {
                                nvidia,pins = "gen2_i2c_scl_pt5",
@@ -225,8 +225,8 @@
                                nvidia,pull = <TEGRA_PIN_PULL_NONE>;
                                nvidia,tristate = <TEGRA_PIN_DISABLE>;
                                nvidia,enable-input = <TEGRA_PIN_ENABLE>;
-                               nvidia,lock = <1>;
-                               nvidia,open-drain = <1>;
+                               nvidia,lock = <TEGRA_PIN_DISABLE>;
+                               nvidia,open-drain = <TEGRA_PIN_DISABLE>;
                        };
                        cam-i2c {
                                nvidia,pins = "cam_i2c_scl_pbb1",
@@ -235,8 +235,8 @@
                                nvidia,pull = <TEGRA_PIN_PULL_NONE>;
                                nvidia,tristate = <TEGRA_PIN_DISABLE>;
                                nvidia,enable-input = <TEGRA_PIN_ENABLE>;
-                               nvidia,lock = <1>;
-                               nvidia,open-drain = <1>;
+                               nvidia,lock = <TEGRA_PIN_DISABLE>;
+                               nvidia,open-drain = <TEGRA_PIN_DISABLE>;
                        };
                        ddc-i2c {
                                nvidia,pins = "ddc_scl_pv4",
@@ -253,7 +253,7 @@
                                nvidia,pull = <TEGRA_PIN_PULL_NONE>;
                                nvidia,tristate = <TEGRA_PIN_DISABLE>;
                                nvidia,enable-input = <TEGRA_PIN_ENABLE>;
-                               nvidia,open-drain = <1>;
+                               nvidia,open-drain = <TEGRA_PIN_DISABLE>;
                        };
 
                        dsi-b {

diff --git a/arch/arm/dts/tegra30-asus-p1801-t.dts b/arch/arm/dts/tegra30-asus-p1801-t.dts
index 4b7b64b..58f1499 100644 (file)
--- a/arch/arm/dts/tegra30-asus-p1801-t.dts
+++ b/arch/arm/dts/tegra30-asus-p1801-t.dts
@@ -108,8 +108,8 @@
                                nvidia,pull = <TEGRA_PIN_PULL_NONE>;
                                nvidia,tristate = <TEGRA_PIN_DISABLE>;
                                nvidia,enable-input = <TEGRA_PIN_ENABLE>;
-                               nvidia,lock = <1>;
-                               nvidia,io-reset = <1>;
+                               nvidia,lock = <TEGRA_PIN_DISABLE>;
+                               nvidia,io-reset = <TEGRA_PIN_DISABLE>;
                        };
 
                        /* SDMMC3 pinmux */
@@ -193,7 +193,7 @@
                                nvidia,tristate = <TEGRA_PIN_DISABLE>;
                                nvidia,enable-input = <TEGRA_PIN_ENABLE>;
                                nvidia,open-drain = <TEGRA_PIN_ENABLE>;
-                               nvidia,lock = <1>;
+                               nvidia,lock = <TEGRA_PIN_DISABLE>;
                        };
                        gen2_i2c {
                                nvidia,pins = "gen2_i2c_scl_pt5",
@@ -203,7 +203,7 @@
                                nvidia,tristate = <TEGRA_PIN_DISABLE>;
                                nvidia,enable-input = <TEGRA_PIN_ENABLE>;
                                nvidia,open-drain = <TEGRA_PIN_ENABLE>;
-                               nvidia,lock = <1>;
+                               nvidia,lock = <TEGRA_PIN_DISABLE>;
                        };
                        cam_i2c {
                                nvidia,pins = "cam_i2c_scl_pbb1",
@@ -213,7 +213,7 @@
                                nvidia,tristate = <TEGRA_PIN_DISABLE>;
                                nvidia,enable-input = <TEGRA_PIN_ENABLE>;
                                nvidia,open-drain = <TEGRA_PIN_ENABLE>;
-                               nvidia,lock = <1>;
+                               nvidia,lock = <TEGRA_PIN_DISABLE>;
                        };
                        ddc_i2c {
                                nvidia,pins = "ddc_scl_pv4",
@@ -222,7 +222,7 @@
                                nvidia,pull = <TEGRA_PIN_PULL_NONE>;
                                nvidia,tristate = <TEGRA_PIN_DISABLE>;
                                nvidia,enable-input = <TEGRA_PIN_ENABLE>;
-                               nvidia,lock = <1>;
+                               nvidia,lock = <TEGRA_PIN_DISABLE>;
                        };
                        pwr_i2c {
                                nvidia,pins = "pwr_i2c_scl_pz6",
@@ -232,7 +232,7 @@
                                nvidia,tristate = <TEGRA_PIN_DISABLE>;
                                nvidia,enable-input = <TEGRA_PIN_ENABLE>;
                                nvidia,open-drain = <TEGRA_PIN_ENABLE>;
-                               nvidia,lock = <1>;
+                               nvidia,lock = <TEGRA_PIN_DISABLE>;
                        };
                        hotplug_i2c {
                                nvidia,pins = "pu4";
@@ -250,7 +250,7 @@
                                nvidia,tristate = <TEGRA_PIN_DISABLE>;
                                nvidia,enable-input = <TEGRA_PIN_ENABLE>;
                                nvidia,open-drain = <TEGRA_PIN_ENABLE>;
-                               nvidia,lock = <1>;
+                               nvidia,lock = <TEGRA_PIN_DISABLE>;
                        };
                        hdmi_hpd {
                                nvidia,pins = "hdmi_int_pn7";
@@ -622,8 +622,8 @@
                                nvidia,pull = <TEGRA_PIN_PULL_UP>;
                                nvidia,tristate = <TEGRA_PIN_ENABLE>;
                                nvidia,enable-input = <TEGRA_PIN_ENABLE>;
-                               nvidia,lock = <1>;
-                               nvidia,io-reset = <1>;
+                               nvidia,lock = <TEGRA_PIN_DISABLE>;
+                               nvidia,io-reset = <TEGRA_PIN_DISABLE>;
                        };
 
                        /* GPIO keys pinmux */
@@ -708,8 +708,8 @@
                                nvidia,pull = <TEGRA_PIN_PULL_NONE>;
                                nvidia,tristate = <TEGRA_PIN_DISABLE>;
                                nvidia,enable-input = <TEGRA_PIN_ENABLE>;
-                               nvidia,lock = <1>;
-                               nvidia,io-reset = <1>;
+                               nvidia,lock = <TEGRA_PIN_DISABLE>;
+                               nvidia,io-reset = <TEGRA_PIN_DISABLE>;
                        };
                        vi_d10_pt2 {
                                nvidia,pins = "vi_d10_pt2",
@@ -828,8 +828,8 @@
                                nvidia,pull = <TEGRA_PIN_PULL_NONE>;
                                nvidia,tristate = <TEGRA_PIN_DISABLE>;
                                nvidia,enable-input = <TEGRA_PIN_DISABLE>;
-                               nvidia,lock = <1>;
-                               nvidia,io-reset = <1>;
+                               nvidia,lock = <TEGRA_PIN_DISABLE>;
+                               nvidia,io-reset = <TEGRA_PIN_DISABLE>;
                        };
                        vi_mclk_pt1 {
                                nvidia,pins = "vi_mclk_pt1";

diff --git a/arch/arm/dts/tegra30-asus-tf600t.dts b/arch/arm/dts/tegra30-asus-tf600t.dts
index 3ddd78b..1b5729c 100644 (file)
--- a/arch/arm/dts/tegra30-asus-tf600t.dts
+++ b/arch/arm/dts/tegra30-asus-tf600t.dts
@@ -90,8 +90,8 @@
                                nvidia,pull = <TEGRA_PIN_PULL_UP>;
                                nvidia,tristate = <TEGRA_PIN_DISABLE>;
                                nvidia,enable-input = <TEGRA_PIN_ENABLE>;
-                               nvidia,lock = <1>;
-                               nvidia,io-reset = <1>;
+                               nvidia,lock = <TEGRA_PIN_DISABLE>;
+                               nvidia,io-reset = <TEGRA_PIN_DISABLE>;
                        };
 
                        /* SDMMC2 pinmux */
@@ -107,8 +107,8 @@
                                nvidia,pull = <TEGRA_PIN_PULL_NONE>;
                                nvidia,tristate = <TEGRA_PIN_DISABLE>;
                                nvidia,enable-input = <TEGRA_PIN_ENABLE>;
-                               nvidia,lock = <1>;
-                               nvidia,io-reset = <1>;
+                               nvidia,lock = <TEGRA_PIN_DISABLE>;
+                               nvidia,io-reset = <TEGRA_PIN_DISABLE>;
                        };
 
                        /* SDMMC3 pinmux */
@@ -142,8 +142,8 @@
                                nvidia,pull = <TEGRA_PIN_PULL_NONE>;
                                nvidia,tristate = <TEGRA_PIN_DISABLE>;
                                nvidia,enable-input = <TEGRA_PIN_ENABLE>;
-                               nvidia,lock = <1>;
-                               nvidia,io-reset = <1>;
+                               nvidia,lock = <TEGRA_PIN_DISABLE>;
+                               nvidia,io-reset = <TEGRA_PIN_DISABLE>;
                        };
                        sdmmc4_cmd {
                                nvidia,pins = "sdmmc4_cmd_pt7",
@@ -159,8 +159,8 @@
                                nvidia,pull = <TEGRA_PIN_PULL_UP>;
                                nvidia,tristate = <TEGRA_PIN_DISABLE>;
                                nvidia,enable-input = <TEGRA_PIN_ENABLE>;
-                               nvidia,lock = <1>;
-                               nvidia,io-reset = <1>;
+                               nvidia,lock = <TEGRA_PIN_DISABLE>;
+                               nvidia,io-reset = <TEGRA_PIN_DISABLE>;
                        };
                        sdmmc4_rst_n {
                                nvidia,pins = "sdmmc4_rst_n_pcc3";
@@ -186,7 +186,7 @@
                                nvidia,tristate = <TEGRA_PIN_DISABLE>;
                                nvidia,enable-input = <TEGRA_PIN_ENABLE>;
                                nvidia,open-drain = <TEGRA_PIN_ENABLE>;
-                               nvidia,lock = <0>;
+                               nvidia,lock = <TEGRA_PIN_DISABLE>;
                        };
                        gen2_i2c {
                                nvidia,pins = "gen2_i2c_scl_pt5",
@@ -196,7 +196,7 @@
                                nvidia,tristate = <TEGRA_PIN_DISABLE>;
                                nvidia,enable-input = <TEGRA_PIN_ENABLE>;
                                nvidia,open-drain = <TEGRA_PIN_ENABLE>;
-                               nvidia,lock = <0>;
+                               nvidia,lock = <TEGRA_PIN_DISABLE>;
                        };
                        cam_i2c {
                                nvidia,pins = "cam_i2c_scl_pbb1",
@@ -206,7 +206,7 @@
                                nvidia,tristate = <TEGRA_PIN_DISABLE>;
                                nvidia,enable-input = <TEGRA_PIN_ENABLE>;
                                nvidia,open-drain = <TEGRA_PIN_ENABLE>;
-                               nvidia,lock = <0>;
+                               nvidia,lock = <TEGRA_PIN_DISABLE>;
                        };
                        ddc_i2c {
                                nvidia,pins = "ddc_scl_pv4",
@@ -215,7 +215,7 @@
                                nvidia,pull = <TEGRA_PIN_PULL_NONE>;
                                nvidia,tristate = <TEGRA_PIN_DISABLE>;
                                nvidia,enable-input = <TEGRA_PIN_ENABLE>;
-                               nvidia,lock = <0>;
+                               nvidia,lock = <TEGRA_PIN_DISABLE>;
                        };
                        pwr_i2c {
                                nvidia,pins = "pwr_i2c_scl_pz6",
@@ -225,7 +225,7 @@
                                nvidia,tristate = <TEGRA_PIN_DISABLE>;
                                nvidia,enable-input = <TEGRA_PIN_ENABLE>;
                                nvidia,open-drain = <TEGRA_PIN_ENABLE>;
-                               nvidia,lock = <0>;
+                               nvidia,lock = <TEGRA_PIN_DISABLE>;
                        };
                        hotplug_i2c {
                                nvidia,pins = "pu4";
@@ -243,7 +243,7 @@
                                nvidia,tristate = <TEGRA_PIN_DISABLE>;
                                nvidia,enable-input = <TEGRA_PIN_ENABLE>;
                                nvidia,open-drain = <TEGRA_PIN_ENABLE>;
-                               nvidia,lock = <0>;
+                               nvidia,lock = <TEGRA_PIN_DISABLE>;
                        };
                        hdmi_hpd {
                                nvidia,pins = "hdmi_int_pn7";
@@ -613,8 +613,8 @@
                                nvidia,pull = <TEGRA_PIN_PULL_UP>;
                                nvidia,tristate = <TEGRA_PIN_ENABLE>;
                                nvidia,enable-input = <TEGRA_PIN_ENABLE>;
-                               nvidia,lock = <1>;
-                               nvidia,io-reset = <1>;
+                               nvidia,lock = <TEGRA_PIN_DISABLE>;
+                               nvidia,io-reset = <TEGRA_PIN_DISABLE>;
                        };
 
                        /* GPIO keys pinmux */
@@ -701,8 +701,8 @@
                                nvidia,pull = <TEGRA_PIN_PULL_NONE>;
                                nvidia,tristate = <TEGRA_PIN_DISABLE>;
                                nvidia,enable-input = <TEGRA_PIN_ENABLE>;
-                               nvidia,lock = <1>;
-                               nvidia,io-reset = <1>;
+                               nvidia,lock = <TEGRA_PIN_DISABLE>;
+                               nvidia,io-reset = <TEGRA_PIN_DISABLE>;
                        };
                        pbb0 {
                                nvidia,pins = "pbb0";
@@ -827,8 +827,8 @@
                                nvidia,pull = <TEGRA_PIN_PULL_NONE>;
                                nvidia,tristate = <TEGRA_PIN_DISABLE>;
                                nvidia,enable-input = <TEGRA_PIN_DISABLE>;
-                               nvidia,lock = <1>;
-                               nvidia,io-reset = <1>;
+                               nvidia,lock = <TEGRA_PIN_DISABLE>;
+                               nvidia,io-reset = <TEGRA_PIN_DISABLE>;
                        };
                        vi_mclk_pt1 {
                                nvidia,pins = "vi_mclk_pt1";
@@ -836,8 +836,8 @@
                                nvidia,pull = <TEGRA_PIN_PULL_UP>;
                                nvidia,tristate = <TEGRA_PIN_DISABLE>;
                                nvidia,enable-input = <TEGRA_PIN_ENABLE>;
-                               nvidia,lock = <1>;
-                               nvidia,io-reset = <1>;
+                               nvidia,lock = <TEGRA_PIN_DISABLE>;
+                               nvidia,io-reset = <TEGRA_PIN_DISABLE>;
                        };
 
                        jtag {

diff --git a/arch/arm/dts/tegra30-asus-transformer.dtsi b/arch/arm/dts/tegra30-asus-transformer.dtsi
index 03ba8fb..032fb3d 100644 (file)
--- a/arch/arm/dts/tegra30-asus-transformer.dtsi
+++ b/arch/arm/dts/tegra30-asus-transformer.dtsi
@@ -99,8 +99,8 @@
                                nvidia,pull = <TEGRA_PIN_PULL_NONE>;
                                nvidia,tristate = <TEGRA_PIN_DISABLE>;
                                nvidia,enable-input = <TEGRA_PIN_ENABLE>;
-                               nvidia,lock = <1>;
-                               nvidia,io-reset = <1>;
+                               nvidia,lock = <TEGRA_PIN_DISABLE>;
+                               nvidia,io-reset = <TEGRA_PIN_DISABLE>;
                        };
 
                        /* SDMMC3 pinmux */
@@ -189,7 +189,7 @@
                                nvidia,tristate = <TEGRA_PIN_DISABLE>;
                                nvidia,enable-input = <TEGRA_PIN_ENABLE>;
                                nvidia,open-drain = <TEGRA_PIN_ENABLE>;
-                               nvidia,lock = <1>;
+                               nvidia,lock = <TEGRA_PIN_DISABLE>;
                        };
 
                        gen2_i2c {
@@ -200,7 +200,7 @@
                                nvidia,tristate = <TEGRA_PIN_DISABLE>;
                                nvidia,enable-input = <TEGRA_PIN_ENABLE>;
                                nvidia,open-drain = <TEGRA_PIN_ENABLE>;
-                               nvidia,lock = <1>;
+                               nvidia,lock = <TEGRA_PIN_DISABLE>;
                        };
 
                        cam_i2c {
@@ -211,7 +211,7 @@
                                nvidia,tristate = <TEGRA_PIN_DISABLE>;
                                nvidia,enable-input = <TEGRA_PIN_ENABLE>;
                                nvidia,open-drain = <TEGRA_PIN_ENABLE>;
-                               nvidia,lock = <1>;
+                               nvidia,lock = <TEGRA_PIN_DISABLE>;
                        };
 
                        ddc_i2c {
@@ -221,7 +221,7 @@
                                nvidia,pull = <TEGRA_PIN_PULL_NONE>;
                                nvidia,tristate = <TEGRA_PIN_DISABLE>;
                                nvidia,enable-input = <TEGRA_PIN_ENABLE>;
-                               nvidia,lock = <1>;
+                               nvidia,lock = <TEGRA_PIN_DISABLE>;
                        };
 
                        pwr_i2c {
@@ -232,7 +232,7 @@
                                nvidia,tristate = <TEGRA_PIN_DISABLE>;
                                nvidia,enable-input = <TEGRA_PIN_ENABLE>;
                                nvidia,open-drain = <TEGRA_PIN_ENABLE>;
-                               nvidia,lock = <1>;
+                               nvidia,lock = <TEGRA_PIN_DISABLE>;
                        };
 
                        hotplug_i2c {
@@ -647,8 +647,8 @@
                                nvidia,pull = <TEGRA_PIN_PULL_UP>;
                                nvidia,tristate = <TEGRA_PIN_ENABLE>;
                                nvidia,enable-input = <TEGRA_PIN_ENABLE>;
-                               nvidia,lock = <1>;
-                               nvidia,io-reset = <1>;
+                               nvidia,lock = <TEGRA_PIN_DISABLE>;
+                               nvidia,io-reset = <TEGRA_PIN_DISABLE>;
                        };
 
                        /* GPIO keys pinmux */
@@ -741,8 +741,8 @@
                                nvidia,pull = <TEGRA_PIN_PULL_NONE>;
                                nvidia,tristate = <TEGRA_PIN_DISABLE>;
                                nvidia,enable-input = <TEGRA_PIN_ENABLE>;
-                               nvidia,lock = <1>;
-                               nvidia,io-reset = <1>;
+                               nvidia,lock = <TEGRA_PIN_DISABLE>;
+                               nvidia,io-reset = <TEGRA_PIN_DISABLE>;
                        };
 
                        vi_d10_pt2 {
@@ -879,8 +879,8 @@
                                nvidia,pull = <TEGRA_PIN_PULL_NONE>;
                                nvidia,tristate = <TEGRA_PIN_DISABLE>;
                                nvidia,enable-input = <TEGRA_PIN_DISABLE>;
-                               nvidia,lock = <1>;
-                               nvidia,io-reset = <1>;
+                               nvidia,lock = <TEGRA_PIN_DISABLE>;
+                               nvidia,io-reset = <TEGRA_PIN_DISABLE>;
                        };
 
                        vi_mclk_pt1 {

diff --git a/arch/arm/dts/tegra30-lenovo-ideapad-yoga-11.dts b/arch/arm/dts/tegra30-lenovo-ideapad-yoga-11.dts
index 9a1e8c0..876fac7 100644 (file)
--- a/arch/arm/dts/tegra30-lenovo-ideapad-yoga-11.dts
+++ b/arch/arm/dts/tegra30-lenovo-ideapad-yoga-11.dts
@@ -109,8 +109,8 @@
                                nvidia,pull = <TEGRA_PIN_PULL_NONE>;
                                nvidia,tristate = <TEGRA_PIN_DISABLE>;
                                nvidia,enable-input = <TEGRA_PIN_ENABLE>;
-                               nvidia,lock = <1>;
-                               nvidia,io-reset = <1>;
+                               nvidia,lock = <TEGRA_PIN_DISABLE>;
+                               nvidia,io-reset = <TEGRA_PIN_DISABLE>;
                        };
                        sdmmc4-cmd {
                                nvidia,pins = "sdmmc4_cmd_pt7",
@@ -127,8 +127,8 @@
                                nvidia,pull = <TEGRA_PIN_PULL_UP>;
                                nvidia,tristate = <TEGRA_PIN_DISABLE>;
                                nvidia,enable-input = <TEGRA_PIN_ENABLE>;
-                               nvidia,lock = <1>;
-                               nvidia,io-reset = <1>;
+                               nvidia,lock = <TEGRA_PIN_DISABLE>;
+                               nvidia,io-reset = <TEGRA_PIN_DISABLE>;
                        };
                        cam-mclk {
                                nvidia,pins = "cam_mclk_pcc0";
@@ -147,7 +147,7 @@
                                nvidia,tristate = <TEGRA_PIN_DISABLE>;
                                nvidia,enable-input = <TEGRA_PIN_ENABLE>;
                                nvidia,open-drain = <TEGRA_PIN_ENABLE>;
-                               nvidia,lock = <1>;
+                               nvidia,lock = <TEGRA_PIN_DISABLE>;
                        };
                        gen2-i2c {
                                nvidia,pins = "gen2_i2c_scl_pt5",
@@ -157,7 +157,7 @@
                                nvidia,tristate = <TEGRA_PIN_DISABLE>;
                                nvidia,enable-input = <TEGRA_PIN_ENABLE>;
                                nvidia,open-drain = <TEGRA_PIN_ENABLE>;
-                               nvidia,lock = <1>;
+                               nvidia,lock = <TEGRA_PIN_DISABLE>;
                        };
                        cam-i2c {
                                nvidia,pins = "cam_i2c_scl_pbb1",
@@ -167,7 +167,7 @@
                                nvidia,tristate = <TEGRA_PIN_DISABLE>;
                                nvidia,enable-input = <TEGRA_PIN_ENABLE>;
                                nvidia,open-drain = <TEGRA_PIN_ENABLE>;
-                               nvidia,lock = <1>;
+                               nvidia,lock = <TEGRA_PIN_DISABLE>;
                        };
                        ddc-i2c {
                                nvidia,pins = "ddc_scl_pv4",
@@ -176,7 +176,7 @@
                                nvidia,pull = <TEGRA_PIN_PULL_NONE>;
                                nvidia,tristate = <TEGRA_PIN_DISABLE>;
                                nvidia,enable-input = <TEGRA_PIN_ENABLE>;
-                               nvidia,lock = <1>;
+                               nvidia,lock = <TEGRA_PIN_DISABLE>;
                        };
                        pwr-i2c {
                                nvidia,pins = "pwr_i2c_scl_pz6",
@@ -186,7 +186,7 @@
                                nvidia,tristate = <TEGRA_PIN_DISABLE>;
                                nvidia,enable-input = <TEGRA_PIN_ENABLE>;
                                nvidia,open-drain = <TEGRA_PIN_ENABLE>;
-                               nvidia,lock = <1>;
+                               nvidia,lock = <TEGRA_PIN_DISABLE>;
                        };
 
                        /* HDMI pinmux */
@@ -724,8 +724,8 @@
                                nvidia,pull = <TEGRA_PIN_PULL_NONE>;
                                nvidia,tristate = <TEGRA_PIN_ENABLE>;
                                nvidia,enable-input = <TEGRA_PIN_ENABLE>;
-                               nvidia,lock = <1>;
-                               nvidia,io-reset = <1>;
+                               nvidia,lock = <TEGRA_PIN_DISABLE>;
+                               nvidia,io-reset = <TEGRA_PIN_DISABLE>;
                        };
                        vi-vsync-pd6 {
                                nvidia,pins = "vi_vsync_pd6",
@@ -736,8 +736,8 @@
                                nvidia,pull = <TEGRA_PIN_PULL_DOWN>;
                                nvidia,tristate = <TEGRA_PIN_ENABLE>;
                                nvidia,enable-input = <TEGRA_PIN_ENABLE>;
-                               nvidia,lock = <1>;
-                               nvidia,io-reset = <2>;
+                               nvidia,lock = <TEGRA_PIN_DISABLE>;
+                               nvidia,io-reset = <TEGRA_PIN_ENABLE>;
                        };
                        vi-hsync-pd7 {
                                nvidia,pins = "vi_hsync_pd7",
@@ -749,8 +749,8 @@
                                nvidia,pull = <TEGRA_PIN_PULL_NONE>;
                                nvidia,tristate = <TEGRA_PIN_DISABLE>;
                                nvidia,enable-input = <TEGRA_PIN_DISABLE>;
-                               nvidia,lock = <1>;
-                               nvidia,io-reset = <1>;
+                               nvidia,lock = <TEGRA_PIN_DISABLE>;
+                               nvidia,io-reset = <TEGRA_PIN_DISABLE>;
                        };
                        vi-d2-pl0 {
                                nvidia,pins = "vi_d2_pl0",
@@ -760,8 +760,8 @@
                                nvidia,pull = <TEGRA_PIN_PULL_UP>;
                                nvidia,tristate = <TEGRA_PIN_DISABLE>;
                                nvidia,enable-input = <TEGRA_PIN_ENABLE>;
-                               nvidia,lock = <1>;
-                               nvidia,io-reset = <1>;
+                               nvidia,lock = <TEGRA_PIN_DISABLE>;
+                               nvidia,io-reset = <TEGRA_PIN_DISABLE>;
                        };
                        vi-mclk-pt1 {
                                nvidia,pins = "vi_mclk_pt1";
@@ -769,8 +769,8 @@
                                nvidia,pull = <TEGRA_PIN_PULL_DOWN>;
                                nvidia,tristate = <TEGRA_PIN_ENABLE>;
                                nvidia,enable-input = <TEGRA_PIN_ENABLE>;
-                               nvidia,lock = <1>;
-                               nvidia,io-reset = <2>;
+                               nvidia,lock = <TEGRA_PIN_DISABLE>;
+                               nvidia,io-reset = <TEGRA_PIN_ENABLE>;
                        };
                        vi-d11-pt3 {
                                nvidia,pins = "vi_d11_pt3";
@@ -778,8 +778,8 @@
                                nvidia,pull = <TEGRA_PIN_PULL_UP>;
                                nvidia,tristate = <TEGRA_PIN_ENABLE>;
                                nvidia,enable-input = <TEGRA_PIN_ENABLE>;
-                               nvidia,lock = <1>;
-                               nvidia,io-reset = <1>;
+                               nvidia,lock = <TEGRA_PIN_DISABLE>;
+                               nvidia,io-reset = <TEGRA_PIN_DISABLE>;
                        };
                        vi-d5-pl3 {
                                nvidia,pins = "vi_d5_pl3";
@@ -787,8 +787,8 @@
                                nvidia,pull = <TEGRA_PIN_PULL_NONE>;
                                nvidia,tristate = <TEGRA_PIN_DISABLE>;
                                nvidia,enable-input = <TEGRA_PIN_ENABLE>;
-                               nvidia,lock = <1>;
-                               nvidia,io-reset = <1>;
+                               nvidia,lock = <TEGRA_PIN_DISABLE>;
+                               nvidia,io-reset = <TEGRA_PIN_DISABLE>;
                        };
 
                        /* PORT U */

diff --git a/arch/arm/dts/tegra30-microsoft-surface-rt.dts b/arch/arm/dts/tegra30-microsoft-surface-rt.dts
index 6810350..2d22d3e 100644 (file)
--- a/arch/arm/dts/tegra30-microsoft-surface-rt.dts
+++ b/arch/arm/dts/tegra30-microsoft-surface-rt.dts
@@ -103,8 +103,8 @@
                                nvidia,pull = <TEGRA_PIN_PULL_NONE>;
                                nvidia,tristate = <TEGRA_PIN_DISABLE>;
                                nvidia,enable-input = <TEGRA_PIN_ENABLE>;
-                               nvidia,lock = <1>;
-                               nvidia,io-reset = <1>;
+                               nvidia,lock = <TEGRA_PIN_DISABLE>;
+                               nvidia,io-reset = <TEGRA_PIN_DISABLE>;
                        };
                        sdmmc4-cmd {
                                nvidia,pins = "sdmmc4_cmd_pt7",
@@ -121,8 +121,8 @@
                                nvidia,pull = <TEGRA_PIN_PULL_UP>;
                                nvidia,tristate = <TEGRA_PIN_DISABLE>;
                                nvidia,enable-input = <TEGRA_PIN_ENABLE>;
-                               nvidia,lock = <1>;
-                               nvidia,io-reset = <1>;
+                               nvidia,lock = <TEGRA_PIN_DISABLE>;
+                               nvidia,io-reset = <TEGRA_PIN_DISABLE>;
                        };
                        cam-mclk {
                                nvidia,pins = "cam_mclk_pcc0";
@@ -141,7 +141,7 @@
                                nvidia,tristate = <TEGRA_PIN_DISABLE>;
                                nvidia,enable-input = <TEGRA_PIN_ENABLE>;
                                nvidia,open-drain = <TEGRA_PIN_ENABLE>;
-                               nvidia,lock = <0>;
+                               nvidia,lock = <TEGRA_PIN_DISABLE>;
                        };
                        gen2-i2c {
                                nvidia,pins = "gen2_i2c_scl_pt5",
@@ -151,7 +151,7 @@
                                nvidia,tristate = <TEGRA_PIN_DISABLE>;
                                nvidia,enable-input = <TEGRA_PIN_ENABLE>;
                                nvidia,open-drain = <TEGRA_PIN_ENABLE>;
-                               nvidia,lock = <0>;
+                               nvidia,lock = <TEGRA_PIN_DISABLE>;
                        };
                        cam-i2c {
                                nvidia,pins = "cam_i2c_scl_pbb1",
@@ -161,7 +161,7 @@
                                nvidia,tristate = <TEGRA_PIN_DISABLE>;
                                nvidia,enable-input = <TEGRA_PIN_ENABLE>;
                                nvidia,open-drain = <TEGRA_PIN_ENABLE>;
-                               nvidia,lock = <0>;
+                               nvidia,lock = <TEGRA_PIN_DISABLE>;
                        };
                        ddc-i2c {
                                nvidia,pins = "ddc_scl_pv4",
@@ -170,7 +170,7 @@
                                nvidia,pull = <TEGRA_PIN_PULL_NONE>;
                                nvidia,tristate = <TEGRA_PIN_DISABLE>;
                                nvidia,enable-input = <TEGRA_PIN_ENABLE>;
-                               nvidia,lock = <0>;
+                               nvidia,lock = <TEGRA_PIN_DISABLE>;
                        };
                        pwr-i2c {
                                nvidia,pins = "pwr_i2c_scl_pz6",
@@ -180,7 +180,7 @@
                                nvidia,tristate = <TEGRA_PIN_DISABLE>;
                                nvidia,enable-input = <TEGRA_PIN_ENABLE>;
                                nvidia,open-drain = <TEGRA_PIN_ENABLE>;
-                               nvidia,lock = <0>;
+                               nvidia,lock = <TEGRA_PIN_DISABLE>;
                        };
 
                        /* HDMI pinmux */
@@ -703,8 +703,8 @@
                                nvidia,pull = <TEGRA_PIN_PULL_DOWN>;
                                nvidia,tristate = <TEGRA_PIN_ENABLE>;
                                nvidia,enable-input = <TEGRA_PIN_ENABLE>;
-                               nvidia,lock = <1>;
-                               nvidia,io-reset = <1>;
+                               nvidia,lock = <TEGRA_PIN_DISABLE>;
+                               nvidia,io-reset = <TEGRA_PIN_DISABLE>;
                        };
                        vi-d3-pl1 {
                                nvidia,pins = "vi_d3_pl1";
@@ -712,8 +712,8 @@
                                nvidia,pull = <TEGRA_PIN_PULL_NONE>;
                                nvidia,tristate = <TEGRA_PIN_ENABLE>;
                                nvidia,enable-input = <TEGRA_PIN_ENABLE>;
-                               nvidia,lock = <1>;
-                               nvidia,io-reset = <1>;
+                               nvidia,lock = <TEGRA_PIN_DISABLE>;
+                               nvidia,io-reset = <TEGRA_PIN_DISABLE>;
                        };
                        vi-hsync-pd7 {
                                nvidia,pins = "vi_hsync_pd7",
@@ -724,8 +724,8 @@
                                nvidia,pull = <TEGRA_PIN_PULL_NONE>;
                                nvidia,tristate = <TEGRA_PIN_DISABLE>;
                                nvidia,enable-input = <TEGRA_PIN_DISABLE>;
-                               nvidia,lock = <1>;
-                               nvidia,io-reset = <1>;
+                               nvidia,lock = <TEGRA_PIN_DISABLE>;
+                               nvidia,io-reset = <TEGRA_PIN_DISABLE>;
                        };
                        vi-mclk-pt1 {
                                nvidia,pins = "vi_mclk_pt1";
@@ -733,8 +733,8 @@
                                nvidia,pull = <TEGRA_PIN_PULL_DOWN>;
                                nvidia,tristate = <TEGRA_PIN_ENABLE>;
                                nvidia,enable-input = <TEGRA_PIN_ENABLE>;
-                               nvidia,lock = <1>;
-                               nvidia,io-reset = <1>;
+                               nvidia,lock = <TEGRA_PIN_DISABLE>;
+                               nvidia,io-reset = <TEGRA_PIN_DISABLE>;
                        };
                        vi-d11-pt3 {
                                nvidia,pins = "vi_d11_pt3";
@@ -742,8 +742,8 @@
                                nvidia,pull = <TEGRA_PIN_PULL_NONE>;
                                nvidia,tristate = <TEGRA_PIN_DISABLE>;
                                nvidia,enable-input = <TEGRA_PIN_DISABLE>;
-                               nvidia,lock = <1>;
-                               nvidia,io-reset = <1>;
+                               nvidia,lock = <TEGRA_PIN_DISABLE>;
+                               nvidia,io-reset = <TEGRA_PIN_DISABLE>;
                        };
 
                        /* PORT U */

diff --git a/arch/arm/dts/tegra30-wexler-qc750.dts b/arch/arm/dts/tegra30-wexler-qc750.dts
index 87c2a40..b376b91 100644 (file)
--- a/arch/arm/dts/tegra30-wexler-qc750.dts
+++ b/arch/arm/dts/tegra30-wexler-qc750.dts
@@ -157,7 +157,7 @@
                                nvidia,tristate = <TEGRA_PIN_DISABLE>;
                                nvidia,enable-input = <TEGRA_PIN_ENABLE>;
                                nvidia,open-drain = <TEGRA_PIN_ENABLE>;
-                               nvidia,lock = <0>;
+                               nvidia,lock = <TEGRA_PIN_DISABLE>;
                        };
                        gen2-i2c {
                                nvidia,pins = "gen2_i2c_scl_pt5",
@@ -167,7 +167,7 @@
                                nvidia,tristate = <TEGRA_PIN_DISABLE>;
                                nvidia,enable-input = <TEGRA_PIN_ENABLE>;
                                nvidia,open-drain = <TEGRA_PIN_ENABLE>;
-                               nvidia,lock = <0>;
+                               nvidia,lock = <TEGRA_PIN_DISABLE>;
                        };
                        cam-i2c {
                                nvidia,pins = "cam_i2c_scl_pbb1",
@@ -177,7 +177,7 @@
                                nvidia,tristate = <TEGRA_PIN_DISABLE>;
                                nvidia,enable-input = <TEGRA_PIN_ENABLE>;
                                nvidia,open-drain = <TEGRA_PIN_ENABLE>;
-                               nvidia,lock = <0>;
+                               nvidia,lock = <TEGRA_PIN_DISABLE>;
                        };
                        ddc-i2c {
                                nvidia,pins = "ddc_scl_pv4",
@@ -186,7 +186,7 @@
                                nvidia,pull = <TEGRA_PIN_PULL_NONE>;
                                nvidia,tristate = <TEGRA_PIN_DISABLE>;
                                nvidia,enable-input = <TEGRA_PIN_ENABLE>;
-                               nvidia,lock = <0>;
+                               nvidia,lock = <TEGRA_PIN_DISABLE>;
                        };
                        pwr-i2c {
                                nvidia,pins = "pwr_i2c_scl_pz6",
@@ -196,7 +196,7 @@
                                nvidia,tristate = <TEGRA_PIN_DISABLE>;
                                nvidia,enable-input = <TEGRA_PIN_ENABLE>;
                                nvidia,open-drain = <TEGRA_PIN_ENABLE>;
-                               nvidia,lock = <0>;
+                               nvidia,lock = <TEGRA_PIN_DISABLE>;
                        };
 
                        /* HDMI pinmux */