drm/msm/hdmi: enable lpm-mux if it is present

lpm-mux is programmed to enable HDMI connector
on the docking station for S805 chipset based
devices.

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

diff --git a/drivers/gpu/drm/msm/hdmi/hdmi.c b/drivers/gpu/drm/msm/hdmi/hdmi.c
index 041c2fca2225d7e8a899d90f8123aebba9fdb0d5..a125a7e32742c3707bb3e0446a4fdd8f64fffd3e 100644 (file)
--- a/drivers/gpu/drm/msm/hdmi/hdmi.c
+++ b/drivers/gpu/drm/msm/hdmi/hdmi.c
@@ -317,6 +317,7 @@ static int hdmi_bind(struct device *dev, struct device *master, void *data)
        config.hpd_gpio      = get_gpio("qcom,hdmi-tx-hpd");
        config.mux_en_gpio   = get_gpio("qcom,hdmi-tx-mux-en");
        config.mux_sel_gpio  = get_gpio("qcom,hdmi-tx-mux-sel");
+       config.mux_lpm_gpio  = get_gpio("qcom,hdmi-tx-mux-lpm");
 
 #else
        static const char *hpd_clk_names[] = {

diff --git a/drivers/gpu/drm/msm/hdmi/hdmi.h b/drivers/gpu/drm/msm/hdmi/hdmi.h
index 9d7723c6528a646eef133d490ba1b21d82e8a696..b981995410b50a886e21f74e38589d6af415f950 100644 (file)
--- a/drivers/gpu/drm/msm/hdmi/hdmi.h
+++ b/drivers/gpu/drm/msm/hdmi/hdmi.h
@@ -96,6 +96,7 @@ struct hdmi_platform_config {
 
        /* gpio's: */
        int ddc_clk_gpio, ddc_data_gpio, hpd_gpio, mux_en_gpio, mux_sel_gpio;
+       int mux_lpm_gpio;
 
        /* older devices had their own irq, mdp5+ it is shared w/ mdp: */
        bool shared_irq;

diff --git a/drivers/gpu/drm/msm/hdmi/hdmi_connector.c b/drivers/gpu/drm/msm/hdmi/hdmi_connector.c
index 76960faae38ffcf356ff5eb0c433c78d8d7dd5a4..67245b79375fb50a1834ddd862078c85fb8cdfdd 100644 (file)
--- a/drivers/gpu/drm/msm/hdmi/hdmi_connector.c
+++ b/drivers/gpu/drm/msm/hdmi/hdmi_connector.c
@@ -78,6 +78,19 @@ static int gpio_config(struct hdmi *hdmi, bool on)
                        }
                        gpio_set_value_cansleep(config->mux_sel_gpio, 0);
                }
+
+               if (config->mux_lpm_gpio != -1) {
+                       ret = gpio_request(config->mux_lpm_gpio,
+                                       "HDMI_MUX_LPM");
+                       if (ret) {
+                               dev_err(dev->dev,
+                                       "'%s'(%d) gpio_request failed: %d\n",
+                                       "HDMI_MUX_LPM",
+                                       config->mux_lpm_gpio, ret);
+                               goto error6;
+                       }
+                       gpio_set_value_cansleep(config->mux_lpm_gpio, 1);
+               }
                DBG("gpio on");
        } else {
                gpio_free(config->ddc_clk_gpio);
@@ -93,11 +106,19 @@ static int gpio_config(struct hdmi *hdmi, bool on)
                        gpio_set_value_cansleep(config->mux_sel_gpio, 1);
                        gpio_free(config->mux_sel_gpio);
                }
+
+               if (config->mux_lpm_gpio != -1) {
+                       gpio_set_value_cansleep(config->mux_lpm_gpio, 0);
+                       gpio_free(config->mux_lpm_gpio);
+               }
                DBG("gpio off");
        }
 
        return 0;
 
+error6:
+       if (config->mux_sel_gpio != -1)
+               gpio_free(config->mux_sel_gpio);
 error5:
        if (config->mux_en_gpio != -1)
                gpio_free(config->mux_en_gpio);