Merge git://git.denx.de/u-boot-usb

[platform/kernel/u-boot.git] / arch / arm / dts / tegra124-nyan-big.dts

diff --git a/arch/arm/dts/tegra124-nyan-big.dts b/arch/arm/dts/tegra124-nyan-big.dts
index c1f35a0..8be6adb 100644 (file)
--- a/arch/arm/dts/tegra124-nyan-big.dts
+++ b/arch/arm/dts/tegra124-nyan-big.dts
@@ -29,6 +29,35 @@
                reg = <0x80000000 0x80000000>;
        };
 
+       host1x@50000000 {
+               dc@54200000 {
+                       display-timings {
+                               timing@0 {
+                                       clock-frequency = <69500000>;
+                                       hactive = <1366>;
+                                       vactive = <768>;
+                                       hsync-len = <32>;
+                                       hfront-porch = <48>;
+                                       hback-porch = <20>;
+                                       vfront-porch = <3>;
+                                       vback-porch = <13>;
+                                       vsync-len = <6>;
+                               };
+                       };
+               };
+
+               sor@54540000 {
+                       status = "okay";
+
+                       nvidia,dpaux = <&dpaux>;
+                       nvidia,panel = <&panel>;
+               };
+
+               dpaux@545c0000 {
+                       status = "okay";
+               };
+       };
+
        serial@70006000 {
                /* Debug connector on the bottom of the board near SD card. */
                status = "okay";
@@ -134,12 +163,15 @@
 
        spi@7000d400 {
                status = "okay";
+               spi-deactivate-delay = <200>;
+               spi-max-frequency = <3000000>;
 
                cros_ec: cros-ec@0 {
                        compatible = "google,cros-ec-spi";
                        spi-max-frequency = <3000000>;
                        interrupt-parent = <&gpio>;
                        interrupts = <TEGRA_GPIO(C, 7) IRQ_TYPE_LEVEL_LOW>;
+                       ec-interrupt = <&gpio TEGRA_GPIO(C, 7) GPIO_ACTIVE_LOW>;
                        reg = <0>;
 
                        google,cros-ec-spi-msg-delay = <2000>;
@@ -230,6 +262,7 @@
 
        usb@7d000000 { /* Rear external USB port. */
                status = "okay";
+               nvidia,vbus-gpio = <&gpio TEGRA_GPIO(N, 4) GPIO_ACTIVE_HIGH>;
        };
 
        usb-phy@7d000000 {
@@ -246,6 +279,7 @@
 
        usb@7d008000 { /* Left external USB port. */
                status = "okay";
+               nvidia,vbus-gpio = <&gpio TEGRA_GPIO(N, 5) GPIO_ACTIVE_HIGH>;
        };
 
        usb-phy@7d008000 {
@@ -256,6 +290,7 @@
                compatible = "pwm-backlight";
 
                enable-gpios = <&gpio TEGRA_GPIO(H, 2) GPIO_ACTIVE_HIGH>;
+               power-supply = <&vdd_led>;
                pwms = <&pwm 1 1000000>;
 
                default-brightness-level = <224>;
@@ -308,6 +343,10 @@
                };
        };
 
+       gpio@6000d000 {
+               u-boot,dm-pre-reloc;
+       };
+
        gpio-keys {
                compatible = "gpio-keys";
 
@@ -335,6 +374,19 @@
                backlight = <&backlight>;
        };
 
+       regulators {
+               compatible = "simple-bus";
+               #address-cells = <1>;
+               #size-cells = <0>;
+               vdd_led: regulator@5 {
+                       compatible = "regulator-fixed";
+                       reg = <5>;
+                       regulator-name = "+VDD_LED";
+                       gpio = <&gpio TEGRA_GPIO(P, 2) GPIO_ACTIVE_HIGH>;
+                       enable-active-high;
+               };
+       };
+
        sound {
                compatible = "nvidia,tegra-audio-max98090-nyan-big",
                             "nvidia,tegra-audio-max98090";