From a3b588954195944a99a966f23ef7a66dc303f0fd Mon Sep 17 00:00:00 2001 From: Archit Taneja Date: Thu, 4 Apr 2013 19:49:41 +0530 Subject: [PATCH] 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 --- arch/arm/mach-omap2/display.c | 2 ++ drivers/video/omap2/dss/dispc.c | 1 + drivers/video/omap2/dss/dss.c | 1 + drivers/video/omap2/dss/dss_features.c | 2 ++ include/video/omapdss.h | 1 + 5 files changed, 7 insertions(+) diff --git a/arch/arm/mach-omap2/display.c b/arch/arm/mach-omap2/display.c index d3e63bc2385..502196efd57 100644 --- 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 4e8b6c8c67b..1ca4a677384 100644 --- 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 189bb663bda..4152ff2b645 100644 --- 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 a29f4016885..430a4b9cd38 100644 --- 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 7fd3d650656..09fdcd6e60e 100644 --- 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 */ -- 2.39.2