From 7be81dbf24a732049e4ade6f8bb7436815aa8a5d Mon Sep 17 00:00:00 2001 From: Zheng Yang Date: Mon, 11 May 2015 19:21:12 +0800 Subject: [PATCH] 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 Conflicts: drivers/video/rockchip/hdmi/rockchip-hdmiv2/rockchip_hdmiv2.c --- .../rockchip/hdmi/rockchip-hdmiv2/rockchip_hdmiv2.c | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) 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 -- 2.34.1