Merge branch 'master' of http://git.denx.de/u-boot-sunxi

[u-boot] / arch / arm / dts / tegra20-seaboard.dts

diff --git a/arch/arm/dts/tegra20-seaboard.dts b/arch/arm/dts/tegra20-seaboard.dts
index 10f399284ae189ca9bee5c5d438dba3c7085bebc..5893d2a3f84e67ad68d21ab108e442873011710c 100644 (file)
--- a/arch/arm/dts/tegra20-seaboard.dts
+++ b/arch/arm/dts/tegra20-seaboard.dts
@@ -31,7 +31,7 @@
                reg = < 0x00000000 0x40000000 >;
        };
 
-       host1x {
+       host1x@50000000 {
                status = "okay";
                dc@54200000 {
                        status = "okay";
@@ -44,6 +44,7 @@
 
        /* This is not used in U-Boot, but is expected to be in kernel .dts */
        i2c@7000d000 {
+               status = "okay";
                clock-frequency = <100000>;
                pmic@34 {
                        compatible = "ti,tps6586x";
@@ -75,18 +76,21 @@
        };
 
        i2c@7000c000 {
+               status = "okay";
                clock-frequency = <100000>;
        };
 
        i2c@7000c400 {
-               status = "disabled";
+               status = "okay";
        };
 
        i2c@7000c500 {
+               status = "okay";
                clock-frequency = <100000>;
        };
 
        kbc@7000e200 {
+               status = "okay";
                linux,keymap = <0x00020011 0x0003001f 0x0004001e 0x0005002c
                        0x000701d0 0x0107007d 0x02060064 0x02070038 0x03000006
                        0x03010005 0x03020013 0x03030012 0x03040021 0x03050020
@@ -114,6 +118,8 @@
        };
 
        emc@7000f400 {
+               #address-cells = <1>;
+               #size-cells = <0>;
                emc-table@190000 {
                        reg = < 190000 >;
                        compatible = "nvidia,tegra20-emc-table";
@@ -151,6 +157,7 @@
        };
 
        usb@c5000000 {
+               status = "okay";
                nvidia,vbus-gpio = <&gpio TEGRA_GPIO(D, 0) GPIO_ACTIVE_HIGH>;
                dr_mode = "otg";
        };
@@ -159,6 +166,10 @@
                status = "disabled";
        };
 
+       usb@c5008000 {
+               status = "okay";
+       };
+
        sdhci@c8000400 {
                status = "okay";
                cd-gpios = <&gpio TEGRA_GPIO(I, 5) GPIO_ACTIVE_LOW>;
@@ -172,6 +183,23 @@
                bus-width = <8>;
        };
 
+       clocks {
+               compatible = "simple-bus";
+               #address-cells = <1>;
+               #size-cells = <0>;
+
+               clk32k_in: clock@0 {
+                       compatible = "fixed-clock";
+                       reg=<0>;
+                       #clock-cells = <0>;
+                       clock-frequency = <32768>;
+               };
+       };
+
+       pwm: pwm@7000a000 {
+               status = "okay";
+       };
+
        lcd_panel: panel {
                /* Seaboard has 1366x768 */
                clock = <70600000>;