diff options
author | Tomi Valkeinen <tomi.valkeinen@ti.com> | 2012-10-18 06:46:29 -0400 |
---|---|---|
committer | Tomi Valkeinen <tomi.valkeinen@ti.com> | 2012-10-24 01:48:16 -0400 |
commit | b2c7d54f72c1c588e8851c882f0465705f5e9e55 (patch) | |
tree | 67fa3ecc82feef0f99acb938c613e355f87f0bf3 /drivers/video/omap2/dss/dss.c | |
parent | 998c336d4c7183301ed6a6ca93952f63e3cf694f (diff) |
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.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/video/omap2/dss/dss.c b/drivers/video/omap2/dss/dss.c index 37ee465c1a0e..d90de37288c4 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 = { | |||
793 | 793 | ||
794 | static int __init dss_init_features(struct platform_device *pdev) | 794 | static int __init dss_init_features(struct platform_device *pdev) |
795 | { | 795 | { |
796 | struct omap_dss_board_info *pdata = pdev->dev.platform_data; | ||
797 | const struct dss_features *src; | 796 | const struct dss_features *src; |
798 | struct dss_features *dst; | 797 | struct dss_features *dst; |
799 | 798 | ||
@@ -803,7 +802,7 @@ static int __init dss_init_features(struct platform_device *pdev) | |||
803 | return -ENOMEM; | 802 | return -ENOMEM; |
804 | } | 803 | } |
805 | 804 | ||
806 | switch (pdata->version) { | 805 | switch (omapdss_get_version()) { |
807 | case OMAPDSS_VER_OMAP24xx: | 806 | case OMAPDSS_VER_OMAP24xx: |
808 | src = &omap24xx_dss_feats; | 807 | src = &omap24xx_dss_feats; |
809 | break; | 808 | break; |