diff options
| author | Jayarami Reddy <jayarami.reddy@stericsson.com> | 2011-06-07 18:37:15 +0530 |
|---|---|---|
| committer | said m bagheri <ebgheri@steludxu2848.(none)> | 2011-06-17 13:42:15 +0200 |
| commit | c8521b3ceae30f8edd33ff3427a464c025101c7e (patch) | |
| tree | 3048ed2a74b7eabeb651af7b648f251831b26ea0 /arch | |
| parent | 9166e90bf8fe37d4bc750aed1368fc677560a6a9 (diff) | |
video: av8100: Correct hdmi display id
This patch will add enum for display id's.
ST-Ericsson ID: 343774
ST-Ericsson Linux next: NA
ST-Ericsson FOSS-OUT ID: Trivial
Change-Id: Idbf726c9b04b4db682f6a2db959bf74dd893d286
Signed-off-by: Jayarami Reddy <jayarami.reddy@stericsson.com>
Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/24547
Reviewed-by: QATOOLS
Reviewed-by: Per PERSSON <per.xb.persson@stericsson.com>
Reviewed-by: QATEST
Reviewed-by: Hemanth P SETHURAM <hemanth.sethuram@stericsson.com>
Reviewed-by: Marcel TUNNISSEN <marcel.tuennissen@stericsson.com>
Reviewed-by: Jonas ABERG <jonas.aberg@stericsson.com>
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/arm/mach-ux500/board-u5500-mcde.c | 21 |
1 files changed, 15 insertions, 6 deletions
diff --git a/arch/arm/mach-ux500/board-u5500-mcde.c b/arch/arm/mach-ux500/board-u5500-mcde.c index 34c29398c72..535f3d41bba 100644 --- a/arch/arm/mach-ux500/board-u5500-mcde.c +++ b/arch/arm/mach-ux500/board-u5500-mcde.c @@ -21,8 +21,16 @@ #define DSI_UNIT_INTERVAL_0 0xA #define DSI_UNIT_INTERVAL_2 0x5 -#define PRIMARY_DISPLAY_ID 0 -#define AV8100_DISPLAY_ID 2 +enum { +#ifdef CONFIG_DISPLAY_GENERIC_DSI_PRIMARY + PRIMARY_DISPLAY_ID, +#endif +#ifdef CONFIG_DISPLAY_AV8100_TERTIARY + AV8100_DISPLAY_ID, +#endif + MCDE_NR_OF_DISPLAYS +}; + #ifdef CONFIG_FB_MCDE @@ -33,7 +41,6 @@ static struct delayed_work work_dispreg_hdmi; #define DISPREG_HDMI_DELAY 6000 #endif -#define MCDE_NR_OF_DISPLAYS 2 static int display_initialized_during_boot; static int __init startup_graphics_setup(char *str) @@ -250,12 +257,14 @@ static int display_postregistered_callback(struct notifier_block *nb, if (ddev->id == AV8100_DISPLAY_ID) virtual_height = height * 3; #endif - - if (ddev->id == AV8100_DISPLAY_ID) { +#ifdef CONFIG_DISPLAY_AV8100_TERTIARY + if (ddev->id == AV8100_DISPLAY_ID) #ifdef CONFIG_MCDE_DISPLAY_HDMI_FB_AUTO_CREATE hdmi_fb_onoff(ddev, 1, 0, 0); #endif /* CONFIG_MCDE_DISPLAY_HDMI_FB_AUTO_CREATE */ - } else { + else +#endif /* CONFIG_DISPLAY_AV8100_TERTIARY */ + { /* Create frame buffer */ fbi = mcde_fb_create(ddev, width, height, |