From: Maxime Ripard <maxime.ripard@free-electrons.com>
To: Chen-Yu Tsai <wens@csie.org>,
Maxime Ripard <maxime.ripard@free-electrons.com>
Cc: Daniel Vetter <daniel.vetter@intel.com>,
David Airlie <airlied@linux.ie>,
dri-devel@lists.freedesktop.org,
linux-arm-kernel@lists.infradead.org,
linux-kernel@vger.kernel.org, linux-sunxi@googlegroups.com,
Hans Verkuil <hverkuil@xs4all.nl>
Subject: [PATCH v4 11/11] drm/sun4i: Add compatible for the A10s pipeline
Date: Sat, 27 May 2017 18:09:36 +0200 [thread overview]
Message-ID: <796b6579ca9b30820ab6e2be6e2eb52d60421ea7.1495900658.git-series.maxime.ripard@free-electrons.com> (raw)
In-Reply-To: <cover.c61cbe60123a4aeb24f255bca7927218dda6283e.1495900658.git-series.maxime.ripard@free-electrons.com>
In-Reply-To: <cover.c61cbe60123a4aeb24f255bca7927218dda6283e.1495900658.git-series.maxime.ripard@free-electrons.com>
The A10s has a slightly different display pipeline than the A13, with an
HDMI controller.
Add a compatible for it.
Reviewed-by: Chen-Yu Tsai <wens@csie.org>
Acked-by: Rob Herring <robh@kernel.org>
Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
---
Documentation/devicetree/bindings/display/sunxi/sun4i-drm.txt | 1 +
drivers/gpu/drm/sun4i/sun4i_drv.c | 1 +
2 files changed, 2 insertions(+)
diff --git a/Documentation/devicetree/bindings/display/sunxi/sun4i-drm.txt b/Documentation/devicetree/bindings/display/sunxi/sun4i-drm.txt
index 58fa32900184..b83e6018041d 100644
--- a/Documentation/devicetree/bindings/display/sunxi/sun4i-drm.txt
+++ b/Documentation/devicetree/bindings/display/sunxi/sun4i-drm.txt
@@ -210,6 +210,7 @@ extra node.
Required properties:
- compatible: value must be one of:
+ * allwinner,sun5i-a10s-display-engine
* allwinner,sun5i-a13-display-engine
* allwinner,sun6i-a31-display-engine
* allwinner,sun6i-a31s-display-engine
diff --git a/drivers/gpu/drm/sun4i/sun4i_drv.c b/drivers/gpu/drm/sun4i/sun4i_drv.c
index cfc0b2fcb0a6..f19100c91c2b 100644
--- a/drivers/gpu/drm/sun4i/sun4i_drv.c
+++ b/drivers/gpu/drm/sun4i/sun4i_drv.c
@@ -305,6 +305,7 @@ static int sun4i_drv_remove(struct platform_device *pdev)
}
static const struct of_device_id sun4i_drv_of_table[] = {
+ { .compatible = "allwinner,sun5i-a10s-display-engine" },
{ .compatible = "allwinner,sun5i-a13-display-engine" },
{ .compatible = "allwinner,sun6i-a31-display-engine" },
{ .compatible = "allwinner,sun6i-a31s-display-engine" },
--
git-series 0.9.1
next prev parent reply other threads:[~2017-05-27 16:11 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-05-27 16:09 [PATCH v4 00/11] drm: sun4i: Add support for the HDMI controller Maxime Ripard
2017-05-27 16:09 ` [PATCH v4 01/11] drm/sun4i: tcon: Add channel debug Maxime Ripard
2017-05-27 16:09 ` [PATCH v4 02/11] drm/sun4i: tcon: Move the muxing out of the mode set function Maxime Ripard
2017-05-27 16:09 ` [PATCH v4 03/11] drm/sun4i: tcon: Switch mux on only for composite Maxime Ripard
2017-05-27 16:09 ` [PATCH v4 04/11] drm/sun4i: tcon: Fix tcon channel 1 backporch calculation Maxime Ripard
2017-05-27 16:09 ` [PATCH v4 05/11] drm/sun4i: tcon: Change vertical total size computation inconsistency Maxime Ripard
2017-05-27 16:09 ` [PATCH v4 06/11] drm/sun4i: tcon: multiply the vtotal when not in interlace Maxime Ripard
2017-05-28 14:55 ` Chen-Yu Tsai
2017-05-27 16:09 ` [PATCH v4 07/11] drm/sun4i: Ignore the generic connectors for components Maxime Ripard
2017-05-27 16:09 ` [PATCH v4 08/11] dt-bindings: display: sun4i: Add HDMI display bindings Maxime Ripard
2017-05-27 16:09 ` [PATCH v4 09/11] dt-bindings: display: sun4i: Add allwinner,tcon-channel property Maxime Ripard
2017-05-27 16:09 ` [PATCH v4 10/11] drm/sun4i: Add HDMI support Maxime Ripard
2017-05-27 16:09 ` Maxime Ripard [this message]
2017-05-29 9:16 ` [PATCH v4 00/11] drm: sun4i: Add support for the HDMI controller Maxime Ripard
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=796b6579ca9b30820ab6e2be6e2eb52d60421ea7.1495900658.git-series.maxime.ripard@free-electrons.com \
--to=maxime.ripard@free-electrons.com \
--cc=airlied@linux.ie \
--cc=daniel.vetter@intel.com \
--cc=dri-devel@lists.freedesktop.org \
--cc=hverkuil@xs4all.nl \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-sunxi@googlegroups.com \
--cc=wens@csie.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).