From: Zheng Yang <zhengyang@rock-chips.com>
Date: Mon, 11 May 2015 11:21:12 +0000 (+0800)
Subject: HDMI:rk3288: fix pinctrl mode switch error.
X-Git-Tag: firefly_0821_release~4158^2~77
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=7be81dbf24a732049e4ade6f8bb7436815aa8a5d;p=firefly-linux-kernel-4.4.55.git

HDMI:rk3288: fix pinctrl mode switch error.

	For 3288, i25 pinctrl gpio mode name is "sleep",
	not "gpio" any more.

Signed-off-by: Zheng Yang <zhengyang@rock-chips.com>

Conflicts:
	drivers/video/rockchip/hdmi/rockchip-hdmiv2/rockchip_hdmiv2.c
---

diff --git a/drivers/video/rockchip/hdmi/rockchip-hdmiv2/rockchip_hdmiv2.c b/drivers/video/rockchip/hdmi/rockchip-hdmiv2/rockchip_hdmiv2.c
index 82e8b9cc203a..93da9cf0b18b 100644
--- a/drivers/video/rockchip/hdmi/rockchip-hdmiv2/rockchip_hdmiv2.c
+++ b/drivers/video/rockchip/hdmi/rockchip-hdmiv2/rockchip_hdmiv2.c
@@ -271,9 +271,14 @@ static int rockchip_hdmiv2_fb_event_notify(struct notifier_block *self,
 					hdmi_dev->hdcp2_en(0);
 				rockchip_hdmiv2_clk_disable(hdmi_dev);
 				#ifdef CONFIG_PINCTRL
-				gpio_state =
-				pinctrl_lookup_state(pins->p,
-						     "gpio");
+				if (hdmi_dev->soctype == HDMI_SOC_RK3288)
+					gpio_state =
+					pinctrl_lookup_state(pins->p,
+							     "sleep");
+				else
+					gpio_state =
+					pinctrl_lookup_state(pins->p,
+							     "gpio");
 				pinctrl_select_state(pins->p,
 						     gpio_state);
 				#endif