summaryrefslogtreecommitdiffstats
path: root/drivers/video/omap2/dss
diff options
context:
space:
mode:
authorArchit Taneja <archit@ti.com>2012-11-14 13:50:16 +0530
committerTomi Valkeinen <tomi.valkeinen@ti.com>2012-11-20 16:54:39 +0200
commit264236f82ea4ee5ee418f3e57c33d9d3fc37008f (patch)
tree441403e47056d38930b1a99f409e576dfb13cf4d /drivers/video/omap2/dss
parent33b89928f5a70eb8c97027765167a7cfcf405d0a (diff)
downloadblackbird-op-linux-264236f82ea4ee5ee418f3e57c33d9d3fc37008f.tar.gz
blackbird-op-linux-264236f82ea4ee5ee418f3e57c33d9d3fc37008f.zip
OMAPDSS: Add a dispc_features struct for OMAP5
Add a dispc_features struct for OMAP5. Previously, OMAP5 used the same struct as OMAP4. The new struct for OMAP5 contains the updated register field offset and maximum limit for overlay manager width and height. Signed-off-by: Archit Taneja <archit@ti.com> Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ti.com>
Diffstat (limited to 'drivers/video/omap2/dss')
-rw-r--r--drivers/video/omap2/dss/dispc.c19
1 files changed, 18 insertions, 1 deletions
diff --git a/drivers/video/omap2/dss/dispc.c b/drivers/video/omap2/dss/dispc.c
index 98e754b4a4d3..3d0ff5b0d0ec 100644
--- a/drivers/video/omap2/dss/dispc.c
+++ b/drivers/video/omap2/dss/dispc.c
@@ -4146,6 +4146,23 @@ static const struct dispc_features omap44xx_dispc_feats __initconst = {
.gfx_fifo_workaround = true,
};
+static const struct dispc_features omap54xx_dispc_feats __initconst = {
+ .sw_start = 7,
+ .fp_start = 19,
+ .bp_start = 31,
+ .sw_max = 256,
+ .vp_max = 4095,
+ .hp_max = 4096,
+ .mgr_width_start = 11,
+ .mgr_height_start = 27,
+ .mgr_width_max = 4096,
+ .mgr_height_max = 4096,
+ .calc_scaling = dispc_ovl_calc_scaling_44xx,
+ .calc_core_clk = calc_core_clk_44xx,
+ .num_fifos = 5,
+ .gfx_fifo_workaround = true,
+};
+
static int __init dispc_init_features(struct platform_device *pdev)
{
const struct dispc_features *src;
@@ -4179,7 +4196,7 @@ static int __init dispc_init_features(struct platform_device *pdev)
break;
case OMAPDSS_VER_OMAP5:
- src = &omap44xx_dispc_feats;
+ src = &omap54xx_dispc_feats;
break;
default:
OpenPOWER on IntegriCloud