rk3288 hdmi: modify pinctrl gpio state to sleep state

diff --git a/arch/arm/boot/dts/rk3288.dtsi b/arch/arm/boot/dts/rk3288.dtsi
index eb0d4f3fe376451ba90ca56c6c60c3acbdc369a7..7d97d6b3e7c5b8df831c453aa6b417e65d5574c6 100755 (executable)
--- 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 = <GIC_SPI 103 IRQ_TYPE_LEVEL_HIGH>;
-               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 3811283c1b96dcfe55502ff0a9ed917819f61e1d..2a4aa39e64efdf2588c3d78c6b1799e59b88d495 100644 (file)
--- 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;
 }