summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSebastien Jan <s-jan@ti.com>2010-07-28 09:34:38 +0200
committerSebastien Jan <s-jan@ti.com>2010-07-28 09:34:38 +0200
commit4164ae19271a13b5bfc1426000ab77bf392b6a1a (patch)
tree459f50a78eb97acd26871b2dfad6162e8579214c
parent355cb63dade31ac245f9c20d7f1228f00defda11 (diff)
DISPC: Dynamic ES1.0 support
Signed-off-by: Sebastien Jan <s-jan@ti.com>
-rw-r--r--drivers/video/omap2/dss/dispc.c9
1 files changed, 5 insertions, 4 deletions
diff --git a/drivers/video/omap2/dss/dispc.c b/drivers/video/omap2/dss/dispc.c
index 6b5695f6025a..eaf71f611760 100644
--- a/drivers/video/omap2/dss/dispc.c
+++ b/drivers/video/omap2/dss/dispc.c
@@ -34,6 +34,7 @@
#include <plat/sram.h>
#include <plat/clock.h>
+#include <plat/cpu.h>
#include <plat/display.h>
@@ -4644,10 +4645,10 @@ int dispc_setup_wb(struct writeback_cache_data *wb)
REG_FLD_MOD(dispc_reg_att[input_plane], 0x1, 10, 10);
REG_FLD_MOD(dispc_reg_att[input_plane], 0x1, 19, 19);
REG_FLD_MOD(dispc_reg_att[plane], source, 18, 16);
-#ifdef OMAP4430_REV_ES2_0
- /* Memory to memory mode bit is set on ES 2.0 */
- REG_FLD_MOD(dispc_reg_att[plane], 1, 19, 19);
-#endif
+ if (omap_rev() != OMAP4430_REV_ES1_0) {
+ /* Memory to memory mode bit is set on ES 2.0 */
+ REG_FLD_MOD(dispc_reg_att[plane], 1, 19, 19);
+ }
}
pix_inc = 0x1;