diff options
| author | Marcel Tunnissen <Marcel.Tuennissen@stericsson.com> | 2011-04-21 13:51:39 +0200 |
|---|---|---|
| committer | Ulf Hansson <ulf.hansson@stericsson.com> | 2011-09-19 15:15:30 +0200 |
| commit | 155af66b8ea338782dae00ac5fa220f70901c118 (patch) | |
| tree | 545f393478e60f0f4b9fec30069431460812b1de /arch/arm/mach-ux500/board-mop500-stuib.c | |
| parent | 2de30da7fdbcdf75ddf3f6d0130fee008905902a (diff) | |
video: mcde: improve display configuration
Makes it possible to configure both AB8500 and AV8100 displays as long
as the MCDE channels are available. Also fixes build problems if main
display is not configured or if no display is configured, and fixes
configuration problems with TV out through AB8500.
Depends-On: Id9dac8b436a6013e5bf3a775ef93d99705663fb2
ST-Ericsson ID: 269500
ST-Ericsson Linux next: Not tested, ER 282779
ST-Ericsson FOSS-OUT ID: Trivial
Change-Id: I57ad75c81ade899c3063033dfe0c81c644fc41c6
Signed-off-by: Marcel Tunnissen <Marcel.Tuennissen@stericsson.com>
Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/21817
Tested-by: Marcel TUNNISSEN <marcel.tuennissen@stericsson.com>
Reviewed-by: Jimmy RUBIN <jimmy.rubin@stericsson.com>
Reviewed-by: QATOOLS
Reviewed-by: Marcel TUNNISSEN <marcel.tuennissen@stericsson.com>
Reviewed-by: Per PERSSON <per.xb.persson@stericsson.com>
Reviewed-by: Jonas ABERG <jonas.aberg@stericsson.com>
fixmr to merge with video: mcde: improve display configuration 8d74729c8d5f7308ae7ca81f56ddd8811c3435ee
Diffstat (limited to 'arch/arm/mach-ux500/board-mop500-stuib.c')
| -rw-r--r-- | arch/arm/mach-ux500/board-mop500-stuib.c | 20 |
1 files changed, 16 insertions, 4 deletions
diff --git a/arch/arm/mach-ux500/board-mop500-stuib.c b/arch/arm/mach-ux500/board-mop500-stuib.c index c3e42c61cac..fc0fad94052 100644 --- a/arch/arm/mach-ux500/board-mop500-stuib.c +++ b/arch/arm/mach-ux500/board-mop500-stuib.c @@ -247,8 +247,14 @@ static struct bu21013_platform_device tsc_plat_device = { .touch_x_max = TOUCH_XMAX, .touch_y_max = TOUCH_YMAX, .has_ext_clk = false, - .x_flip = false, - .y_flip = true, +#if defined(CONFIG_DISPLAY_GENERIC_DSI_PRIMARY_ROTATION_ANGLE) && \ + CONFIG_DISPLAY_GENERIC_DSI_PRIMARY_ROTATION_ANGLE == 270 + .x_flip = true, + .y_flip = false, +#else + .x_flip = false, + .y_flip = true, +#endif }; static struct bu21013_platform_device tsc_plat2_device = { @@ -259,8 +265,14 @@ static struct bu21013_platform_device tsc_plat2_device = { .touch_x_max = TOUCH_XMAX, .touch_y_max = TOUCH_YMAX, .has_ext_clk = false, - .x_flip = false, - .y_flip = true, +#if defined(CONFIG_DISPLAY_GENERIC_DSI_PRIMARY_ROTATION_ANGLE) && \ + CONFIG_DISPLAY_GENERIC_DSI_PRIMARY_ROTATION_ANGLE == 270 + .x_flip = true, + .y_flip = false, +#else + .x_flip = false, + .y_flip = true, +#endif }; static struct i2c_board_info __initdata u8500_i2c3_devices_stuib[] = { |