Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1496722

[PATCH 5/9] drm/sun4i: Add compatible strings for A31/A31s display pipelines

From Chen-Yu Tsai <wens@csie.org>
Newsgroups linux.kernel
Subject [PATCH 5/9] drm/sun4i: Add compatible strings for A31/A31s display pipelines
Date 2016-10-06 18:10 +0200
Message-ID <spjp7-2A0-7@gated-at.bofh.it> (permalink)
References <spjp7-2A0-5@gated-at.bofh.it>
Organization linux.* mail to news gateway

Show all headers | View raw

The A31's display pipeline has 2 frontends, 2 backends, and 2 TCONs. It
also has new display enhancement blocks, such as the DRC (Dynamic Range
Controller), the DEU (Display Enhancement Unit), and the CMU (Color
Management Unit). It supports HDMI, MIPI DSI, and 2 LCD/LVDS channels.

The A31s display pipeline is almost the same, just without MIPI DSI.
Only the TCON seems to be different, due to the missing mux for MIPI
DSI.

Add compatible strings for both of them.

Signed-off-by: Chen-Yu Tsai <wens@csie.org>
---
 Documentation/devicetree/bindings/display/sunxi/sun4i-drm.txt | 4 ++++
 drivers/gpu/drm/sun4i/sun4i_backend.c                         | 1 +
 drivers/gpu/drm/sun4i/sun4i_drv.c                             | 3 +++
 3 files changed, 8 insertions(+)

diff --git a/Documentation/devicetree/bindings/display/sunxi/sun4i-drm.txt b/Documentation/devicetree/bindings/display/sunxi/sun4i-drm.txt
index 15fdca8909f2..b82c00449468 100644
--- a/Documentation/devicetree/bindings/display/sunxi/sun4i-drm.txt
+++ b/Documentation/devicetree/bindings/display/sunxi/sun4i-drm.txt
@@ -91,6 +91,7 @@ system.
 Required properties:
   - compatible: value must be one of:
     * allwinner,sun5i-a13-display-backend
+    * allwinner,sun6i-a31-display-backend
     * allwinner,sun8i-a33-display-backend
   - reg: base address and size of the memory-mapped region.
   - clocks: phandles to the clocks feeding the frontend and backend
@@ -121,6 +122,7 @@ deinterlacing and color space conversion.
 Required properties:
   - compatible: value must be one of:
     * allwinner,sun5i-a13-display-frontend
+    * allwinner,sun6i-a31-display-frontend
     * allwinner,sun8i-a33-display-frontend
   - reg: base address and size of the memory-mapped region.
   - interrupts: interrupt associated to this IP
@@ -146,6 +148,8 @@ extra node.
 Required properties:
   - compatible: value must be one of:
     * allwinner,sun5i-a13-display-engine
+    * allwinner,sun6i-a31-display-engine
+    * allwinner,sun6i-a31s-display-engine
     * allwinner,sun8i-a33-display-engine
 
   - allwinner,pipelines: list of phandle to the display engine
diff --git a/drivers/gpu/drm/sun4i/sun4i_backend.c b/drivers/gpu/drm/sun4i/sun4i_backend.c
index 32c0584e3c35..6e6c59a661b6 100644
--- a/drivers/gpu/drm/sun4i/sun4i_backend.c
+++ b/drivers/gpu/drm/sun4i/sun4i_backend.c
@@ -408,6 +408,7 @@ static int sun4i_backend_remove(struct platform_device *pdev)
 
 static const struct of_device_id sun4i_backend_of_table[] = {
 	{ .compatible = "allwinner,sun5i-a13-display-backend" },
+	{ .compatible = "allwinner,sun6i-a31-display-backend" },
 	{ .compatible = "allwinner,sun8i-a33-display-backend" },
 	{ }
 };
diff --git a/drivers/gpu/drm/sun4i/sun4i_drv.c b/drivers/gpu/drm/sun4i/sun4i_drv.c
index 35af3728c4ee..480a709cc324 100644
--- a/drivers/gpu/drm/sun4i/sun4i_drv.c
+++ b/drivers/gpu/drm/sun4i/sun4i_drv.c
@@ -200,6 +200,7 @@ static const struct component_master_ops sun4i_drv_master_ops = {
 static bool sun4i_drv_node_is_frontend(struct device_node *node)
 {
 	return of_device_is_compatible(node, "allwinner,sun5i-a13-display-frontend") ||
+		of_device_is_compatible(node, "allwinner,sun6i-a31-display-frontend") ||
 		of_device_is_compatible(node, "allwinner,sun8i-a33-display-frontend");
 }
 
@@ -323,6 +324,8 @@ static int sun4i_drv_remove(struct platform_device *pdev)
 
 static const struct of_device_id sun4i_drv_of_table[] = {
 	{ .compatible = "allwinner,sun5i-a13-display-engine" },
+	{ .compatible = "allwinner,sun6i-a31-display-engine" },
+	{ .compatible = "allwinner,sun6i-a31s-display-engine" },
 	{ .compatible = "allwinner,sun8i-a33-display-engine" },
 	{ }
 };
-- 
2.9.3

Back to linux.kernel | Previous | Next — Previous in thread | Next in thread | Find similar | Unroll thread

Thread

[PATCH 0/9] drm/sun4i: Support first display pipeline on sun6i Chen-Yu Tsai <wens@csie.org> - 2016-10-06 18:10 +0200
  [PATCH 5/9] drm/sun4i: Add compatible strings for A31/A31s display pipelines Chen-Yu Tsai <wens@csie.org> - 2016-10-06 18:10 +0200
    Re: [PATCH 5/9] drm/sun4i: Add compatible strings for A31/A31s  display pipelines Rob Herring <robh@kernel.org> - 2016-10-10 16:50 +0200
  [PATCH 7/9] ARM: dts: sun6i: Add device nodes for first display pipeline Chen-Yu Tsai <wens@csie.org> - 2016-10-06 18:10 +0200
  [PATCH 6/9] ARM: dts: sun6i: Sort pinmux setting nodes Chen-Yu Tsai <wens@csie.org> - 2016-10-06 18:10 +0200
    Re: [PATCH 6/9] ARM: dts: sun6i: Sort pinmux setting nodes Maxime Ripard <maxime.ripard@free-electrons.com> - 2016-10-07 15:10 +0200
  [PATCH 4/9] drm/sun4i: Add compatible string for A31/A31s TCON (timing controller) Chen-Yu Tsai <wens@csie.org> - 2016-10-06 18:10 +0200
    Re: [PATCH 4/9] drm/sun4i: Add compatible string for A31/A31s TCON  (timing controller) Maxime Ripard <maxime.ripard@free-electrons.com> - 2016-10-07 15:10 +0200
  [PATCH 8/9] ARM: dts: sun6i: Add A31 LCD0 RGB888 pins Chen-Yu Tsai <wens@csie.org> - 2016-10-06 18:10 +0200
  [PATCH 3/9] drm/sun4i: Put dotclock range into tcon quirks and check against them Chen-Yu Tsai <wens@csie.org> - 2016-10-06 18:10 +0200
    Re: [PATCH 3/9] drm/sun4i: Put dotclock range into tcon quirks and  check against them Maxime Ripard <maxime.ripard@free-electrons.com> - 2016-10-07 15:10 +0200
  [PATCH 9/9] [DO NOT MERGE] ARM: dts: sun6i: Enable 7" LCD panel on Sinlinx SinA31s Chen-Yu Tsai <wens@csie.org> - 2016-10-06 18:10 +0200
  [PATCH 2/9] drm/sun4i: tcon: Move SoC specific quirks to a DT matched data structure Chen-Yu Tsai <wens@csie.org> - 2016-10-06 18:10 +0200
    Re: [PATCH 2/9] drm/sun4i: tcon: Move SoC specific quirks to a DT  matched data structure Maxime Ripard <maxime.ripard@free-electrons.com> - 2016-10-07 15:10 +0200
      Re: [PATCH 2/9] drm/sun4i: tcon: Move SoC specific quirks to a DT  matched data structure Chen-Yu Tsai <wens@csie.org> - 2016-10-11 11:20 +0200
        Re: [PATCH 2/9] drm/sun4i: tcon: Move SoC specific quirks to a DT  matched data structure Maxime Ripard <maxime.ripard@free-electrons.com> - 2016-10-11 11:40 +0200

csiph-web