drm/msm/hdmi: Use pinctrl in HDMI driver

Some targets (eg: msm8994) use the pinctrl framework to configure
interface pins. This change adds support for initialization and
pinctrl active/sleep state control for the HDMI driver.

Signed-off-by: Stephane Viau <sviau@codeaurora.org>
Signed-off-by: Rob Clark <robdclark@gmail.com>

diff --git a/Documentation/devicetree/bindings/drm/msm/hdmi.txt b/Documentation/devicetree/bindings/drm/msm/hdmi.txt
index a29a55f3d93783565608efe9b4ff6603e095292c..c43aa53debed67622e3a7e6c3a8c138e6ddc96d7 100644 (file)
--- a/Documentation/devicetree/bindings/drm/msm/hdmi.txt
+++ b/Documentation/devicetree/bindings/drm/msm/hdmi.txt
@@ -20,6 +20,9 @@ Required properties:
 Optional properties:
 - qcom,hdmi-tx-mux-en-gpio: hdmi mux enable pin
 - qcom,hdmi-tx-mux-sel-gpio: hdmi mux select pin
+- pinctrl-names: the pin control state names; should contain "default"
+- pinctrl-0: the default pinctrl state (active)
+- pinctrl-1: the "sleep" pinctrl state
 
 Example:
 
@@ -44,5 +47,8 @@ Example:
                qcom,hdmi-tx-hpd = <&msmgpio 72 GPIO_ACTIVE_HIGH>;
                core-vdda-supply = <&pm8921_hdmi_mvs>;
                hdmi-mux-supply = <&ext_3p3v>;
+               pinctrl-names = "default", "sleep";
+               pinctrl-0 = <&hpd_active  &ddc_active  &cec_active>;
+               pinctrl-1 = <&hpd_suspend &ddc_suspend &cec_suspend>;
        };
 };

diff --git a/drivers/gpu/drm/msm/hdmi/hdmi_connector.c b/drivers/gpu/drm/msm/hdmi/hdmi_connector.c
index bf72ad62bf827664ec5740d262bd5bbb964334f5..54aa93ff547337d6bee6aa55bb339956f4d2f750 100644 (file)
--- a/drivers/gpu/drm/msm/hdmi/hdmi_connector.c
+++ b/drivers/gpu/drm/msm/hdmi/hdmi_connector.c
@@ -16,6 +16,7 @@
  */
 
 #include <linux/gpio.h>
+#include <linux/pinctrl/consumer.h>
 
 #include "msm_kms.h"
 #include "hdmi.h"
@@ -150,6 +151,12 @@ static int hpd_enable(struct hdmi_connector *hdmi_connector)
                }
        }
 
+       ret = pinctrl_pm_select_default_state(dev);
+       if (ret) {
+               dev_err(dev, "pinctrl state chg failed: %d\n", ret);
+               goto fail;
+       }
+
        ret = gpio_config(hdmi, true);
        if (ret) {
                dev_err(dev, "failed to configure GPIOs: %d\n", ret);
@@ -219,6 +226,10 @@ static void hdp_disable(struct hdmi_connector *hdmi_connector)
        if (ret)
                dev_warn(dev, "failed to unconfigure GPIOs: %d\n", ret);
 
+       ret = pinctrl_pm_select_sleep_state(dev);
+       if (ret)
+               dev_warn(dev, "pinctrl state chg failed: %d\n", ret);
+
        for (i = 0; i < config->hpd_reg_cnt; i++) {
                ret = regulator_disable(hdmi->hpd_regs[i]);
                if (ret)