1 files changed, 49 insertions, 50 deletions

diff --git a/arch/arm/boot/dts/tegra-trimslice.dts b/arch/arm/boot/dts/tegra-trimslice.dts
index 98efd5b0d7f9..9de5636023f6 100644
--- a/arch/arm/boot/dts/tegra-trimslice.dts
+++ b/arch/arm/boot/dts/tegra-trimslice.dts
@@ -6,11 +6,11 @@
         model = "Compulab TrimSlice board";
         compatible = "compulab,trimslice", "nvidia,tegra20";
 
-        memory@0 {
-                reg = < 0x00000000 0x40000000 >;
+        memory {
+                reg = <0x00000000 0x40000000>;
         };
 
-        pinmux@70000000 {
+        pinmux {
                 pinctrl-names = "default";
                 pinctrl-0 = <&state_default>;
 
@@ -182,23 +182,23 @@
                                 nvidia,tristate = <1>;
                         };
                         conf_atb {
-                                nvidia,pins = "atb", "cdev1", "dap1", "gma",
-                                        "gmc", "gmd", "gpu", "gpu7", "gpv",
-                                        "sdio1", "slxa", "slxk", "uac";
+                                nvidia,pins = "atb", "cdev1", "cdev2", "dap1",
+                                        "gma", "gmc", "gmd", "gpu", "gpu7",
+                                        "gpv", "sdio1", "slxa", "slxk", "uac";
                                 nvidia,pull = <0>;
                                 nvidia,tristate = <0>;
                         };
-                        conf_cdev2 {
-                                nvidia,pins = "cdev2", "csus", "spia", "spib",
-                                        "spid", "spif";
-                                nvidia,pull = <1>;
-                                nvidia,tristate = <1>;
-                        };
                         conf_ck32 {
                                 nvidia,pins = "ck32", "ddrc", "pmca", "pmcb",
                                         "pmcc", "pmcd", "pmce", "xm2c", "xm2d";
                                 nvidia,pull = <0>;
                         };
+                        conf_csus {
+                                nvidia,pins = "csus", "spia", "spib",
+                                        "spid", "spif";
+                                nvidia,pull = <1>;
+                                nvidia,tristate = <1>;
+                        };
                         conf_ddc {
                                 nvidia,pins = "ddc", "dtf", "rm", "sdc", "sdd";
                                 nvidia,pull = <2>;
@@ -240,68 +240,67 @@
                 };
         };
 
+        i2s@70002800 {
+                status = "okay";
+        };
+
+        serial@70006000 {
+                status = "okay";
+                clock-frequency = <216000000>;
+        };
+
         i2c@7000c000 {
+                status = "okay";
                 clock-frequency = <400000>;
         };
 
         i2c@7000c400 {
+                status = "okay";
                 clock-frequency = <400000>;
         };
 
         i2c@7000c500 {
+                status = "okay";
                 clock-frequency = <400000>;
-        };
-
-        i2c@7000d000 {
-                status = "disable";
-        };
-
-        i2s@70002800 {
-                status = "disable";
-        };
-
-        i2s@70002a00 {
-                status = "disable";
-        };
-
-        das@70000c00 {
-                status = "disable";
-        };
 
-        serial@70006000 {
-                clock-frequency = < 216000000 >;
-        };
+                codec: codec@1a {
+                        compatible = "ti,tlv320aic23";
+                        reg = <0x1a>;
+                };
 
-        serial@70006040 {
-                status = "disable";
+                rtc@56 {
+                        compatible = "emmicro,em3027";
+                        reg = <0x56>;
+                };
         };
 
-        serial@70006200 {
-                status = "disable";
+        usb@c5000000 {
+                status = "okay";
         };
 
-        serial@70006300 {
-                status = "disable";
+        usb@c5004000 {
+                nvidia,phy-reset-gpio = <&gpio 168 0>; /* gpio PV0 */
         };
 
-        serial@70006400 {
-                status = "disable";
+        usb@c5008000 {
+                status = "okay";
         };
 
         sdhci@c8000000 {
-                status = "disable";
+                status = "okay";
+                bus-width = <4>;
         };
 
-        sdhci@c8000200 {
-                status = "disable";
-        };
-
-        sdhci@c8000400 {
-                status = "disable";
+        sdhci@c8000600 {
+                status = "okay";
+                cd-gpios = <&gpio 121 0>; /* gpio PP1 */
+                wp-gpios = <&gpio 122 0>; /* gpio PP2 */
+                bus-width = <4>;
         };
 
-        sdhci@c8000600 {
-                cd-gpios = <&gpio 121 0>;
-                wp-gpios = <&gpio 122 0>;
+        sound {
+                compatible = "nvidia,tegra-audio-trimslice";
+                nvidia,i2s-controller = <&tegra_i2s1>;
+                nvidia,audio-codec = <&codec>;
         };
 };