ARM64: dts: rk3399-android-next: optimize display node

Change-Id: Icbbc34bc375f6b7106966b6ea40047cc8469594d
Signed-off-by: Mark Yao <mark.yao@rock-chips.com>

diff --git a/arch/arm64/boot/dts/rockchip/rk3399-android-next.dtsi b/arch/arm64/boot/dts/rockchip/rk3399-android-next.dtsi
index 7b401ceffc358d96740cfb8968e93fe671178c15..ee0bf7f73e829478a6d104ea0f9fcf4913b3d394 100644 (file)
--- a/arch/arm64/boot/dts/rockchip/rk3399-android-next.dtsi
+++ b/arch/arm64/boot/dts/rockchip/rk3399-android-next.dtsi
@@ -216,40 +216,6 @@
        };
 };
 
-&mipi_dsi {
-       status = "okay";
-       panel {
-               compatible ="simple-panel-dsi";
-               reg = <0>;
-               backlight = <&backlight>;
-               enable-gpios = <&gpio1 13 GPIO_ACTIVE_HIGH>;
-               dsi,flags = <(MIPI_DSI_MODE_VIDEO | MIPI_DSI_MODE_VIDEO_BURST |
-                               MIPI_DSI_MODE_VIDEO_SYNC_PULSE)>;
-               dsi,format = <MIPI_DSI_FMT_RGB888>;
-               dsi,lanes = <4>;
-               status = "okay";
-
-               display-timings {
-                       native-mode = <&timing0>;
-                       timing0: timing0 {
-                               clock-frequency = <160000000>;
-                               hactive = <1200>;
-                               vactive = <1920>;
-                               hback-porch = <21>;
-                               hfront-porch = <120>;
-                               vback-porch = <18>;
-                               vfront-porch = <21>;
-                               hsync-len = <20>;
-                               vsync-len = <3>;
-                               hsync-active = <0>;
-                               vsync-active = <0>;
-                               de-active = <0>;
-                               pixelclk-active = <0>;
-                       };
-               };
-       };
-};
-
 &vopb {
        status = "okay";
 };
@@ -286,16 +252,31 @@
 
        memory-region = <&drm_logo>;
        route {
-               route0 {
+               route_hdmi: route-hdmi {
+                       status = "disabled";
                        logo,uboot = "logo.bmp";
                        logo,kernel = "logo_kernel.bmp";
+                       logo,mode = "fullscreen";
+                       charge_logo,mode = "center";
+                       connect = <&vopl_out_hdmi>;
+               };
+
+               route_mipi: route-mipi {
+                       status = "disabled";
+                       logo,uboot = "logo.bmp";
+                       logo,kernel = "logo_kernel.bmp";
+                       logo,mode = "fullscreen";
+                       charge_logo,mode = "center";
                        connect = <&vopb_out_mipi>;
                };
 
-               route1 {
+               route_edp: route-edp {
+                       status = "disabled";
                        logo,uboot = "logo.bmp";
                        logo,kernel = "logo_kernel.bmp";
-                       connect = <&vopl_out_hdmi>;
+                       logo,mode = "fullscreen";
+                       charge_logo,mode = "center";
+                       connect = <&vopb_out_edp>;
                };
        };
 };

diff --git a/arch/arm64/boot/dts/rockchip/rk3399-evb-rev1-android-next.dts b/arch/arm64/boot/dts/rockchip/rk3399-evb-rev1-android-next.dts
index 5aecf8f58783003d985fed52c11fef235a2f4b24..c8e158ac223ebc19f75c2eef92b0bf6b050f76aa 100644 (file)
--- a/arch/arm64/boot/dts/rockchip/rk3399-evb-rev1-android-next.dts
+++ b/arch/arm64/boot/dts/rockchip/rk3399-evb-rev1-android-next.dts
@@ -59,3 +59,41 @@
        rockchip,pwm_id= <3>;
        rockchip,pwm_voltage = <900000>;
 };
+
+&mipi_dsi {
+       status = "okay";
+       panel {
+               compatible ="simple-panel-dsi";
+               reg = <0>;
+               backlight = <&backlight>;
+               enable-gpios = <&gpio1 13 GPIO_ACTIVE_HIGH>;
+               dsi,flags = <(MIPI_DSI_MODE_VIDEO | MIPI_DSI_MODE_VIDEO_BURST |
+                               MIPI_DSI_MODE_VIDEO_SYNC_PULSE)>;
+               dsi,format = <MIPI_DSI_FMT_RGB888>;
+               dsi,lanes = <4>;
+               status = "okay";
+
+               display-timings {
+                       native-mode = <&timing0>;
+                       timing0: timing0 {
+                               clock-frequency = <160000000>;
+                               hactive = <1200>;
+                               vactive = <1920>;
+                               hback-porch = <21>;
+                               hfront-porch = <120>;
+                               vback-porch = <18>;
+                               vfront-porch = <21>;
+                               hsync-len = <20>;
+                               vsync-len = <3>;
+                               hsync-active = <0>;
+                               vsync-active = <0>;
+                               de-active = <0>;
+                               pixelclk-active = <0>;
+                       };
+               };
+       };
+};
+
+&route_mipi {
+       status = "okay";
+};

diff --git a/arch/arm64/boot/dts/rockchip/rk3399-evb-rev2-android-next.dts b/arch/arm64/boot/dts/rockchip/rk3399-evb-rev2-android-next.dts
index acfc79c0292950d8f08fc311d6bd0bc0777c5cf9..a5d69b2d22feaca273081f48e60105e7ade59912 100644 (file)
--- a/arch/arm64/boot/dts/rockchip/rk3399-evb-rev2-android-next.dts
+++ b/arch/arm64/boot/dts/rockchip/rk3399-evb-rev2-android-next.dts
@@ -70,3 +70,41 @@
 &spdif_sound {
        status = "okay";
 };
+
+&mipi_dsi {
+       status = "okay";
+       panel {
+               compatible ="simple-panel-dsi";
+               reg = <0>;
+               backlight = <&backlight>;
+               enable-gpios = <&gpio1 13 GPIO_ACTIVE_HIGH>;
+               dsi,flags = <(MIPI_DSI_MODE_VIDEO | MIPI_DSI_MODE_VIDEO_BURST |
+                               MIPI_DSI_MODE_VIDEO_SYNC_PULSE)>;
+               dsi,format = <MIPI_DSI_FMT_RGB888>;
+               dsi,lanes = <4>;
+               status = "okay";
+
+               display-timings {
+                       native-mode = <&timing0>;
+                       timing0: timing0 {
+                               clock-frequency = <160000000>;
+                               hactive = <1200>;
+                               vactive = <1920>;
+                               hback-porch = <21>;
+                               hfront-porch = <120>;
+                               vback-porch = <18>;
+                               vfront-porch = <21>;
+                               hsync-len = <20>;
+                               vsync-len = <3>;
+                               hsync-active = <0>;
+                               vsync-active = <0>;
+                               de-active = <0>;
+                               pixelclk-active = <0>;
+                       };
+               };
+       };
+};
+
+&route_mipi {
+       status = "okay";
+};

diff --git a/arch/arm64/boot/dts/rockchip/rk3399-evb-rev3-android-edp-next.dts b/arch/arm64/boot/dts/rockchip/rk3399-evb-rev3-android-edp-next.dts
index b77c6b6d288aa51080f19caa16b1562450f15d61..ca168fd68f8435d7d89c74f30246f228eed985fc 100644 (file)
--- a/arch/arm64/boot/dts/rockchip/rk3399-evb-rev3-android-edp-next.dts
+++ b/arch/arm64/boot/dts/rockchip/rk3399-evb-rev3-android-edp-next.dts
@@ -99,7 +99,6 @@
        };
 };
 
-&mipi_dsi {
-       status = "disabled";
+&route_edp {
+       status = "okay";
 };
-

diff --git a/arch/arm64/boot/dts/rockchip/rk3399-mid-818-android-next.dts b/arch/arm64/boot/dts/rockchip/rk3399-mid-818-android-next.dts
index ec855ec2732a48af7121b4e79f7dada8c4a15844..c9e5bcc63a842ae2876149fee28a5d01f993421c 100644 (file)
--- a/arch/arm64/boot/dts/rockchip/rk3399-mid-818-android-next.dts
+++ b/arch/arm64/boot/dts/rockchip/rk3399-mid-818-android-next.dts
@@ -986,6 +986,6 @@
        };
 };
 
-&mipi_dsi {
-       status = "disabled";
+&route_edp {
+       status = "okay";
 };