Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1930f38a authored by Beeresh Gopal's avatar Beeresh Gopal Committed by Rob Clark
Browse files

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: default avatarBeeresh Gopal <gbeeresh@codeaurora.org>
Signed-off-by: default avatarStephane Viau <sviau@codeaurora.org>
Signed-off-by: default avatarRob Clark <robdclark@gmail.com>
parent 3d47fd47

drivers/gpu/drm/msm/hdmi/hdmi.c

+1 −0
Original line number Diff line number Diff line
@@ -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[] = {

drivers/gpu/drm/msm/hdmi/hdmi.h

+1 −0
Original line number Diff line number Diff line
@@ -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;

drivers/gpu/drm/msm/hdmi/hdmi_connector.c

+21 −0
Original line number Diff line number Diff line
@@ -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);