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 v8 06/24] drm/rockchip: dw_hdmi: add rk3568 support
Date: Fri, 11 Mar 2022 09:33:05 +0100	[thread overview]
Message-ID: <20220311083323.887372-7-s.hauer@pengutronix.de> (raw)
In-Reply-To: <20220311083323.887372-1-s.hauer@pengutronix.de>

Add a new dw_hdmi_plat_data struct and new compatible for rk3568.

Signed-off-by: Benjamin Gaignard <benjamin.gaignard@collabora.com>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
---
 drivers/gpu/drm/rockchip/dw_hdmi-rockchip.c | 31 +++++++++++++++++++++
 1 file changed, 31 insertions(+)

diff --git a/drivers/gpu/drm/rockchip/dw_hdmi-rockchip.c b/drivers/gpu/drm/rockchip/dw_hdmi-rockchip.c
index 912181429880a..b64cc62c7b5af 100644
--- a/drivers/gpu/drm/rockchip/dw_hdmi-rockchip.c
+++ b/drivers/gpu/drm/rockchip/dw_hdmi-rockchip.c
@@ -50,6 +50,10 @@
 #define RK3399_GRF_SOC_CON20		0x6250
 #define RK3399_HDMI_LCDC_SEL		BIT(6)
 
+#define RK3568_GRF_VO_CON1		0x0364
+#define RK3568_HDMI_SDAIN_MSK		BIT(15)
+#define RK3568_HDMI_SCLIN_MSK		BIT(14)
+
 #define HIWORD_UPDATE(val, mask)	(val | (mask) << 16)
 
 /**
@@ -473,6 +477,19 @@ static const struct dw_hdmi_plat_data rk3399_hdmi_drv_data = {
 	.use_drm_infoframe = true,
 };
 
+static struct rockchip_hdmi_chip_data rk3568_chip_data = {
+	.lcdsel_grf_reg = -1,
+};
+
+static const struct dw_hdmi_plat_data rk3568_hdmi_drv_data = {
+	.mode_valid = dw_hdmi_rockchip_mode_valid,
+	.mpll_cfg   = rockchip_mpll_cfg,
+	.cur_ctr    = rockchip_cur_ctr,
+	.phy_config = rockchip_phy_config,
+	.phy_data = &rk3568_chip_data,
+	.use_drm_infoframe = true,
+};
+
 static const struct of_device_id dw_hdmi_rockchip_dt_ids[] = {
 	{ .compatible = "rockchip,rk3228-dw-hdmi",
 	  .data = &rk3228_hdmi_drv_data
@@ -486,6 +503,9 @@ static const struct of_device_id dw_hdmi_rockchip_dt_ids[] = {
 	{ .compatible = "rockchip,rk3399-dw-hdmi",
 	  .data = &rk3399_hdmi_drv_data
 	},
+	{ .compatible = "rockchip,rk3568-dw-hdmi",
+	  .data = &rk3568_hdmi_drv_data
+	},
 	{},
 };
 MODULE_DEVICE_TABLE(of, dw_hdmi_rockchip_dt_ids);
@@ -520,6 +540,9 @@ static int dw_hdmi_rockchip_bind(struct device *dev, struct device *master,
 	encoder = &hdmi->encoder.encoder;
 
 	encoder->possible_crtcs = drm_of_find_possible_crtcs(drm, dev->of_node);
+	rockchip_drm_encoder_set_crtc_endpoint_id(&hdmi->encoder,
+						  dev->of_node, 0, 0);
+
 	/*
 	 * If we failed to find the CRTC(s) which this encoder is
 	 * supposed to be connected to, it's because the CRTC has
@@ -550,6 +573,14 @@ static int dw_hdmi_rockchip_bind(struct device *dev, struct device *master,
 		return ret;
 	}
 
+	if (hdmi->chip_data == &rk3568_chip_data) {
+		regmap_write(hdmi->regmap, RK3568_GRF_VO_CON1,
+			     HIWORD_UPDATE(RK3568_HDMI_SDAIN_MSK |
+					   RK3568_HDMI_SCLIN_MSK,
+					   RK3568_HDMI_SDAIN_MSK |
+					   RK3568_HDMI_SCLIN_MSK));
+	}
+
 	drm_encoder_helper_add(encoder, &dw_hdmi_rockchip_encoder_helper_funcs);
 	drm_simple_encoder_init(drm, encoder, DRM_MODE_ENCODER_TMDS);
 
-- 
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 ` Sascha Hauer [this message]
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 ` [PATCH v8 08/24] drm/rockchip: dw_hdmi: add regulator support Sascha Hauer
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-7-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).