1 files changed, 20 insertions, 20 deletions

diff --git a/arch/arm/boot/dts/tegra20-whistler.dts b/arch/arm/boot/dts/tegra20-whistler.dts
index 00ba97a916f8..813b04ef8717 100644
--- a/arch/arm/boot/dts/tegra20-whistler.dts
+++ b/arch/arm/boot/dts/tegra20-whistler.dts
@@ -190,8 +190,8 @@
                                         "kbcf", "sdc", "sdd", "spie", "spig",
                                         "spih", "uaa", "uab", "uad", "uca",
                                         "ucb";
-                                nvidia,pull = <2>;
-                                nvidia,tristate = <0>;
+                                nvidia,pull = <TEGRA_PIN_PULL_UP>;
+                                nvidia,tristate = <TEGRA_PIN_DISABLE>;
                         };
                         conf_atd {
                                 nvidia,pins = "atd", "ate", "cdev1", "csus",
@@ -199,54 +199,54 @@
                                         "dtf", "gpu", "gpu7", "gpv", "i2cp",
                                         "rm", "sdio1", "slxa", "slxc", "slxd",
                                         "slxk", "spdi", "spdo", "uac", "uda";
-                                nvidia,pull = <0>;
-                                nvidia,tristate = <0>;
+                                nvidia,pull = <TEGRA_PIN_PULL_NONE>;
+                                nvidia,tristate = <TEGRA_PIN_DISABLE>;
                         };
                         conf_cdev2 {
                                 nvidia,pins = "cdev2", "spia", "spib";
-                                nvidia,pull = <1>;
-                                nvidia,tristate = <1>;
+                                nvidia,pull = <TEGRA_PIN_PULL_DOWN>;
+                                nvidia,tristate = <TEGRA_PIN_ENABLE>;
                         };
                         conf_ck32 {
                                 nvidia,pins = "ck32", "ddrc", "lc", "pmca",
                                         "pmcb", "pmcc", "pmcd", "xm2c",
                                         "xm2d";
-                                nvidia,pull = <0>;
+                                nvidia,pull = <TEGRA_PIN_PULL_NONE>;
                         };
                         conf_crtp {
                                 nvidia,pins = "crtp";
-                                nvidia,pull = <0>;
-                                nvidia,tristate = <1>;
+                                nvidia,pull = <TEGRA_PIN_PULL_NONE>;
+                                nvidia,tristate = <TEGRA_PIN_ENABLE>;
                         };
                         conf_dta {
                                 nvidia,pins = "dta", "dtb", "dtc", "dtd",
                                         "spid", "spif";
-                                nvidia,pull = <1>;
-                                nvidia,tristate = <0>;
+                                nvidia,pull = <TEGRA_PIN_PULL_DOWN>;
+                                nvidia,tristate = <TEGRA_PIN_DISABLE>;
                         };
                         conf_gme {
                                 nvidia,pins = "gme", "owc", "pta", "spic";
-                                nvidia,pull = <2>;
-                                nvidia,tristate = <1>;
+                                nvidia,pull = <TEGRA_PIN_PULL_UP>;
+                                nvidia,tristate = <TEGRA_PIN_ENABLE>;
                         };
                         conf_ld17_0 {
                                 nvidia,pins = "ld17_0", "ld19_18", "ld21_20",
                                         "ld23_22";
-                                nvidia,pull = <1>;
+                                nvidia,pull = <TEGRA_PIN_PULL_DOWN>;
                         };
                         conf_ls {
                                 nvidia,pins = "ls", "pmce";
-                                nvidia,pull = <2>;
+                                nvidia,pull = <TEGRA_PIN_PULL_UP>;
                         };
                         drive_dap1 {
                                 nvidia,pins = "drive_dap1";
-                                nvidia,high-speed-mode = <0>;
-                                nvidia,schmitt = <1>;
-                                nvidia,low-power-mode = <0>;
+                                nvidia,high-speed-mode = <TEGRA_PIN_DISABLE>;
+                                nvidia,schmitt = <TEGRA_PIN_ENABLE>;
+                                nvidia,low-power-mode = <TEGRA_PIN_LP_DRIVE_DIV_8>;
                                 nvidia,pull-down-strength = <0>;
                                 nvidia,pull-up-strength = <0>;
-                                nvidia,slew-rate-rising = <0>;
-                                nvidia,slew-rate-falling = <0>;
+                                nvidia,slew-rate-rising = <TEGRA_PIN_SLEW_RATE_FASTEST>;
+                                nvidia,slew-rate-falling = <TEGRA_PIN_SLEW_RATE_FASTEST>;
                         };
                 };
         };