summaryrefslogtreecommitdiffstats
path: root/drivers/video/omap2/dss/dss.c
diff options
context:
space:
mode:
authorTomi Valkeinen <tomi.valkeinen@ti.com>2012-10-18 13:46:29 +0300
committerTomi Valkeinen <tomi.valkeinen@ti.com>2012-10-24 08:48:16 +0300
commitb2c7d54f72c1c588e8851c882f0465705f5e9e55 (patch)
tree67fa3ecc82feef0f99acb938c613e355f87f0bf3 /drivers/video/omap2/dss/dss.c
parent998c336d4c7183301ed6a6ca93952f63e3cf694f (diff)
downloadop-kernel-dev-b2c7d54f72c1c588e8851c882f0465705f5e9e55.zip
op-kernel-dev-b2c7d54f72c1c588e8851c882f0465705f5e9e55.tar.gz
OMAPDSS: get the dss version from core pdev
The output drivers get the omapdss hw version from the platform data for their respective output device. This doesn't work with DT, as there's no platform data for them. Add a new function, omapdss_get_version(), which returns the dss version from the core device, which will have platform data on DT also. The function is exported so that users of omapdss can also use it. Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ti.com>
Diffstat (limited to 'drivers/video/omap2/dss/dss.c')
-rw-r--r--drivers/video/omap2/dss/dss.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/video/omap2/dss/dss.c b/drivers/video/omap2/dss/dss.c
index 37ee465..d90de37 100644
--- a/drivers/video/omap2/dss/dss.c
+++ b/drivers/video/omap2/dss/dss.c
@@ -793,7 +793,6 @@ static const struct dss_features omap54xx_dss_feats __initconst = {
static int __init dss_init_features(struct platform_device *pdev)
{
- struct omap_dss_board_info *pdata = pdev->dev.platform_data;
const struct dss_features *src;
struct dss_features *dst;
@@ -803,7 +802,7 @@ static int __init dss_init_features(struct platform_device *pdev)
return -ENOMEM;
}
- switch (pdata->version) {
+ switch (omapdss_get_version()) {
case OMAPDSS_VER_OMAP24xx:
src = &omap24xx_dss_feats;
break;
OpenPOWER on IntegriCloud