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

Commit 17486943 authored by Tomi Valkeinen's avatar Tomi Valkeinen
Browse files

OMAPDSS: HDMI: use vdda_hdmi_dac 



The HDMI driver requires vdda_hdmi_dac power for operation, but does not
enable it. This has worked because the regulator has been always
enabled.

But this may not always be the case, as I encountered when implementing
HDMI device tree support.

This patch changes the HDMI driver to use the vdda_hdmi_dac.

Signed-off-by: default avatarTomi Valkeinen <tomi.valkeinen@ti.com>
parent 8a3d895b

drivers/video/omap2/dss/hdmi.c

+23 −0
Original line number Diff line number Diff line
@@ -33,6 +33,7 @@ 
#include <linux/pm_runtime.h>

#include <linux/clk.h>

#include <linux/gpio.h>

#include <linux/regulator/consumer.h>

#include <video/omapdss.h>



#include "ti_hdmi.h"
@@ -62,6 +63,7 @@ static struct { 
	struct hdmi_ip_data ip_data;



	struct clk *sys_clk;

	struct regulator *vdda_hdmi_dac_reg;



	int ct_cp_hpd_gpio;

	int ls_oe_gpio;
@@ -331,6 +333,19 @@ static int __init hdmi_init_display(struct omap_dss_device *dssdev) 


	dss_init_hdmi_ip_ops(&hdmi.ip_data);



	if (hdmi.vdda_hdmi_dac_reg == NULL) {

		struct regulator *reg;



		reg = devm_regulator_get(&hdmi.pdev->dev, "vdda_hdmi_dac");



		if (IS_ERR(reg)) {

			DSSERR("can't get VDDA_HDMI_DAC regulator\n");

			return PTR_ERR(reg);

		}



		hdmi.vdda_hdmi_dac_reg = reg;

	}



	r = gpio_request_array(gpios, ARRAY_SIZE(gpios));

	if (r)

		return r;
@@ -495,6 +510,10 @@ static int hdmi_power_on(struct omap_dss_device *dssdev) 
	/* wait 300us after CT_CP_HPD for the 5V power output to reach 90% */

	udelay(300);



	r = regulator_enable(hdmi.vdda_hdmi_dac_reg);

	if (r)

		goto err_vdac_enable;



	r = hdmi_runtime_get();

	if (r)

		goto err_runtime_get;
@@ -562,6 +581,8 @@ static int hdmi_power_on(struct omap_dss_device *dssdev) 
err_pll_enable:

	hdmi_runtime_put();

err_runtime_get:

	regulator_disable(hdmi.vdda_hdmi_dac_reg);

err_vdac_enable:

	gpio_set_value(hdmi.ct_cp_hpd_gpio, 0);

	gpio_set_value(hdmi.ls_oe_gpio, 0);

	return -EIO;
@@ -576,6 +597,8 @@ static void hdmi_power_off(struct omap_dss_device *dssdev) 
	hdmi.ip_data.ops->pll_disable(&hdmi.ip_data);

	hdmi_runtime_put();



	regulator_disable(hdmi.vdda_hdmi_dac_reg);



	gpio_set_value(hdmi.ct_cp_hpd_gpio, 0);

	gpio_set_value(hdmi.ls_oe_gpio, 0);

}