From f907dd40646ccca916b05fbc2ccd2eafa1d5e591 Mon Sep 17 00:00:00 2001 From: Torbjorn Svensson Date: Thu, 12 Jan 2012 12:30:00 +0100 Subject: video: mcde: add rotbufsize This adds rotbufsize and moves the declaration of the rotbufs from the board-mop500-mcde.c file to the devices-db8500.c file. ST-Ericsson ID: 373680 ST-Ericsson FOSS-OUT ID: Trivial ST-Ericsson Linux next: NA Change-Id: I72274c6cb51abf88acc4e2f2f845a816a3bcd5be Signed-off-by: Torbjorn Svensson Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/45515 Reviewed-by: QATOOLS Reviewed-by: QABUILD Reviewed-by: Per PERSSON Reviewed-by: Jimmy RUBIN --- arch/arm/mach-ux500/board-mop500-mcde.c | 5 ----- arch/arm/mach-ux500/board-u5500-mcde.c | 2 -- include/video/mcde.h | 5 +++++ 3 files changed, 5 insertions(+), 7 deletions(-) diff --git a/arch/arm/mach-ux500/board-mop500-mcde.c b/arch/arm/mach-ux500/board-mop500-mcde.c index 7d2f160f6c0..b90bf78c60d 100644 --- a/arch/arm/mach-ux500/board-mop500-mcde.c +++ b/arch/arm/mach-ux500/board-mop500-mcde.c @@ -104,9 +104,6 @@ static struct mcde_display_device samsung_s6d16d0_display0 = { #else .synchronized_update = false, #endif - /* TODO: Remove rotation buffers once ESRAM driver is completed */ - .rotbuf1 = U8500_ESRAM_BASE + 0x20000 * 4 + 0x2000, - .rotbuf2 = U8500_ESRAM_BASE + 0x20000 * 4 + 0x10000, .dev = { .platform_data = &samsung_s6d16d0_pdata0, }, @@ -134,8 +131,6 @@ static struct mcde_display_device sony_acx424akp_display0 = { #else .synchronized_update = false, #endif - .rotbuf1 = U8500_ESRAM_BASE + 0x20000 * 4 + 0x2000, - .rotbuf2 = U8500_ESRAM_BASE + 0x20000 * 4 + 0x10000, .dev = { .platform_data = &sony_acx424akp_display0_pdata, }, diff --git a/arch/arm/mach-ux500/board-u5500-mcde.c b/arch/arm/mach-ux500/board-u5500-mcde.c index 5c4ba76055d..b002b6f6688 100644 --- a/arch/arm/mach-ux500/board-u5500-mcde.c +++ b/arch/arm/mach-ux500/board-u5500-mcde.c @@ -87,8 +87,6 @@ static struct mcde_display_device sony_acx424akp_display0 = { #else .synchronized_update = false, #endif - .rotbuf1 = U5500_ESRAM_BASE + 0x20000 * 2, - .rotbuf2 = U5500_ESRAM_BASE + 0x20000 * 2 + 0x10000, .dev = { .platform_data = &sony_acx424akp_display0_pdata, }, diff --git a/include/video/mcde.h b/include/video/mcde.h index 015350f4495..f55ad8dd69e 100644 --- a/include/video/mcde.h +++ b/include/video/mcde.h @@ -372,6 +372,11 @@ struct mcde_platform_data { u8 outmux[5]; /* MCDE_CONF0.OUTMUXx */ u8 syncmux; /* MCDE_CONF0.SYNCMUXx */ + /* TODO: Remove once ESRAM allocator is done */ + u32 rotbuf1; + u32 rotbuf2; + u32 rotbufsize; + const char *regulator_vana_id; const char *regulator_mcde_epod_id; const char *regulator_esram_epod_id; -- cgit v1.2.3