OMAPDSS: DISPC: use omapdss_version

Use omapdss_version in dispc.c to select the proper dispc features.

Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ti.com>

1 files changed, 28 insertions, 13 deletions

diff --git a/drivers/video/omap2/dss/dispc.c b/drivers/video/omap2/dss/dispc.c
index b43477a5fae8..d30e5fa1864a 100644
--- a/drivers/video/omap2/dss/dispc.c
+++ b/drivers/video/omap2/dss/dispc.c
@@ -4042,29 +4042,44 @@ static const struct dispc_features omap44xx_dispc_feats __initconst = {
         .gfx_fifo_workaround    =       true,
 };
 
-static int __init dispc_init_features(struct device *dev)
+static int __init dispc_init_features(struct platform_device *pdev)
 {
+        struct omap_dss_board_info *pdata = pdev->dev.platform_data;
         const struct dispc_features *src;
         struct dispc_features *dst;
 
-        dst = devm_kzalloc(dev, sizeof(*dst), GFP_KERNEL);
+        dst = devm_kzalloc(&pdev->dev, sizeof(*dst), GFP_KERNEL);
         if (!dst) {
-                dev_err(dev, "Failed to allocate DISPC Features\n");
+                dev_err(&pdev->dev, "Failed to allocate DISPC Features\n");
                 return -ENOMEM;
         }
 
-        if (cpu_is_omap24xx()) {
+        switch (pdata->version) {
+        case OMAPDSS_VER_OMAP24xx:
                 src = &omap24xx_dispc_feats;
-        } else if (cpu_is_omap34xx()) {
-                if (omap_rev() < OMAP3430_REV_ES3_0)
-                        src = &omap34xx_rev1_0_dispc_feats;
-                else
-                        src = &omap34xx_rev3_0_dispc_feats;
-        } else if (cpu_is_omap44xx()) {
+                break;
+
+        case OMAPDSS_VER_OMAP34xx_ES1:
+                src = &omap34xx_rev1_0_dispc_feats;
+                break;
+
+        case OMAPDSS_VER_OMAP34xx_ES3:
+        case OMAPDSS_VER_OMAP3630:
+        case OMAPDSS_VER_AM35xx:
+                src = &omap34xx_rev3_0_dispc_feats;
+                break;
+
+        case OMAPDSS_VER_OMAP4430_ES1:
+        case OMAPDSS_VER_OMAP4430_ES2:
+        case OMAPDSS_VER_OMAP4:
                 src = &omap44xx_dispc_feats;
-        } else if (soc_is_omap54xx()) {
+                break;
+
+        case OMAPDSS_VER_OMAP5:
                 src = &omap44xx_dispc_feats;
-        } else {
+                break;
+
+        default:
                 return -ENODEV;
         }
 
@@ -4084,7 +4099,7 @@ static int __init omap_dispchw_probe(struct platform_device *pdev)
 
         dispc.pdev = pdev;
 
-        r = dispc_init_features(&dispc.pdev->dev);
+        r = dispc_init_features(dispc.pdev);
         if (r)
                 return r;