From: xubilv <xbl@rock-chips.com>
Date: Wed, 19 Apr 2017 02:43:36 +0000 (+0800)
Subject: arm: dts: rk3288-android: support uboot-logo and kernel-logo display
X-Git-Tag: release-20171130_firefly~4^2~775
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=4b4a1b5e0bab020d7446bbfe01d61e214263aaae;p=firefly-linux-kernel-4.4.55.git

arm: dts: rk3288-android: support uboot-logo and kernel-logo display

Change-Id: Id409b724ae408ad11149ea74c3fad9c06b7e177d
Signed-off-by: xubilv <xbl@rock-chips.com>
---

diff --git a/arch/arm/boot/dts/rk3288-android.dtsi b/arch/arm/boot/dts/rk3288-android.dtsi
index fff3c8f92906..26fe15d9c408 100644
--- a/arch/arm/boot/dts/rk3288-android.dtsi
+++ b/arch/arm/boot/dts/rk3288-android.dtsi
@@ -134,6 +134,15 @@
 		memory-region = <&drm_logo>;
 
 		route {
+			route_edp: route-edp {
+				status = "disabled";
+				logo,uboot = "logo.bmp";
+				logo,kernel = "logo_kernel.bmp";
+				logo,mode = "center";
+				charge_logo,mode = "center";
+				connect = <&vopb_out_edp>;
+			};
+
 			route_mipi: route-mipi {
 				status = "disabled";
 				logo,uboot = "logo.bmp";
diff --git a/arch/arm/boot/dts/rk3288-evb-rk818-edp.dts b/arch/arm/boot/dts/rk3288-evb-rk818-edp.dts
index 0e9d8ba22fd0..25a99bbae8c9 100644
--- a/arch/arm/boot/dts/rk3288-evb-rk818-edp.dts
+++ b/arch/arm/boot/dts/rk3288-evb-rk818-edp.dts
@@ -92,13 +92,38 @@
 	enable-gpios = <&gpio7 4 GPIO_ACTIVE_HIGH>;
 	pinctrl-0 = <&lcd_cs>;
 	power-supply = <&vcc_lcd>;
+	delay,prepare = <120>;
 	status = "okay";
+
+	disp_timings: display-timings {
+		native-mode = <&timing0>;
+
+		timing0: timing0 {
+			clock-frequency = <200000000>;
+			hactive = <1536>;
+			vactive = <2048>;
+			hfront-porch = <12>;
+			hsync-len = <16>;
+			hback-porch = <48>;
+			vfront-porch = <8>;
+			vsync-len = <4>;
+			vback-porch = <8>;
+			hsync-active = <0>;
+			vsync-active = <0>;
+			de-active = <0>;
+			pixelclk-active = <0>;
+		};
+	};
 };
 
 &edp_phy {
 	status = "okay";
 };
 
+&route_edp {
+	status = "okay";
+};
+
 &gpu {
 	status = "okay";
 	mali-supply = <&vdd_gpu>;