Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 49c440e8 authored by Chen-Yu Tsai's avatar Chen-Yu Tsai Committed by Maxime Ripard
Browse files

drm/sun4i: Add compatible strings for A31/A31s display pipelines 



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: default avatarChen-Yu Tsai <wens@csie.org>
Acked-by: default avatarRob Herring <robh@kernel.org>
Signed-off-by: default avatarMaxime Ripard <maxime.ripard@free-electrons.com>
parent 93a5ec14

Documentation/devicetree/bindings/display/sunxi/sun4i-drm.txt

+4 −0
Original line number Diff line number Diff line
@@ -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

drivers/gpu/drm/sun4i/sun4i_backend.c

+1 −0
Original line number Diff line number Diff line
@@ -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" },

	{ }

};

drivers/gpu/drm/sun4i/sun4i_drv.c

+3 −0
Original line number Diff line number Diff line
@@ -201,6 +201,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");

}
@@ -324,6 +325,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" },

	{ }

};