Merge tag 'lsk-android-14.05' into develop-3.10

[firefly-linux-kernel-4.4.55.git] / arch / arm / boot / dts / rk3288-tesco.dts

diff --git a/arch/arm/boot/dts/rk3288-tesco.dts b/arch/arm/boot/dts/rk3288-tesco.dts
index 3303bc63fd3e88d54f960d5e81b7d0ee391939f5..c10b0c195977cb63991589a4e77c3784fbee7694 100755 (executable)
--- a/arch/arm/boot/dts/rk3288-tesco.dts
+++ b/arch/arm/boot/dts/rk3288-tesco.dts
@@ -161,6 +161,15 @@
                };
        };
 
+       usb_control {
+               compatible = "rockchip,rk3288-usb-control";
+
+               host_drv_gpio = <&gpio0 GPIO_B6 GPIO_ACTIVE_LOW>;
+               otg_drv_gpio = <&gpio0 GPIO_B4 GPIO_ACTIVE_LOW>;
+
+               rockchip,remote_wakeup;
+               rockchip,usb_irq_wakeup;
+       };
 };
 
 &gmac {
@@ -193,13 +202,17 @@
 };
 
 &emmc {
-               clock-frequency = <200000000>;
-               clock-freq-min-max = <400000 200000000>;
+       clock-frequency = <150000000>;
+       clock-freq-min-max = <400000 150000000>;
         supports-highspeed;
-               supports-emmc;
-               bootpart-no-access;
+       supports-emmc;
+        bootpart-no-access;
+
+       supports-DDR_MODE;
+       caps2-mmc-hs200;
+
         ignore-pm-notify;
-               keep-power-in-suspend;
+       keep-power-in-suspend;
        status = "okay";
 };
     
@@ -210,7 +223,11 @@
                supports-sd;
                broken-cd;
                card-detect-delay = <200>;
-               vmmc-supply = <&rk808_ldo5_reg>;
+
+               ignore-pm-notify;
+               keep-power-in-suspend;
+       
+               vmmc-supply = <&rk808_ldo5_reg>;
                status = "okay";
 };
                
@@ -428,6 +445,7 @@
 /*lcdc1 as PRMRY(LCD),lcdc0 as EXTEND(HDMI)*/
 &lcdc1 {
        status = "okay";
+       rockchip,cabc_mode = <0>;
        power_ctr: power_ctr {
                rockchip,debug = <0>;
                rockchip,mirror = <NO_MIRROR>;