1 files changed, 30 insertions, 24 deletions

diff --git a/arch/arm/boot/dts/tegra20-trimslice.dts b/arch/arm/boot/dts/tegra20-trimslice.dts
index 78deea5c0d21..216fa6d50c65 100644
--- a/arch/arm/boot/dts/tegra20-trimslice.dts
+++ b/arch/arm/boot/dts/tegra20-trimslice.dts
@@ -1,17 +1,23 @@
 /dts-v1/;
 
+#include <dt-bindings/input/input.h>
 #include "tegra20.dtsi"
 
 / {
         model = "Compulab TrimSlice board";
         compatible = "compulab,trimslice", "nvidia,tegra20";
 
+        aliases {
+                rtc0 = "/i2c@7000c500/rtc@56";
+                rtc1 = "/rtc@7000e000";
+        };
+
         memory {
                 reg = <0x00000000 0x40000000>;
         };
 
-        host1x {
-                hdmi {
+        host1x@50000000 {
+                hdmi@54280000 {
                         status = "okay";
 
                         vdd-supply = <&hdmi_vdd_reg>;
@@ -23,7 +29,7 @@
                 };
         };
 
-        pinmux {
+        pinmux@70000014 {
                 pinctrl-names = "default";
                 pinctrl-0 = <&state_default>;
 
@@ -191,49 +197,49 @@
                                         "dtb", "dtc", "dtd", "dte", "gmb",
                                         "gme", "i2cp", "pta", "slxc", "slxd",
                                         "spdi", "spdo", "uda";
-                                nvidia,pull = <0>;
-                                nvidia,tristate = <1>;
+                                nvidia,pull = <TEGRA_PIN_PULL_NONE>;
+                                nvidia,tristate = <TEGRA_PIN_ENABLE>;
                         };
                         conf_atb {
                                 nvidia,pins = "atb", "cdev1", "cdev2", "dap1",
                                         "gma", "gmc", "gmd", "gpu", "gpu7",
                                         "gpv", "sdio1", "slxa", "slxk", "uac";
-                                nvidia,pull = <0>;
-                                nvidia,tristate = <0>;
+                                nvidia,pull = <TEGRA_PIN_PULL_NONE>;
+                                nvidia,tristate = <TEGRA_PIN_DISABLE>;
                         };
                         conf_ck32 {
                                 nvidia,pins = "ck32", "ddrc", "pmca", "pmcb",
                                         "pmcc", "pmcd", "pmce", "xm2c", "xm2d";
-                                nvidia,pull = <0>;
+                                nvidia,pull = <TEGRA_PIN_PULL_NONE>;
                         };
                         conf_csus {
                                 nvidia,pins = "csus", "spia", "spib",
                                         "spid", "spif";
-                                nvidia,pull = <1>;
-                                nvidia,tristate = <1>;
+                                nvidia,pull = <TEGRA_PIN_PULL_DOWN>;
+                                nvidia,tristate = <TEGRA_PIN_ENABLE>;
                         };
                         conf_ddc {
                                 nvidia,pins = "ddc", "dtf", "rm", "sdc", "sdd";
-                                nvidia,pull = <2>;
-                                nvidia,tristate = <0>;
+                                nvidia,pull = <TEGRA_PIN_PULL_UP>;
+                                nvidia,tristate = <TEGRA_PIN_DISABLE>;
                         };
                         conf_hdint {
                                 nvidia,pins = "hdint", "lcsn", "ldc", "lm1",
                                         "lpw1", "lsc1", "lsck", "lsda", "lsdi",
                                         "lvp0", "pmc";
-                                nvidia,tristate = <1>;
+                                nvidia,tristate = <TEGRA_PIN_ENABLE>;
                         };
                         conf_irrx {
                                 nvidia,pins = "irrx", "irtx", "kbca", "kbcb",
                                         "kbcc", "kbcd", "kbce", "kbcf", "owc",
                                         "spic", "spie", "spig", "spih", "uaa",
                                         "uab", "uad", "uca", "ucb";
-                                nvidia,pull = <2>;
-                                nvidia,tristate = <1>;
+                                nvidia,pull = <TEGRA_PIN_PULL_UP>;
+                                nvidia,tristate = <TEGRA_PIN_ENABLE>;
                         };
                         conf_lc {
                                 nvidia,pins = "lc", "ls";
-                                nvidia,pull = <2>;
+                                nvidia,pull = <TEGRA_PIN_PULL_UP>;
                         };
                         conf_ld0 {
                                 nvidia,pins = "ld0", "ld1", "ld2", "ld3", "ld4",
@@ -243,17 +249,17 @@
                                         "lhp1", "lhp2", "lhs", "lm0", "lpp",
                                         "lpw0", "lpw2", "lsc0", "lspi", "lvp1",
                                         "lvs", "sdb";
-                                nvidia,tristate = <0>;
+                                nvidia,tristate = <TEGRA_PIN_DISABLE>;
                         };
                         conf_ld17_0 {
                                 nvidia,pins = "ld17_0", "ld19_18", "ld21_20",
                                         "ld23_22";
-                                nvidia,pull = <1>;
+                                nvidia,pull = <TEGRA_PIN_PULL_DOWN>;
                         };
                         conf_spif {
                                 nvidia,pins = "spif";
-                                nvidia,pull = <1>;
-                                nvidia,tristate = <0>;
+                                nvidia,pull = <TEGRA_PIN_PULL_DOWN>;
+                                nvidia,tristate = <TEGRA_PIN_DISABLE>;
                         };
                 };
         };
@@ -301,7 +307,7 @@
                 };
         };
 
-        pmc {
+        pmc@7000e400 {
                 nvidia,suspend-mode = <1>;
                 nvidia,cpu-pwr-good-time = <5000>;
                 nvidia,cpu-pwr-off-time = <5000>;
@@ -310,7 +316,7 @@
                 nvidia,sys-clock-req-active-high;
         };
 
-        pcie-controller {
+        pcie-controller@80003000 {
                 status = "okay";
                 pex-clk-supply = <&pci_clk_reg>;
                 vdd-supply = <&pci_vdd_reg>;
@@ -366,7 +372,7 @@
                 #address-cells = <1>;
                 #size-cells = <0>;
 
-                clk32k_in: clock {
+                clk32k_in: clock@0 {
                         compatible = "fixed-clock";
                         reg=<0>;
                         #clock-cells = <0>;
@@ -380,7 +386,7 @@
                 power {
                         label = "Power";
                         gpios = <&gpio TEGRA_GPIO(X, 6) GPIO_ACTIVE_LOW>;
-                        linux,code = <116>; /* KEY_POWER */
+                        linux,code = <KEY_POWER>;
                         gpio-key,wakeup;
                 };
         };