evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

OMAPDSS: HDMI: use vdda_hdmi_dac

Browse source 
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: Tomi Valkeinen <tomi.valkeinen@ti.com>
This commit is contained in:
Tomi Valkeinen 2012-08-15 15:55:04 +03:00
parent 8a3d895bfe
commit 174869435e
1 changed files with 23 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
drivers/video/omap2/dss/hdmi.c
View file

@ -33,6 +33,7 @@
#include <linux/pm_runtime.h> #include <linux/pm_runtime.h>
#include <linux/clk.h> #include <linux/clk.h>
#include <linux/gpio.h> #include <linux/gpio.h>
#include <linux/regulator/consumer.h>
#include <video/omapdss.h> #include <video/omapdss.h>
#include "ti_hdmi.h" #include "ti_hdmi.h"
@ -62,6 +63,7 @@ static struct {
struct hdmi_ip_data ip_data; struct hdmi_ip_data ip_data;
struct clk *sys_clk; struct clk *sys_clk;
struct regulator *vdda_hdmi_dac_reg;
int ct_cp_hpd_gpio; int ct_cp_hpd_gpio;
int ls_oe_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); 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)); r = gpio_request_array(gpios, ARRAY_SIZE(gpios));
if (r) if (r)
return 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% */ /* wait 300us after CT_CP_HPD for the 5V power output to reach 90% */
udelay(300); udelay(300);
r = regulator_enable(hdmi.vdda_hdmi_dac_reg);
if (r)
goto err_vdac_enable;
r = hdmi_runtime_get(); r = hdmi_runtime_get();
if (r) if (r)
goto err_runtime_get; goto err_runtime_get;
@ -562,6 +581,8 @@ err_phy_enable:
err_pll_enable: err_pll_enable:
hdmi_runtime_put(); hdmi_runtime_put();
err_runtime_get: 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.ct_cp_hpd_gpio, 0);
gpio_set_value(hdmi.ls_oe_gpio, 0); gpio_set_value(hdmi.ls_oe_gpio, 0);
return -EIO; 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.ip_data.ops->pll_disable(&hdmi.ip_data);
hdmi_runtime_put(); hdmi_runtime_put();
regulator_disable(hdmi.vdda_hdmi_dac_reg);
gpio_set_value(hdmi.ct_cp_hpd_gpio, 0); gpio_set_value(hdmi.ct_cp_hpd_gpio, 0);
gpio_set_value(hdmi.ls_oe_gpio, 0); gpio_set_value(hdmi.ls_oe_gpio, 0);
} }