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>
Subject: [PATCH v6 09/23] drm/rockchip: dw_hdmi: Add support for hclk
Date: Thu, 17 Feb 2022 09:29:40 +0100	[thread overview]
Message-ID: <20220217082954.2967889-10-s.hauer@pengutronix.de> (raw)
In-Reply-To: <20220217082954.2967889-1-s.hauer@pengutronix.de>

The rk3568 HDMI has an additional clock that needs to be enabled for the
HDMI controller to work. The purpose of that clock is not clear. It is
named "hclk" in the downstream driver, so use the same name.

Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
---

Notes:
    Changes since v5:
    - Use devm_clk_get_optional rather than devm_clk_get

 drivers/gpu/drm/rockchip/dw_hdmi-rockchip.c | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/drivers/gpu/drm/rockchip/dw_hdmi-rockchip.c b/drivers/gpu/drm/rockchip/dw_hdmi-rockchip.c
index 11acd4668ebef..45f66fd613a6d 100644
--- a/drivers/gpu/drm/rockchip/dw_hdmi-rockchip.c
+++ b/drivers/gpu/drm/rockchip/dw_hdmi-rockchip.c
@@ -76,6 +76,7 @@ struct rockchip_hdmi {
 	const struct rockchip_hdmi_chip_data *chip_data;
 	struct clk *ref_clk;
 	struct clk *grf_clk;
+	struct clk *hclk_clk;
 	struct dw_hdmi *hdmi;
 	struct regulator *avdd_0v9;
 	struct regulator *avdd_1v8;
@@ -231,6 +232,14 @@ static int rockchip_hdmi_parse_dt(struct rockchip_hdmi *hdmi)
 		return PTR_ERR(hdmi->grf_clk);
 	}
 
+	hdmi->hclk_clk = devm_clk_get_optional(hdmi->dev, "hclk");
+	if (PTR_ERR(hdmi->hclk_clk) == -EPROBE_DEFER) {
+		return -EPROBE_DEFER;
+	} else if (IS_ERR(hdmi->hclk_clk)) {
+		DRM_DEV_ERROR(hdmi->dev, "failed to get hclk_clk clock\n");
+		return PTR_ERR(hdmi->hclk_clk);
+	}
+
 	hdmi->avdd_0v9 = devm_regulator_get(hdmi->dev, "avdd-0v9");
 	if (IS_ERR(hdmi->avdd_0v9))
 		return PTR_ERR(hdmi->avdd_0v9);
@@ -598,6 +607,13 @@ static int dw_hdmi_rockchip_bind(struct device *dev, struct device *master,
 		goto err_clk;
 	}
 
+	ret = clk_prepare_enable(hdmi->hclk_clk);
+	if (ret) {
+		DRM_DEV_ERROR(hdmi->dev, "Failed to enable HDMI hclk clock: %d\n",
+			      ret);
+		goto err_clk;
+	}
+
 	if (hdmi->chip_data == &rk3568_chip_data) {
 		regmap_write(hdmi->regmap, RK3568_GRF_VO_CON1,
 			     HIWORD_UPDATE(RK3568_HDMI_SDAIN_MSK |
-- 
2.30.2


  parent reply	other threads:[~2022-02-17  8:30 UTC|newest]

Thread overview: 51+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2022-02-17  8:29 [PATCH v6 00/23] drm/rockchip: RK356x VOP2 support Sascha Hauer
2022-02-17  8:29 ` [PATCH v6 01/23] drm/rockchip: Embed drm_encoder into rockchip_decoder Sascha Hauer
2022-02-17  8:29 ` [PATCH v6 02/23] drm/rockchip: dw_hdmi: rename vpll clock to reference clock Sascha Hauer
2022-02-17 13:20   ` Dmitry Osipenko
2022-02-17 13:37     ` Sascha Hauer
2022-02-17  8:29 ` [PATCH v6 03/23] dt-bindings: display: rockchip: dw-hdmi: use "ref" as clock name Sascha Hauer
2022-02-17  8:29 ` [PATCH v6 04/23] arm64: dts: rockchip: rk3399: rename HDMI ref clock to 'ref' Sascha Hauer
2022-02-17  8:29 ` [PATCH v6 05/23] drm/rockchip: dw_hdmi: add rk3568 support Sascha Hauer
2022-02-17  8:29 ` [PATCH v6 06/23] dt-bindings: display: rockchip: dw-hdmi: Add compatible for rk3568 HDMI Sascha Hauer
2022-02-17  8:29 ` [PATCH v6 07/23] drm/rockchip: dw_hdmi: add regulator support Sascha Hauer
2022-02-17 13:18   ` Dmitry Osipenko
2022-02-17  8:29 ` [PATCH v6 08/23] dt-bindings: display: rockchip: dw-hdmi: Add " Sascha Hauer
2022-02-17  8:29 ` Sascha Hauer [this message]
2022-02-17 12:35   ` [PATCH v6 09/23] drm/rockchip: dw_hdmi: Add support for hclk Dmitry Osipenko
2022-02-17 15:00     ` Sascha Hauer
2022-02-17 16:59       ` Dmitry Osipenko
2022-02-17  8:29 ` [PATCH v6 10/23] dt-bindings: display: rockchip: dw-hdmi: Add additional clock Sascha Hauer
2022-02-17  8:29 ` [PATCH v6 11/23] drm/rockchip: dw_hdmi: Use auto-generated tables Sascha Hauer
2022-02-17  8:29 ` [PATCH v6 12/23] drm/rockchip: dw_hdmi: drop mode_valid hook Sascha Hauer
2022-02-17  8:29 ` [PATCH v6 13/23] drm/rockchip: dw_hdmi: Set cur_ctr to 0 always Sascha Hauer
2022-02-17 14:00   ` Dmitry Osipenko
2022-02-17 15:12     ` Sascha Hauer
2022-02-17 17:00       ` Dmitry Osipenko
2022-02-17  8:29 ` [PATCH v6 14/23] drm/rockchip: dw_hdmi: add default 594Mhz clk for 4K@60hz Sascha Hauer
2022-02-17  8:29 ` [PATCH v6 15/23] dt-bindings: display: rockchip: dw-hdmi: Make unwedge pinctrl optional Sascha Hauer
2022-02-17  8:29 ` [PATCH v6 16/23] arm64: dts: rockchip: rk356x: Add VOP2 nodes Sascha Hauer
2022-02-17  8:29 ` [PATCH v6 17/23] arm64: dts: rockchip: rk356x: Add HDMI nodes Sascha Hauer
2022-02-21  8:54   ` Aw: " Frank Wunderlich
2022-02-21  9:53     ` Sascha Hauer
2022-02-17  8:29 ` [PATCH v6 18/23] arm64: dts: rockchip: rk3568-evb: Enable VOP2 and hdmi Sascha Hauer
2022-02-17  8:29 ` [PATCH v6 19/23] arm64: dts: rockchip: enable vop2 and hdmi tx on quartz64a Sascha Hauer
2022-02-17  8:29 ` [PATCH v6 20/23] drm/rockchip: Make VOP driver optional Sascha Hauer
2022-02-17  8:29 ` [PATCH v6 21/23] drm: rockchip: Add VOP2 driver Sascha Hauer
2022-02-17 12:00   ` Andy Yan
2022-02-17 13:58     ` Sascha Hauer
2022-02-17 14:06       ` Heiko Stübner
2022-02-18  3:50         ` Andy Yan
2022-02-18  8:00           ` Sascha Hauer
2022-02-19  7:35             ` Andy Yan
2022-02-24  8:19               ` Sascha Hauer
2022-02-24 10:54                 ` Andy Yan
2022-02-24 12:50                   ` Sascha Hauer
2022-02-17 13:24   ` Dmitry Osipenko
2022-02-24  7:47     ` Sascha Hauer
2022-02-24 14:36       ` Dmitry Osipenko
2022-02-24 14:47         ` Sascha Hauer
2022-02-21 11:51   ` Andy Yan
2022-02-21 18:18     ` Lucas Stach
2022-02-17  8:29 ` [PATCH v6 22/23] dt-bindings: display: rockchip: Add binding for VOP2 Sascha Hauer
2022-02-17  8:29 ` [PATCH v6 23/23] dt-bindings: display: rockchip: dw-hdmi: fix ports description Sascha Hauer
2022-02-23 15:55   ` Rob Herring

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=20220217082954.2967889-10-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=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).