devicetree.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Sascha Hauer <s.hauer@pengutronix.de>
To: dri-devel@lists.freedesktop.org
Cc: linux-arm-kernel@lists.infradead.org,
	linux-rockchip@lists.infradead.org, devicetree@vger.kernel.org,
	kernel@pengutronix.de, "Andy Yan" <andy.yan@rock-chips.com>,
	"Benjamin Gaignard" <benjamin.gaignard@collabora.com>,
	"Michael Riesch" <michael.riesch@wolfvision.net>,
	"Sandy Huang" <hjc@rock-chips.com>,
	"Heiko Stübner" <heiko@sntech.de>,
	"Peter Geis" <pgwipeout@gmail.com>,
	"Sascha Hauer" <s.hauer@pengutronix.de>,
	"Dmitry Osipenko" <dmitry.osipenko@collabora.com>
Subject: [PATCH v8 08/24] drm/rockchip: dw_hdmi: add regulator support
Date: Fri, 11 Mar 2022 09:33:07 +0100	[thread overview]
Message-ID: <20220311083323.887372-9-s.hauer@pengutronix.de> (raw)
In-Reply-To: <20220311083323.887372-1-s.hauer@pengutronix.de>

The RK3568 has HDMI_TX_AVDD0V9 and HDMI_TX_AVDD_1V8 supply inputs needed
for the HDMI port. add support for these to the driver for boards which
have them supplied by switchable regulators.

Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Reviewed-by: Dmitry Osipenko <dmitry.osipenko@collabora.com>
---
 drivers/gpu/drm/rockchip/dw_hdmi-rockchip.c | 41 +++++++++++++++++++--
 1 file changed, 38 insertions(+), 3 deletions(-)

diff --git a/drivers/gpu/drm/rockchip/dw_hdmi-rockchip.c b/drivers/gpu/drm/rockchip/dw_hdmi-rockchip.c
index b64cc62c7b5af..fe4f9556239ac 100644
--- a/drivers/gpu/drm/rockchip/dw_hdmi-rockchip.c
+++ b/drivers/gpu/drm/rockchip/dw_hdmi-rockchip.c
@@ -9,6 +9,7 @@
 #include <linux/platform_device.h>
 #include <linux/phy/phy.h>
 #include <linux/regmap.h>
+#include <linux/regulator/consumer.h>
 
 #include <drm/bridge/dw_hdmi.h>
 #include <drm/drm_edid.h>
@@ -76,6 +77,8 @@ struct rockchip_hdmi {
 	struct clk *ref_clk;
 	struct clk *grf_clk;
 	struct dw_hdmi *hdmi;
+	struct regulator *avdd_0v9;
+	struct regulator *avdd_1v8;
 	struct phy *phy;
 };
 
@@ -226,6 +229,14 @@ static int rockchip_hdmi_parse_dt(struct rockchip_hdmi *hdmi)
 		return PTR_ERR(hdmi->grf_clk);
 	}
 
+	hdmi->avdd_0v9 = devm_regulator_get(hdmi->dev, "avdd-0v9");
+	if (IS_ERR(hdmi->avdd_0v9))
+		return PTR_ERR(hdmi->avdd_0v9);
+
+	hdmi->avdd_1v8 = devm_regulator_get(hdmi->dev, "avdd-1v8");
+	if (IS_ERR(hdmi->avdd_1v8))
+		return PTR_ERR(hdmi->avdd_1v8);
+
 	return 0;
 }
 
@@ -566,11 +577,23 @@ static int dw_hdmi_rockchip_bind(struct device *dev, struct device *master,
 		return ret;
 	}
 
+	ret = regulator_enable(hdmi->avdd_0v9);
+	if (ret) {
+		DRM_DEV_ERROR(hdmi->dev, "failed to enable avdd0v9: %d\n", ret);
+		goto err_avdd_0v9;
+	}
+
+	ret = regulator_enable(hdmi->avdd_1v8);
+	if (ret) {
+		DRM_DEV_ERROR(hdmi->dev, "failed to enable avdd1v8: %d\n", ret);
+		goto err_avdd_1v8;
+	}
+
 	ret = clk_prepare_enable(hdmi->ref_clk);
 	if (ret) {
 		DRM_DEV_ERROR(hdmi->dev, "Failed to enable HDMI reference clock: %d\n",
 			      ret);
-		return ret;
+		goto err_clk;
 	}
 
 	if (hdmi->chip_data == &rk3568_chip_data) {
@@ -594,10 +617,19 @@ static int dw_hdmi_rockchip_bind(struct device *dev, struct device *master,
 	 */
 	if (IS_ERR(hdmi->hdmi)) {
 		ret = PTR_ERR(hdmi->hdmi);
-		drm_encoder_cleanup(encoder);
-		clk_disable_unprepare(hdmi->ref_clk);
+		goto err_bind;
 	}
 
+	return 0;
+
+err_bind:
+	clk_disable_unprepare(hdmi->ref_clk);
+	drm_encoder_cleanup(encoder);
+err_clk:
+	regulator_disable(hdmi->avdd_1v8);
+err_avdd_1v8:
+	regulator_disable(hdmi->avdd_0v9);
+err_avdd_0v9:
 	return ret;
 }
 
@@ -608,6 +640,9 @@ static void dw_hdmi_rockchip_unbind(struct device *dev, struct device *master,
 
 	dw_hdmi_unbind(hdmi->hdmi);
 	clk_disable_unprepare(hdmi->ref_clk);
+
+	regulator_disable(hdmi->avdd_1v8);
+	regulator_disable(hdmi->avdd_0v9);
 }
 
 static const struct component_ops dw_hdmi_rockchip_ops = {
-- 
2.30.2


  parent reply	other threads:[~2022-03-11  8:34 UTC|newest]

Thread overview: 39+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2022-03-11  8:32 [PATCH v8 00/24] drm/rockchip: RK356x VOP2 support Sascha Hauer
2022-03-11  8:33 ` [PATCH v8 01/24] drm/rockchip: Embed drm_encoder into rockchip_decoder Sascha Hauer
2022-03-11  8:33 ` [PATCH v8 02/24] drm/rockchip: Add crtc_endpoint_id to rockchip_encoder Sascha Hauer
2022-03-11  8:33 ` [PATCH v8 03/24] drm/rockchip: dw_hdmi: rename vpll clock to reference clock Sascha Hauer
2022-03-11  8:33 ` [PATCH v8 04/24] dt-bindings: display: rockchip: dw-hdmi: use "ref" as clock name Sascha Hauer
2022-03-11  8:33 ` [PATCH v8 05/24] arm64: dts: rockchip: rk3399: rename HDMI ref clock to 'ref' Sascha Hauer
2022-03-11  8:33 ` [PATCH v8 06/24] drm/rockchip: dw_hdmi: add rk3568 support Sascha Hauer
2022-03-11  8:33 ` [PATCH v8 07/24] dt-bindings: display: rockchip: dw-hdmi: Add compatible for rk3568 HDMI Sascha Hauer
2022-03-11  8:33 ` Sascha Hauer [this message]
2022-03-11  8:33 ` [PATCH v8 09/24] drm/rockchip: dw_hdmi: Add support for niu clk Sascha Hauer
2022-03-12 21:07   ` Dmitry Osipenko
2022-03-14  8:18     ` Sascha Hauer
2022-03-14 17:54       ` Dmitry Osipenko
2022-03-16  9:12         ` Sascha Hauer
2022-03-16 13:01           ` Dmitry Osipenko
2022-03-16 13:55             ` Robin Murphy
2022-03-16 14:01               ` Dmitry Osipenko
2022-03-16 14:31             ` Sascha Hauer
2022-03-11  8:33 ` [PATCH v8 10/24] dt-bindings: display: rockchip: dw-hdmi: Add additional clock Sascha Hauer
2022-03-11 14:55   ` Rob Herring
2022-03-11  8:33 ` [PATCH v8 11/24] dt-bindings: display: rockchip: dw-hdmi: Add regulator support Sascha Hauer
2022-03-11  8:33 ` [PATCH v8 12/24] drm/rockchip: dw_hdmi: Use auto-generated tables Sascha Hauer
2022-03-11  8:33 ` [PATCH v8 13/24] drm/rockchip: dw_hdmi: drop mode_valid hook Sascha Hauer
2022-03-11  8:33 ` [PATCH v8 14/24] drm/rockchip: dw_hdmi: Set cur_ctr to 0 always Sascha Hauer
2022-03-11  8:33 ` [PATCH v8 15/24] drm/rockchip: dw_hdmi: add default 594Mhz clk for 4K@60hz Sascha Hauer
2022-03-11  8:33 ` [PATCH v8 16/24] dt-bindings: display: rockchip: dw-hdmi: Make unwedge pinctrl optional Sascha Hauer
2022-03-11  8:33 ` [PATCH v8 17/24] arm64: dts: rockchip: rk356x: Add VOP2 nodes Sascha Hauer
2022-03-11  8:33 ` [PATCH v8 18/24] arm64: dts: rockchip: rk356x: Add HDMI nodes Sascha Hauer
2022-03-11  8:33 ` [PATCH v8 19/24] arm64: dts: rockchip: rk3568-evb: Enable VOP2 and hdmi Sascha Hauer
2022-03-11  8:33 ` [PATCH v8 20/24] arm64: dts: rockchip: enable vop2 and hdmi tx on quartz64a Sascha Hauer
2022-03-11  8:33 ` [PATCH v8 21/24] drm/rockchip: Make VOP driver optional Sascha Hauer
2022-03-11  8:33 ` [PATCH v8 22/24] drm: rockchip: Add VOP2 driver Sascha Hauer
2022-03-15  6:46   ` Andy Yan
2022-03-15 12:43     ` Daniel Stone
2022-03-16  1:14       ` Andy Yan
2022-03-16  7:40     ` Sascha Hauer
     [not found]       ` <f9d57503-1ac6-61c6-5fda-1a78b6e7270a@rock-chips.com>
     [not found]         ` <e6ab5ce2-4177-9e45-a50f-9ea3abb08800@rock-chips.com>
2022-03-18  8:52           ` Sascha Hauer
2022-03-11  8:33 ` [PATCH v8 23/24] dt-bindings: display: rockchip: Add binding for VOP2 Sascha Hauer
2022-03-11  8:33 ` [PATCH v8 24/24] dt-bindings: display: rockchip: dw-hdmi: fix ports description Sascha Hauer

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=20220311083323.887372-9-s.hauer@pengutronix.de \
    --to=s.hauer@pengutronix.de \
    --cc=andy.yan@rock-chips.com \
    --cc=benjamin.gaignard@collabora.com \
    --cc=devicetree@vger.kernel.org \
    --cc=dmitry.osipenko@collabora.com \
    --cc=dri-devel@lists.freedesktop.org \
    --cc=heiko@sntech.de \
    --cc=hjc@rock-chips.com \
    --cc=kernel@pengutronix.de \
    --cc=linux-arm-kernel@lists.infradead.org \
    --cc=linux-rockchip@lists.infradead.org \
    --cc=michael.riesch@wolfvision.net \
    --cc=pgwipeout@gmail.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).