korg/linux
0
0
Fork 0
mirror of https://mirrors.bfsu.edu.cn/git/linux.git synced 2024-11-19 18:24:14 +08:00
Code Issues Packages Projects Releases Wiki Activity

drm/sun4i: Add support for HDMI voltage regulator

Browse Source 
Some boards have HDMI VCC pin connected to voltage regulator which may
not be turned on by default.

Add support for such boards by adding voltage regulator handling code to
HDMI driver.

Signed-off-by: Jernej Skrabec <jernej.skrabec@siol.net>
[Icenowy: change supply name to "hvcc"]
Signed-off-by: Icenowy Zheng <icenowy@aosc.io>
Signed-off-by: Maxime Ripard <maxime.ripard@bootlin.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20180904044053.15425-11-icenowy@aosc.io
This commit is contained in:
Jernej Skrabec 2018-09-04 12:40:52 +08:00 committed by Maxime Ripard
parent 50414b954b
commit 633ba1e086
No known key found for this signature in database
GPG Key ID: D2B4C094214DAF74
2 changed files with 18 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
drivers/gpu/drm/sun4i/sun8i_dw_hdmi.c
View File

@ -125,10 +125,22 @@ static int sun8i_dw_hdmi_bind(struct device *dev, struct device *master,
return PTR_ERR(hdmi->clk_tmds); return PTR_ERR(hdmi->clk_tmds);
} }
hdmi->regulator = devm_regulator_get(dev, "hvcc");
if (IS_ERR(hdmi->regulator)) {
dev_err(dev, "Couldn't get regulator\n");
return PTR_ERR(hdmi->regulator);
}
ret = regulator_enable(hdmi->regulator);
if (ret) {
dev_err(dev, "Failed to enable regulator\n");
return ret;
}
ret = reset_control_deassert(hdmi->rst_ctrl); ret = reset_control_deassert(hdmi->rst_ctrl);
if (ret) { if (ret) {
dev_err(dev, "Could not deassert ctrl reset control\n"); dev_err(dev, "Could not deassert ctrl reset control\n");
return ret; goto err_disable_regulator;
} }
ret = clk_prepare_enable(hdmi->clk_tmds); ret = clk_prepare_enable(hdmi->clk_tmds);
@ -183,6 +195,8 @@ err_disable_clk_tmds:
clk_disable_unprepare(hdmi->clk_tmds); clk_disable_unprepare(hdmi->clk_tmds);
err_assert_ctrl_reset: err_assert_ctrl_reset:
reset_control_assert(hdmi->rst_ctrl); reset_control_assert(hdmi->rst_ctrl);
err_disable_regulator:
regulator_disable(hdmi->regulator);
return ret; return ret;
} }
@ -196,6 +210,7 @@ static void sun8i_dw_hdmi_unbind(struct device *dev, struct device *master,
sun8i_hdmi_phy_remove(hdmi); sun8i_hdmi_phy_remove(hdmi);
clk_disable_unprepare(hdmi->clk_tmds); clk_disable_unprepare(hdmi->clk_tmds);
reset_control_assert(hdmi->rst_ctrl); reset_control_assert(hdmi->rst_ctrl);
regulator_disable(hdmi->regulator);
} }
static const struct component_ops sun8i_dw_hdmi_ops = { static const struct component_ops sun8i_dw_hdmi_ops = {

2
drivers/gpu/drm/sun4i/sun8i_dw_hdmi.h
View File

@ -10,6 +10,7 @@
#include <drm/drm_encoder.h> #include <drm/drm_encoder.h>
#include <linux/clk.h> #include <linux/clk.h>
#include <linux/regmap.h> #include <linux/regmap.h>
#include <linux/regulator/consumer.h>
#include <linux/reset.h> #include <linux/reset.h>
#define SUN8I_HDMI_PHY_DBG_CTRL_REG 0x0000 #define SUN8I_HDMI_PHY_DBG_CTRL_REG 0x0000
@ -176,6 +177,7 @@ struct sun8i_dw_hdmi {
struct drm_encoder encoder; struct drm_encoder encoder;
struct sun8i_hdmi_phy *phy; struct sun8i_hdmi_phy *phy;
struct dw_hdmi_plat_data plat_data; struct dw_hdmi_plat_data plat_data;
struct regulator *regulator;
struct reset_control *rst_ctrl; struct reset_control *rst_ctrl;
}; };