Merge branch 'linux-linaro-lsk-v4.4-android' of git://git.linaro.org/kernel/linux...

[firefly-linux-kernel-4.4.55.git] / arch / arm / boot / dts / rk3128-box-rk88.dts

diff --git a/arch/arm/boot/dts/rk3128-box-rk88.dts b/arch/arm/boot/dts/rk3128-box-rk88.dts
index 940cf1b004e7c2530a4f8018d0a3bd9f5952e86f..3158daa638e49567ee989e534ea48e271ec8b23c 100755 (executable)
--- a/arch/arm/boot/dts/rk3128-box-rk88.dts
+++ b/arch/arm/boot/dts/rk3128-box-rk88.dts
@@ -1,3 +1,6 @@
+/dts-v1/;
+
+#include "rk3128.dtsi"
 #include "rk312x-sdk.dtsi"
 #include "lcd-box.dtsi"
 #include <dt-bindings/input/input.h>
@@ -38,7 +41,7 @@
                status = "okay";
        };
 
-               wireless-bluetooth {
+       wireless-bluetooth {
                compatible = "bluetooth-platdata";
 
                //wifi-bt-power-toggle;
@@ -53,17 +56,31 @@
                BT,wake_gpio = <&gpio1 GPIO_B4 GPIO_ACTIVE_HIGH>;
                BT,wake_host_irq = <&gpio0 GPIO_C6 GPIO_ACTIVE_LOW>;
 
-        status = "okay";
-    };
+               status = "disabled";
+       };
+
+       power-led {
+               compatible = "gpio-leds";
+               power {
+                       gpios = <&gpio0 GPIO_B0 GPIO_ACTIVE_LOW>;
+                       default-state = "on";
+               };
+               work {
+                       gpios = <&gpio0 GPIO_D2 GPIO_ACTIVE_HIGH>;
+                       default-state = "on";
+               };
+       };
+
        rockchip-spdif-card {
                compatible = "rockchip-spdif-card";
                dais {
                        dai0 {
                                audio-codec = <&codec_hdmi_spdif>;
-                               i2s-controller = <&spdif>;
+                               audio-controller = <&spdif>;
                        };
                };
        };
+
        usb_control {
                compatible = "rockchip,rk3126-usb-control";
                host_drv_gpio = <&gpio3 GPIO_C4 GPIO_ACTIVE_LOW>;
@@ -76,19 +93,26 @@
                /*0 - Normal, 1 - Force Host, 2 - Force Device*/
                rockchip,usb-mode = <1>;
        };
-        rockchip_suspend {
+
+       rockchip_suspend: rockchip_suspend {
                 rockchip,ctrbits = <
                         (0
                         |RKPM_CTR_PWR_DMNS
                         |RKPM_CTR_GTCLKS
                         |RKPM_CTR_PLLS
+                        //|RKPM_CTR_ARMOFF_LPMD
+                        |RKPM_CTR_DDR
                         |RKPM_CTR_IDLESRAM_MD
                         |RKPM_CTR_DDR
-                        |RKPM_CTR_VOLTS
-                        |RKPM_CTR_VOL_PWM1
-                        |RKPM_CTR_VOL_PWM2
+                        //|RKPM_CTR_BUS_IDLE
+                       //|RKPM_CTR_VOLTS
+                       //|RKPM_CTR_VOL_PWM1
+                       //|RKPM_CTR_VOL_PWM2
                         )
                 >;
+               rockchip,pmic-suspend_gpios = <
+                       0
+                        >;
         };
 
 };
@@ -212,6 +236,7 @@
 
 &fb {
        rockchip,disp-mode = <NO_DUAL>;
+       rockchip,disp-policy = <DISPLAY_POLICY_BOX>;
        rockchip,uboot-logo-on = <1>;
 };