From 91aea3ff0921d268f9fe9aefe525f947d2ffbbe0 Mon Sep 17 00:00:00 2001 From: zwl Date: Fri, 6 Jun 2014 10:08:59 +0800 Subject: [PATCH] rk3288 hdmi: modify pinctrl gpio state to sleep state --- arch/arm/boot/dts/rk3288.dtsi | 2 +- drivers/video/rockchip/hdmi/chips/rk3288/rk3288_hdmi.c | 5 ++--- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/arch/arm/boot/dts/rk3288.dtsi b/arch/arm/boot/dts/rk3288.dtsi index eb0d4f3fe376..7d97d6b3e7c5 100755 --- a/arch/arm/boot/dts/rk3288.dtsi +++ b/arch/arm/boot/dts/rk3288.dtsi @@ -732,7 +732,7 @@ compatible = "rockchip,rk3288-hdmi"; reg = <0xff980000 0x20000>; interrupts = ; - pinctrl-names = "default", "gpio"; + pinctrl-names = "default", "sleep"; pinctrl-0 = <&i2c5_sda &i2c5_scl>; pinctrl-1 = <&i2c5_gpio>; clocks = <&clk_gates16 9>, <&clk_gates5 12>; diff --git a/drivers/video/rockchip/hdmi/chips/rk3288/rk3288_hdmi.c b/drivers/video/rockchip/hdmi/chips/rk3288/rk3288_hdmi.c index 3811283c1b96..2a4aa39e64ef 100644 --- a/drivers/video/rockchip/hdmi/chips/rk3288/rk3288_hdmi.c +++ b/drivers/video/rockchip/hdmi/chips/rk3288/rk3288_hdmi.c @@ -280,7 +280,6 @@ static int rk3288_hdmi_drv_init(struct hdmi *hdmi_drv) static void rk3288_hdmi_early_suspend(void) { struct hdmi *hdmi_drv = &hdmi_dev->driver; - struct pinctrl_state *gpio_state; if (hdmi_drv->suspend) return; @@ -305,8 +304,8 @@ static void rk3288_hdmi_early_suspend(void) flush_delayed_work(&hdmi_drv->delay_work); /* iomux to gpio and pull down when suspend */ - gpio_state = pinctrl_lookup_state(hdmi_dev->dev->pins->p, "gpio"); - pinctrl_select_state(hdmi_dev->dev->pins->p, gpio_state); + pinctrl_select_state(hdmi_dev->dev->pins->p, + hdmi_dev->dev->pins->sleep_state); rk3288_hdmi_clk_disable(hdmi_dev); return; } -- 2.34.1