ARM: tegra: use #include for all device trees

[firefly-linux-kernel-4.4.55.git] / arch / arm / boot / dts / tegra30-beaver.dts

diff --git a/arch/arm/boot/dts/tegra30-beaver.dts b/arch/arm/boot/dts/tegra30-beaver.dts
index 6248b2445b32e3df61b0344b3a436f69edef1f62..e86c2805dcb6d1d46593f6db29efb2c14c453e8f 100644 (file)
--- a/arch/arm/boot/dts/tegra30-beaver.dts
+++ b/arch/arm/boot/dts/tegra30-beaver.dts
@@ -1,13 +1,13 @@
 /dts-v1/;
 
-/include/ "tegra30.dtsi"
+#include "tegra30.dtsi"
 
 / {
        model = "NVIDIA Tegra30 Beaver evaluation board";
        compatible = "nvidia,beaver", "nvidia,tegra30";
 
        memory {
-               reg = <0x80000000 0x80000000>;
+               reg = <0x80000000 0x7ff00000>;
        };
 
        pinmux {
@@ -253,6 +253,13 @@
        pmc {
                status = "okay";
                nvidia,invert-interrupt;
+               nvidia,suspend-mode = <2>;
+               nvidia,cpu-pwr-good-time = <2000>;
+               nvidia,cpu-pwr-off-time = <200>;
+               nvidia,core-pwr-good-time = <3845 3845>;
+               nvidia,core-pwr-off-time = <0>;
+               nvidia,core-power-req-active-high;
+               nvidia,sys-clock-req-active-high;
        };
 
        sdhci@78000000 {
@@ -266,6 +273,7 @@
        sdhci@78000600 {
                status = "okay";
                bus-width = <8>;
+               non-removable;
        };
 
        clocks {
@@ -383,4 +391,17 @@
                        vin-supply = <&sys_3v3_reg>;
                };
        };
+
+       gpio-leds {
+               compatible = "gpio-leds";
+
+               gpled1 {
+                       label = "LED1"; /* CR5A1 (blue) */
+                       gpios = <&gpio 89 0>; /* gpio PL1 */
+               };
+               gpled2 {
+                       label = "LED2"; /* CR4A2 (green) */
+                       gpios = <&gpio 88 0>; /* gpio PL0 */
+               };
+       };
 };