From: Jagan Teki <jagan@amarulasolutions.com>
To: Maxime Ripard <maxime.ripard@free-electrons.com>,
Chen-Yu Tsai <wens@csie.org>, Icenowy Zheng <icenowy@aosc.io>,
Jernej Skrabec <jernej.skrabec@siol.net>,
Rob Herring <robh+dt@kernel.org>,
Mark Rutland <mark.rutland@arm.com>,
Catalin Marinas <catalin.marinas@arm.com>,
Will Deacon <will.deacon@arm.com>,
David Airlie <airlied@linux.ie>,
dri-devel@lists.freedesktop.org,
Michael Turquette <mturquette@baylibre.com>,
Stephen Boyd <sboyd@kernel.org>,
linux-clk@vger.kernel.org,
Michael Trimarchi <michael@amarulasolutions.com>,
linux-arm-kernel@lists.infradead.org, devicetree@vger.kernel.org,
linux-kernel@vger.kernel.org, linux-sunxi@googlegroups.com
Cc: Jagan Teki <jagan@amarulasolutions.com>
Subject: [PATCH v3 12/18] drm: sun4i: add support for HVCC regulator for DWC HDMI glue
Date: Wed, 18 Jul 2018 16:24:52 +0530 [thread overview]
Message-ID: <20180718105458.22304-13-jagan@amarulasolutions.com> (raw)
In-Reply-To: <20180718105458.22304-1-jagan@amarulasolutions.com>
From: Icenowy Zheng <icenowy@aosc.io>
Allwinner SoCs with DWC HDMI controller have a "HVCC" power pin for the
HDMI part, and on some boards it's connected to a dedicated regulator
rather than the main 3.3v.
Add support for optional HVCC regulator. For boards that doesn't use a
dedicated regulator to power it, the default dummy regulator is used.
Signed-off-by: Icenowy Zheng <icenowy@aosc.io>
Signed-off-by: Jagan Teki <jagan@amarulasolutions.com>
---
Changes for v3, v2:
- none
drivers/gpu/drm/sun4i/sun8i_dw_hdmi.c | 14 ++++++++++++++
drivers/gpu/drm/sun4i/sun8i_dw_hdmi.h | 2 ++
2 files changed, 16 insertions(+)
diff --git a/drivers/gpu/drm/sun4i/sun8i_dw_hdmi.c b/drivers/gpu/drm/sun4i/sun8i_dw_hdmi.c
index 31875b636434..68623a6ac44e 100644
--- a/drivers/gpu/drm/sun4i/sun8i_dw_hdmi.c
+++ b/drivers/gpu/drm/sun4i/sun8i_dw_hdmi.c
@@ -113,6 +113,12 @@ static int sun8i_dw_hdmi_bind(struct device *dev, struct device *master,
if (encoder->possible_crtcs == 0)
return -EPROBE_DEFER;
+ hdmi->vcc_hdmi = devm_regulator_get(dev, "hvcc");
+ if (IS_ERR(hdmi->vcc_hdmi)) {
+ dev_err(dev, "Could not get HDMI power supply\n");
+ return PTR_ERR(hdmi->vcc_hdmi);
+ }
+
hdmi->rst_ctrl = devm_reset_control_get(dev, "ctrl");
if (IS_ERR(hdmi->rst_ctrl)) {
dev_err(dev, "Could not get ctrl reset control\n");
@@ -131,6 +137,12 @@ static int sun8i_dw_hdmi_bind(struct device *dev, struct device *master,
return ret;
}
+ ret = regulator_enable(hdmi->vcc_hdmi);
+ if (ret) {
+ dev_err(dev, "Cannot enable HDMI power supply\n");
+ goto err_disable_vcc;
+ }
+
ret = clk_prepare_enable(hdmi->clk_tmds);
if (ret) {
dev_err(dev, "Could not enable tmds clock\n");
@@ -183,6 +195,8 @@ static int sun8i_dw_hdmi_bind(struct device *dev, struct device *master,
clk_disable_unprepare(hdmi->clk_tmds);
err_assert_ctrl_reset:
reset_control_assert(hdmi->rst_ctrl);
+err_disable_vcc:
+ regulator_disable(hdmi->vcc_hdmi);
return ret;
}
diff --git a/drivers/gpu/drm/sun4i/sun8i_dw_hdmi.h b/drivers/gpu/drm/sun4i/sun8i_dw_hdmi.h
index aadbe0a10b0c..af34c498295e 100644
--- a/drivers/gpu/drm/sun4i/sun8i_dw_hdmi.h
+++ b/drivers/gpu/drm/sun4i/sun8i_dw_hdmi.h
@@ -10,6 +10,7 @@
#include <drm/drm_encoder.h>
#include <linux/clk.h>
#include <linux/regmap.h>
+#include <linux/regulator/consumer.h>
#include <linux/reset.h>
#define SUN8I_HDMI_PHY_DBG_CTRL_REG 0x0000
@@ -176,6 +177,7 @@ struct sun8i_dw_hdmi {
struct drm_encoder encoder;
struct sun8i_hdmi_phy *phy;
struct dw_hdmi_plat_data plat_data;
+ struct regulator *vcc_hdmi;
struct reset_control *rst_ctrl;
};
--
2.17.1
next prev parent reply other threads:[~2018-07-18 10:56 UTC|newest]
Thread overview: 24+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-07-18 10:54 [PATCH v3 00/18] arm64: allwinner: Add A64 DE2 HDMI support Jagan Teki
2018-07-18 10:54 ` [PATCH v3 01/18] clk: sunxi-ng: a64: Add minimal rate for video PLLs Jagan Teki
2018-07-18 10:54 ` [PATCH v3 02/18] drm/sun4i: Add support for A64 mixer1 Jagan Teki
2018-07-18 10:54 ` [PATCH v3 03/18] dt-bindings: display: Add compatible for A64 DE2 tcon1 blocks Jagan Teki
2018-07-18 10:54 ` [PATCH v3 04/18] drm/sun4i: Add support for A64 display engine Jagan Teki
2018-07-18 10:54 ` [PATCH v3 05/18] dt-bindings: display: Add compatible for A64 HDMI Jagan Teki
2018-07-18 10:54 ` [PATCH v3 06/18] dt-bindings: clock: sun50i-a64-ccu: Add PLL_VIDEO[0-1] macros Jagan Teki
2018-07-18 10:54 ` [PATCH v3 07/18] arm64: dts: allwinner: a64: Add tcon1 HDMI pipeline Jagan Teki
2018-07-18 12:46 ` Icenowy Zheng
2018-07-18 10:54 ` [PATCH v3 08/18] clk: sunxi-ng: Enable DE2_CCU for SUN8I and SUN50I Jagan Teki
2018-07-18 10:54 ` [PATCH v3 09/18] arm64: defconfig: Enable CONFIG_DRM_SUN4I Jagan Teki
2018-07-18 10:54 ` [PATCH v3 10/18] drm/sun4i: Enable DE2 Mixer for SUN8I and SUN50I Jagan Teki
2018-07-18 10:54 ` [PATCH v3 11/18] drm/sun4i: Enable DesignWare HDMI for SUN50I Jagan Teki
2018-07-18 10:54 ` Jagan Teki [this message]
2018-07-18 10:54 ` [PATCH v3 13/18] arm64: dts: allwinner: a64: bananapi-m64: Enable HDMI output Jagan Teki
2018-07-18 10:54 ` [PATCH v3 14/18] arm64: dts: allwinner: a64: nanopi-a64: " Jagan Teki
2018-07-18 10:54 ` [PATCH v3 15/18] arm64: dts: allwinner: a64: orangepi-win: " Jagan Teki
2018-07-18 10:54 ` [PATCH v3 16/18] arm64: dts: allwinner: a64: a64-olinuxino: " Jagan Teki
2018-07-18 10:54 ` [PATCH v3 17/18] arm64: dts: allwinner: a64: pine64: " Jagan Teki
2018-07-18 10:54 ` [PATCH v3 18/18] arm64: dts: allwinner: a64: sopine: " Jagan Teki
2018-07-18 11:30 ` [PATCH v3 00/18] arm64: allwinner: Add A64 DE2 HDMI support Chen-Yu Tsai
2018-07-18 12:44 ` Maxime Ripard
2018-07-18 12:56 ` Jagan Teki
2018-07-23 6:32 ` Icenowy Zheng
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20180718105458.22304-13-jagan@amarulasolutions.com \
--to=jagan@amarulasolutions.com \
--cc=airlied@linux.ie \
--cc=catalin.marinas@arm.com \
--cc=devicetree@vger.kernel.org \
--cc=dri-devel@lists.freedesktop.org \
--cc=icenowy@aosc.io \
--cc=jernej.skrabec@siol.net \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-clk@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-sunxi@googlegroups.com \
--cc=mark.rutland@arm.com \
--cc=maxime.ripard@free-electrons.com \
--cc=michael@amarulasolutions.com \
--cc=mturquette@baylibre.com \
--cc=robh+dt@kernel.org \
--cc=sboyd@kernel.org \
--cc=wens@csie.org \
--cc=will.deacon@arm.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).