HDMI:rk3288: fix pinctrl mode switch error.
authorZheng Yang <zhengyang@rock-chips.com>
Mon, 11 May 2015 11:21:12 +0000 (19:21 +0800)
committerZheng Yang <zhengyang@rock-chips.com>
Fri, 15 May 2015 03:38:45 +0000 (11:38 +0800)
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

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

index 82e8b9cc203a96dd7a965c3656bc607c2a7987c9..93da9cf0b18bcf5038f5e21fe990c4578bdc4c06 100644 (file)
@@ -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