Merge remote-tracking branch 'origin/develop-3.10' into develop-3.10-next

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

diff --git a/arch/arm/boot/dts/rk3288-tb_8846.dts b/arch/arm/boot/dts/rk3288-tb_8846.dts
index d4baf12473c588b6625a3bf2bfe2252bac046600..ac7b072b50da66db8640a2bbd6f07c08614c5c4e 100644 (file)
--- a/arch/arm/boot/dts/rk3288-tb_8846.dts
+++ b/arch/arm/boot/dts/rk3288-tb_8846.dts
@@ -579,8 +579,8 @@
         display-timings = <&disp_timings>;
 };
 
-/*lcdc1 as PRMRY(LCD),lcdc0 as EXTEND(HDMI)*/
-&lcdc1 {
+/*lcdc0 as PRMRY(LCD),lcdc1 as EXTEND(HDMI)*/
+&lcdc0 {
        status = "okay";
        rockchip,mirror = <NO_MIRROR>;
        rockchip,cabc_mode = <0>;
@@ -607,7 +607,7 @@
        };
 };
 
-&lcdc0 {
+&lcdc1 {
        status = "okay";
        rockchip,mirror = <ROTATE_270>;
 
@@ -719,7 +719,7 @@
                200000 900000
                300000 950000
                420000 1050000
-               500000 1100000
+               500000 1150000
                >;
        status="okay";
 };
@@ -729,7 +729,7 @@
                /* KHz    uV */
                200000 1000000
                300000 1000000
-               420000 1050000
+               400000 1050000
                533000 1150000
                >;