omapdss: Add DRA7XX as an OMAPDSS version

DRA7xx has a slightly modified version of the DSS on OMAP5. Create a new OMAPDSS
version for it. Use omap5 structs for inititalizations in dss features, dss and
dispc.

Signed-off-by: Archit Taneja <archit@ti.com>

diff --git a/arch/arm/mach-omap2/display.c b/arch/arm/mach-omap2/display.c
index d3e63bc238525305ef547d1355aea84c828f506a..502196efd57f48ac48b0f692319ec5a00b4b822e 100644 (file)
--- a/arch/arm/mach-omap2/display.c
+++ b/arch/arm/mach-omap2/display.c
@@ -403,6 +403,8 @@ static enum omapdss_version __init omap_display_get_version(void)
                return OMAPDSS_VER_OMAP4;
        else if (soc_is_omap54xx())
                return OMAPDSS_VER_OMAP5;
+       else if (soc_is_dra7xx())
+               return OMAPDSS_VER_DRA7xx;
        else
                return OMAPDSS_VER_UNKNOWN;
 }

diff --git a/drivers/video/omap2/dss/dispc.c b/drivers/video/omap2/dss/dispc.c
index 4e8b6c8c67b9815a0cff74ec97ea2b0378246206..1ca4a677384fd34ad9e15f8cde1f0d06b56954ab 100644 (file)
--- a/drivers/video/omap2/dss/dispc.c
+++ b/drivers/video/omap2/dss/dispc.c
@@ -3604,6 +3604,7 @@ static int __init dispc_init_features(struct platform_device *pdev)
                break;
 
        case OMAPDSS_VER_OMAP5:
+       case OMAPDSS_VER_DRA7xx:
                src = &omap54xx_dispc_feats;
                break;
 

diff --git a/drivers/video/omap2/dss/dss.c b/drivers/video/omap2/dss/dss.c
index 189bb663bdaa33836b9ba98b7e81927c67fec194..4152ff2b64576740b5e251b1569837ac1414a020 100644 (file)
--- a/drivers/video/omap2/dss/dss.c
+++ b/drivers/video/omap2/dss/dss.c
@@ -912,6 +912,7 @@ static int __init dss_init_features(struct platform_device *pdev)
                break;
 
        case OMAPDSS_VER_OMAP5:
+       case OMAPDSS_VER_DRA7xx:
                src = &omap54xx_dss_feats;
                break;
 

diff --git a/drivers/video/omap2/dss/dss_features.c b/drivers/video/omap2/dss/dss_features.c
index a29f40168852c6ddf2110587802eb77d546d15d6..430a4b9cd38660f05707a20e5fc8673cda32e717 100644 (file)
--- a/drivers/video/omap2/dss/dss_features.c
+++ b/drivers/video/omap2/dss/dss_features.c
@@ -861,6 +861,7 @@ void dss_init_hdmi_ip_ops(struct hdmi_ip_data *ip_data,
                ip_data->ops = &omap4_hdmi_functions;
                break;
        case OMAPDSS_VER_OMAP5:
+       case OMAPDSS_VER_DRA7xx:
                ip_data->ops = &omap5_hdmi_functions;
                break;
        default:
@@ -1002,6 +1003,7 @@ void dss_features_init(enum omapdss_version version)
                break;
 
        case OMAPDSS_VER_OMAP5:
+       case OMAPDSS_VER_DRA7xx:
                omap_current_dss_features = &omap5_dss_features;
                break;
 

diff --git a/include/video/omapdss.h b/include/video/omapdss.h
index 7fd3d65065622a8bc0cb4f41645de417a32e3df6..09fdcd6e60e28599cbedcf3e00ecd47f2dc95d12 100644 (file)
--- a/include/video/omapdss.h
+++ b/include/video/omapdss.h
@@ -373,6 +373,7 @@ enum omapdss_version {
        OMAPDSS_VER_OMAP4430_ES2,       /* OMAP4430 ES2.0, 2.1, 2.2 */
        OMAPDSS_VER_OMAP4,              /* All other OMAP4s */
        OMAPDSS_VER_OMAP5,
+       OMAPDSS_VER_DRA7xx,
 };
 
 /* Board specific data */