From: zwl <zwl@rockchips.com>
Date: Mon, 22 Sep 2014 13:10:39 +0000 (+0800)
Subject: Revert "rk312x:dts: revert code to recovery lcdc io sleep pinctrl to fix white screen... 
X-Git-Tag: firefly_0821_release~4640^2~7^2~15
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=19372cb111010c01a0b435b89e62c4ebbdd3ff00;p=firefly-linux-kernel-4.4.55.git

Revert "rk312x:dts: revert code to recovery lcdc io sleep pinctrl to fix white screen when resume"

This reverts commit 27c40940f7e5defb2a472703721c16865ff0dc00.
---

diff --git a/arch/arm/boot/dts/rk3126-86v.dts b/arch/arm/boot/dts/rk3126-86v.dts
index 7ce872e8e825..a136b978b7c6 100644
--- a/arch/arm/boot/dts/rk3126-86v.dts
+++ b/arch/arm/boot/dts/rk3126-86v.dts
@@ -182,9 +182,8 @@
 &lvds {
 	status = "okay";
 
-	pinctrl-names = "lcdc", "sleep";
+	pinctrl-names = "lcdc";
 	pinctrl-0 = <&lcdc0_lcdc_d>;
-	pinctrl-1 = <&lcdc0_lcdc_gpio>;
 };
 
 &lcdc {
diff --git a/arch/arm/boot/dts/rk3126-sdk.dts b/arch/arm/boot/dts/rk3126-sdk.dts
index 3049052774d0..4ad883e47c54 100755
--- a/arch/arm/boot/dts/rk3126-sdk.dts
+++ b/arch/arm/boot/dts/rk3126-sdk.dts
@@ -49,9 +49,8 @@
 &lvds {
 	status = "okay";
 
-	pinctrl-names = "lcdc", "sleep";
+	pinctrl-names = "lcdc";
 	pinctrl-0 = <&lcdc0_lcdc_d>;
-	pinctrl-1 = <&lcdc0_lcdc_gpio>;
 };
 
 &lcdc {
diff --git a/arch/arm/boot/dts/rk3128-sdk.dts b/arch/arm/boot/dts/rk3128-sdk.dts
index 99a0d1525445..d874220062a8 100755
--- a/arch/arm/boot/dts/rk3128-sdk.dts
+++ b/arch/arm/boot/dts/rk3128-sdk.dts
@@ -33,9 +33,8 @@
 &lvds {
 	status = "okay";
 
-	pinctrl-names = "lcdc", "sleep";
+	pinctrl-names = "lcdc";
 	pinctrl-0 = <&lcdc0_lcdc_d>;
-	pinctrl-1 = <&lcdc0_lcdc_gpio>;
 };
 
 &lcdc {