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 06/15] drm/rockchip: analogix_dp: add support for the rk3368 variant
Date: Mon, 17 Dec 2018 13:36:41 +0100 [thread overview]
Message-ID: <20181217123650.6773-7-heiko@sntech.de> (raw)
In-Reply-To: <20181217123650.6773-1-heiko@sntech.de>
Add the compatible and allow the driver to also not set any crtc input
on socs that only have one vop. While that was already possible
because the driver checked against the grf-reg being 0, make that
var an int as "0x0" is a valid grf address itself. So standardize
on -1 for "no setting needed".
The dp controller behaves similar to the one found on rk3288, so we
don't add a new chip_type to not overly pollute the bridge driver.
Signed-off-by: Heiko Stuebner <heiko@sntech.de>
---
.../display/rockchip/analogix_dp-rockchip.txt | 1 +
drivers/gpu/drm/rockchip/analogix_dp-rockchip.c | 17 +++++++++++++----
2 files changed, 14 insertions(+), 4 deletions(-)
diff --git a/Documentation/devicetree/bindings/display/rockchip/analogix_dp-rockchip.txt b/Documentation/devicetree/bindings/display/rockchip/analogix_dp-rockchip.txt
index 43561584c13a..d0f7a1292355 100644
--- a/Documentation/devicetree/bindings/display/rockchip/analogix_dp-rockchip.txt
+++ b/Documentation/devicetree/bindings/display/rockchip/analogix_dp-rockchip.txt
@@ -3,6 +3,7 @@ Rockchip RK3288 specific extensions to the Analogix Display Port
Required properties:
- compatible: "rockchip,rk3288-dp",
+ "rockchip,rk3368-dp",
"rockchip,rk3399-edp";
- reg: physical base address of the controller and length
diff --git a/drivers/gpu/drm/rockchip/analogix_dp-rockchip.c b/drivers/gpu/drm/rockchip/analogix_dp-rockchip.c
index 080f05352195..acfcffc279ea 100644
--- a/drivers/gpu/drm/rockchip/analogix_dp-rockchip.c
+++ b/drivers/gpu/drm/rockchip/analogix_dp-rockchip.c
@@ -54,7 +54,7 @@
* @chip_type: specific chip type
*/
struct rockchip_dp_chip_data {
- u32 lcdsel_grf_reg;
+ int lcdsel_grf_reg;
u32 lcdsel_big;
u32 lcdsel_lit;
u32 chip_type;
@@ -207,9 +207,12 @@ static void rockchip_dp_drm_encoder_enable(struct drm_encoder *encoder)
return;
}
- ret = regmap_write(dp->grf, dp->data->lcdsel_grf_reg, val);
- if (ret != 0)
- DRM_DEV_ERROR(dp->dev, "Could not write to GRF: %d\n", ret);
+ if (dp->data->lcdsel_grf_reg >= 0) {
+ ret = regmap_write(dp->grf, dp->data->lcdsel_grf_reg, val);
+ if (ret != 0)
+ DRM_DEV_ERROR(dp->dev, "Could not write to GRF: %d\n",
+ ret);
+ }
clk_disable_unprepare(dp->grfclk);
}
@@ -455,8 +458,14 @@ static const struct rockchip_dp_chip_data rk3288_dp = {
.chip_type = RK3288_DP,
};
+static const struct rockchip_dp_chip_data rk3368_dp = {
+ .lcdsel_grf_reg = -1,
+ .chip_type = RK3288_DP,
+};
+
static const struct of_device_id rockchip_dp_dt_ids[] = {
{.compatible = "rockchip,rk3288-dp", .data = &rk3288_dp },
+ {.compatible = "rockchip,rk3368-dp", .data = &rk3368_dp },
{.compatible = "rockchip,rk3399-edp", .data = &rk3399_edp },
{}
};
--
2.19.2
next prev parent reply other threads:[~2018-12-17 12:37 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 ` [PATCH 05/15] drm/rockchip: dw_hdmi: add support for rk3368 Heiko Stuebner
2018-12-20 21:39 ` Rob Herring
2018-12-17 12:36 ` Heiko Stuebner [this message]
2018-12-20 21:40 ` [PATCH 06/15] drm/rockchip: analogix_dp: add support for the rk3368 variant 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-7-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).