From: Heiko Stuebner <heiko@sntech.de>
To: linux-rockchip@lists.infradead.org, hjc@rock-chips.com
Cc: linux-arm-kernel@lists.infradead.org,
linux-kernel@vger.kernel.org, devicetree@vger.kernel.org,
dri-devel@lists.freedesktop.org, robh+dt@kernel.org,
mark.rutland@arm.com, architt@codeaurora.org,
a.hajda@samsung.com, Laurent.pinchart@ideasonboard.com,
linux-clk@vger.kernel.org, Heiko Stuebner <heiko@sntech.de>
Subject: [PATCH 05/15] drm/rockchip: dw_hdmi: add support for rk3368
Date: Mon, 17 Dec 2018 13:36:40 +0100 [thread overview]
Message-ID: <20181217123650.6773-6-heiko@sntech.de> (raw)
In-Reply-To: <20181217123650.6773-1-heiko@sntech.de>
The rk3368 only has one vop block and thus the dw_hdmi does not need to
do the source selection.
Signed-off-by: Heiko Stuebner <heiko@sntech.de>
---
.../display/rockchip/dw_hdmi-rockchip.txt | 1 +
drivers/gpu/drm/rockchip/dw_hdmi-rockchip.c | 15 +++++++++++++++
2 files changed, 16 insertions(+)
diff --git a/Documentation/devicetree/bindings/display/rockchip/dw_hdmi-rockchip.txt b/Documentation/devicetree/bindings/display/rockchip/dw_hdmi-rockchip.txt
index 39143424a474..6b8159a8bc57 100644
--- a/Documentation/devicetree/bindings/display/rockchip/dw_hdmi-rockchip.txt
+++ b/Documentation/devicetree/bindings/display/rockchip/dw_hdmi-rockchip.txt
@@ -14,6 +14,7 @@ Required properties:
- compatible: should be one of the following:
"rockchip,rk3288-dw-hdmi"
"rockchip,rk3328-dw-hdmi"
+ "rockchip,rk3368-dw-hdmi"
"rockchip,rk3399-dw-hdmi"
- reg: See dw_hdmi.txt.
- reg-io-width: See dw_hdmi.txt. Shall be 4.
diff --git a/drivers/gpu/drm/rockchip/dw_hdmi-rockchip.c b/drivers/gpu/drm/rockchip/dw_hdmi-rockchip.c
index 89c63cfde5c8..eca9a7d213ea 100644
--- a/drivers/gpu/drm/rockchip/dw_hdmi-rockchip.c
+++ b/drivers/gpu/drm/rockchip/dw_hdmi-rockchip.c
@@ -407,6 +407,18 @@ static const struct dw_hdmi_plat_data rk3328_hdmi_drv_data = {
.phy_force_vendor = true,
};
+static struct rockchip_hdmi_chip_data rk3368_chip_data = {
+ .lcdsel_grf_reg = -1,
+};
+
+static const struct dw_hdmi_plat_data rk3368_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 = &rk3368_chip_data,
+};
+
static struct rockchip_hdmi_chip_data rk3399_chip_data = {
.lcdsel_grf_reg = RK3399_GRF_SOC_CON20,
.lcdsel_big = HIWORD_UPDATE(0, RK3399_HDMI_LCDC_SEL),
@@ -428,6 +440,9 @@ static const struct of_device_id dw_hdmi_rockchip_dt_ids[] = {
{ .compatible = "rockchip,rk3328-dw-hdmi",
.data = &rk3328_hdmi_drv_data
},
+ { .compatible = "rockchip,rk3368-dw-hdmi",
+ .data = &rk3368_hdmi_drv_data
+ },
{ .compatible = "rockchip,rk3399-dw-hdmi",
.data = &rk3399_hdmi_drv_data
},
--
2.19.2
next prev parent reply other threads:[~2018-12-17 12:38 UTC|newest]
Thread overview: 21+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-12-17 12:36 [PATCH 00/15] drm/rockchip: add display support for rk3368 Heiko Stuebner
2018-12-17 12:36 ` [PATCH 01/15] clk: rockchip: add clock ids for dphy rx and tx channels on rk3368 Heiko Stuebner
2018-12-20 21:37 ` Rob Herring
2018-12-17 12:36 ` [PATCH 02/15] clk: rockchip: add clock id 24m dsi clock " Heiko Stuebner
2018-12-20 21:37 ` Rob Herring
2018-12-17 12:36 ` [PATCH 03/15] clk: rockchip: use clock ids for dphy rx and tx " Heiko Stuebner
2018-12-17 12:36 ` [PATCH 04/15] clk: rockchip: use clock id for 24m dsi " Heiko Stuebner
2018-12-17 12:36 ` Heiko Stuebner [this message]
2018-12-20 21:39 ` [PATCH 05/15] drm/rockchip: dw_hdmi: add support for rk3368 Rob Herring
2018-12-17 12:36 ` [PATCH 06/15] drm/rockchip: analogix_dp: add support for the rk3368 variant Heiko Stuebner
2018-12-20 21:40 ` Rob Herring
2018-12-17 12:36 ` [PATCH 07/15] drm/rockchip: dw-mipi-dsi: add support for rk3368-variant Heiko Stuebner
2018-12-20 21:42 ` Rob Herring
2018-12-17 12:36 ` [PATCH 08/15] arm64: dts: rockchip: default values for core clocks on rk3368 Heiko Stuebner
2018-12-17 12:36 ` [PATCH 09/15] arm64: dts: rockchip: add power-domain nodes " Heiko Stuebner
2018-12-17 12:36 ` [PATCH 10/15] arm64: dts: rockchip: add dw-hdmi controller " Heiko Stuebner
2018-12-17 12:36 ` [PATCH 11/15] arm64: dts: rockchip: add analogix-dp " Heiko Stuebner
2018-12-17 12:36 ` [PATCH 12/15] arm64: dts: rockchip: add dw-mipi-dsi " Heiko Stuebner
2018-12-17 12:36 ` [PATCH 13/15] arm64: dts: rockchip: add core display support for rk3368 Heiko Stuebner
2018-12-17 12:36 ` [PATCH 14/15] arm64: dts: rockchip: enable display on rk3368-r88 Heiko Stuebner
2018-12-17 12:36 ` [PATCH 15/15] arm64: defconfig: enable hym8563 rtc driver Heiko Stuebner
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=20181217123650.6773-6-heiko@sntech.de \
--to=heiko@sntech.de \
--cc=Laurent.pinchart@ideasonboard.com \
--cc=a.hajda@samsung.com \
--cc=architt@codeaurora.org \
--cc=devicetree@vger.kernel.org \
--cc=dri-devel@lists.freedesktop.org \
--cc=hjc@rock-chips.com \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-clk@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-rockchip@lists.infradead.org \
--cc=mark.rutland@arm.com \
--cc=robh+dt@kernel.org \
/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).