diff options
author | Lothar Waßmann <LW@KARO-electronics.de> | 2016-05-24 02:31:49 -0400 |
---|---|---|
committer | Philipp Zabel <p.zabel@pengutronix.de> | 2016-05-30 03:14:00 -0400 |
commit | c82b4d73e2cd32fff41be0cd6e75ea83d32943b3 (patch) | |
tree | 762d21fe0ac1674ae46dbc7672826e435aa56725 /drivers/gpu/drm/imx/imx-ldb.c | |
parent | 97a6075d7cfabd0d45f8667a89da2a5fd13b4e70 (diff) |
drm/imx: imx-ldb: honor 'native-mode' property when selecting video mode from DT
This patch allows to select a specific video mode from a list of modes
defined in DT by setting the 'native-mode' property appropriately.
This change does not affect the behaviour of existing platforms, since
they either:
- have just one display-timings subnode
- have the native-mode property pointing to the first entry
- let the bootloader select the appropriate timing
Signed-off-by: Lothar Waßmann <LW@KARO-electronics.de>
Signed-off-by: Philipp Zabel <p.zabel@pengutronix.de>
Diffstat (limited to 'drivers/gpu/drm/imx/imx-ldb.c')
-rw-r--r-- | drivers/gpu/drm/imx/imx-ldb.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/gpu/drm/imx/imx-ldb.c b/drivers/gpu/drm/imx/imx-ldb.c index 5f8f0bf45a62..beff793bb717 100644 --- a/drivers/gpu/drm/imx/imx-ldb.c +++ b/drivers/gpu/drm/imx/imx-ldb.c | |||
@@ -25,6 +25,7 @@ | |||
25 | #include <linux/mfd/syscon/imx6q-iomuxc-gpr.h> | 25 | #include <linux/mfd/syscon/imx6q-iomuxc-gpr.h> |
26 | #include <linux/of_device.h> | 26 | #include <linux/of_device.h> |
27 | #include <linux/of_graph.h> | 27 | #include <linux/of_graph.h> |
28 | #include <video/of_display_timing.h> | ||
28 | #include <video/of_videomode.h> | 29 | #include <video/of_videomode.h> |
29 | #include <linux/regmap.h> | 30 | #include <linux/regmap.h> |
30 | #include <linux/videodev2.h> | 31 | #include <linux/videodev2.h> |
@@ -625,7 +626,7 @@ static int imx_ldb_bind(struct device *dev, struct device *master, void *data) | |||
625 | /* fallback to display-timings node */ | 626 | /* fallback to display-timings node */ |
626 | ret = of_get_drm_display_mode(child, | 627 | ret = of_get_drm_display_mode(child, |
627 | &channel->mode, | 628 | &channel->mode, |
628 | 0); | 629 | OF_USE_NATIVE_MODE); |
629 | if (!ret) | 630 | if (!ret) |
630 | channel->mode_valid = 1; | 631 | channel->mode_valid = 1; |
631 | } | 632 | } |