Merge branch 'u-boot-samsung/master' into 'u-boot-arm/master'

[u-boot] / board / compulab / dts / tegra20-trimslice.dts

diff --git a/board/compulab/dts/tegra20-trimslice.dts b/board/compulab/dts/tegra20-trimslice.dts
index db79e7796d09c0351d08207b6a38aef6641633fe..ee31476c1eb8f602fe781b6591c4d7f4abf63a84 100644 (file)
--- a/board/compulab/dts/tegra20-trimslice.dts
+++ b/board/compulab/dts/tegra20-trimslice.dts
@@ -1,6 +1,6 @@
 /dts-v1/;
 
-/include/ ARCH_CPU_DTS
+#include "tegra20.dtsi"
 
 / {
        model = "Compulab TrimSlice board";
@@ -8,25 +8,15 @@
 
        aliases {
                usb0 = "/usb@c5008000";
+               usb1 = "/usb@c5000000";
+               sdhci0 = "/sdhci@c8000600";
+               sdhci1 = "/sdhci@c8000000";
        };
 
        memory {
                reg = <0x00000000 0x40000000>;
        };
 
-       clocks {
-               clk_32k: clk_32k {
-                       clock-frequency = <32000>;
-               };
-               osc {
-                       clock-frequency = <12000000>;
-               };
-       };
-
-       clock@60006000 {
-               clocks = <&clk_32k &osc>;
-       };
-
        serial@70006000 {
                clock-frequency = <216000000>;
        };
@@ -35,6 +25,11 @@
                status = "disabled";
        };
 
+       spi@7000c380 {
+               status = "okay";
+               spi-max-frequency = <25000000>;
+       };
+
        i2c@7000c400 {
                status = "disabled";
        };
@@ -48,10 +43,22 @@
        };
 
        usb@c5000000 {
-               status = "disabled";
+               nvidia,vbus-gpio = <&gpio 170 0>; /* PV2 */
        };
 
        usb@c5004000 {
                status = "disabled";
        };
+
+       sdhci@c8000000 {
+               status = "okay";
+               bus-width = <4>;
+       };
+
+       sdhci@c8000600 {
+               status = "okay";
+               cd-gpios = <&gpio 121 1>; /* gpio PP1 */
+               wp-gpios = <&gpio 122 0>; /* gpio PP2 */
+               bus-width = <4>;
+       };
 };