aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/gpu
diff options
context:
space:
mode:
authorChen-Yu Tsai <wens@csie.org>2016-10-19 23:43:41 -0400
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2017-04-12 06:41:15 -0400
commit6af7e1cae4457f5a17df46ca73d2f9b13d14edaf (patch)
tree598639f8eca4ac5baecff6e80c612029e95728d0 /drivers/gpu
parent06a2bb472f71c6e2ed2a51c06608680dc20eb327 (diff)
drm/sun4i: Add compatible strings for A31/A31s display pipelines
commit 49c440e87cd6f547f93d0dc53571ae0e11d9ec8f upstream. 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> Acked-by: Rob Herring <robh@kernel.org> Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/gpu')
-rw-r--r--drivers/gpu/drm/sun4i/sun4i_backend.c1
-rw-r--r--drivers/gpu/drm/sun4i/sun4i_drv.c3
2 files changed, 4 insertions, 0 deletions
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)
408 408
409static const struct of_device_id sun4i_backend_of_table[] = { 409static const struct of_device_id sun4i_backend_of_table[] = {
410 { .compatible = "allwinner,sun5i-a13-display-backend" }, 410 { .compatible = "allwinner,sun5i-a13-display-backend" },
411 { .compatible = "allwinner,sun6i-a31-display-backend" },
411 { .compatible = "allwinner,sun8i-a33-display-backend" }, 412 { .compatible = "allwinner,sun8i-a33-display-backend" },
412 { } 413 { }
413}; 414};
diff --git a/drivers/gpu/drm/sun4i/sun4i_drv.c b/drivers/gpu/drm/sun4i/sun4i_drv.c
index 70e9fd59c5a2..9440796276f7 100644
--- a/drivers/gpu/drm/sun4i/sun4i_drv.c
+++ b/drivers/gpu/drm/sun4i/sun4i_drv.c
@@ -201,6 +201,7 @@ static const struct component_master_ops sun4i_drv_master_ops = {
201static bool sun4i_drv_node_is_frontend(struct device_node *node) 201static bool sun4i_drv_node_is_frontend(struct device_node *node)
202{ 202{
203 return of_device_is_compatible(node, "allwinner,sun5i-a13-display-frontend") || 203 return of_device_is_compatible(node, "allwinner,sun5i-a13-display-frontend") ||
204 of_device_is_compatible(node, "allwinner,sun6i-a31-display-frontend") ||
204 of_device_is_compatible(node, "allwinner,sun8i-a33-display-frontend"); 205 of_device_is_compatible(node, "allwinner,sun8i-a33-display-frontend");
205} 206}
206 207
@@ -322,6 +323,8 @@ static int sun4i_drv_remove(struct platform_device *pdev)
322 323
323static const struct of_device_id sun4i_drv_of_table[] = { 324static const struct of_device_id sun4i_drv_of_table[] = {
324 { .compatible = "allwinner,sun5i-a13-display-engine" }, 325 { .compatible = "allwinner,sun5i-a13-display-engine" },
326 { .compatible = "allwinner,sun6i-a31-display-engine" },
327 { .compatible = "allwinner,sun6i-a31s-display-engine" },
325 { .compatible = "allwinner,sun8i-a33-display-engine" }, 328 { .compatible = "allwinner,sun8i-a33-display-engine" },
326 { } 329 { }
327}; 330};