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

[u-boot] / board / avionic-design / dts / tegra20-medcom-wide.dts

diff --git a/board/avionic-design/dts/tegra20-medcom-wide.dts b/board/avionic-design/dts/tegra20-medcom-wide.dts
index 70587a6558e3fa4fd1d1900ba762db552120c7b1..a9a07f9bcd774f44c0ed7cba0574a9cf8a9cce3d 100644 (file)
--- a/board/avionic-design/dts/tegra20-medcom-wide.dts
+++ b/board/avionic-design/dts/tegra20-medcom-wide.dts
@@ -1,6 +1,6 @@
 /dts-v1/;
 
-/include/ ARCH_CPU_DTS
+#include "tegra20-tamonten.dtsi"
 
 / {
        model = "Avionic Design Medcom-Wide";
@@ -8,22 +8,13 @@
 
        aliases {
                usb0 = "/usb@c5008000";
+               sdhci0 = "/sdhci@c8000600";
        };
 
        memory {
                reg = <0x00000000 0x20000000>;
        };
 
-       clocks {
-               clk_32k: clk_32k {
-                       clock-frequency = <32000>;
-               };
-
-               osc {
-                       clock-frequency = <12000000>;
-               };
-       };
-
        host1x {
                status = "okay";
 
@@ -37,10 +28,6 @@
                };
        };
 
-       clock@60006000 {
-               clocks = <&clk_32k &osc>;
-       };
-
        serial@70006300 {
                clock-frequency = <216000000>;
        };