diff options
| author | Teresa Gámez <t.gamez@phytec.de> | 2012-01-19 09:23:13 +0100 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2012-01-23 09:38:27 +0100 |
| commit | 688ed388ef36a357521564572c873dc4c336897a (patch) | |
| tree | 0bdb0ec3cf69b71a44ac7387099d5d820c25a79d /arch/arm/boards/pcm043/pcm043.c | |
| parent | 7d61b585968129b2c7cd632777812890e4caee1b (diff) | |
| download | barebox-688ed388ef36a357521564572c873dc4c336897a.tar.gz barebox-688ed388ef36a357521564572c873dc4c336897a.tar.xz | |
video imx-ipu-fb: add num_modes to imx3 boards
Added num_modes to all imx_ipu_fb_platform_data structs.
Removed defines for pcm043 to choose display.
We may switch this during runtime now.
Signed-off-by: Teresa Gámez <t.gamez@phytec.de>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Diffstat (limited to 'arch/arm/boards/pcm043/pcm043.c')
| -rw-r--r-- | arch/arm/boards/pcm043/pcm043.c | 74 |
1 files changed, 37 insertions, 37 deletions
diff --git a/arch/arm/boards/pcm043/pcm043.c b/arch/arm/boards/pcm043/pcm043.c index 23580c9f6f..cd1721c541 100644 --- a/arch/arm/boards/pcm043/pcm043.c +++ b/arch/arm/boards/pcm043/pcm043.c @@ -56,46 +56,46 @@ struct imx_nand_platform_data nand_info = { .flash_bbt = 1, }; -#ifdef CONFIG_PCM043_DISPLAY_SHARP -static struct fb_videomode pcm043_fb_mode = { - /* 240x320 @ 60 Hz */ - .name = "Sharp-LQ035Q7", - .refresh = 60, - .xres = 240, - .yres = 320, - .pixclock = 185925, - .left_margin = 9, - .right_margin = 16, - .upper_margin = 7, - .lower_margin = 9, - .hsync_len = 1, - .vsync_len = 1, - .sync = FB_SYNC_HOR_HIGH_ACT | FB_SYNC_SHARP_MODE | FB_SYNC_CLK_INVERT | FB_SYNC_CLK_IDLE_EN, - .vmode = FB_VMODE_NONINTERLACED, - .flag = 0, -}; -#else -static struct fb_videomode pcm043_fb_mode = { - /* 240x320 @ 60 Hz */ - .name = "TX090", - .refresh = 60, - .xres = 240, - .yres = 320, - .pixclock = 38255, - .left_margin = 144, - .right_margin = 0, - .upper_margin = 7, - .lower_margin = 40, - .hsync_len = 96, - .vsync_len = 1, - .sync = FB_SYNC_VERT_HIGH_ACT | FB_SYNC_OE_ACT_HIGH, - .vmode = FB_VMODE_NONINTERLACED, - .flag = 0, +static struct fb_videomode pcm043_fb_mode[] = { + { + /* 240x320 @ 60 Hz */ + .name = "TX090", + .refresh = 60, + .xres = 240, + .yres = 320, + .pixclock = 38255, + .left_margin = 144, + .right_margin = 0, + .upper_margin = 7, + .lower_margin = 40, + .hsync_len = 96, + .vsync_len = 1, + .sync = FB_SYNC_VERT_HIGH_ACT | FB_SYNC_OE_ACT_HIGH, + .vmode = FB_VMODE_NONINTERLACED, + .flag = 0, + }, { + /* 240x320 @ 60 Hz */ + .name = "Sharp-LQ035Q7", + .refresh = 60, + .xres = 240, + .yres = 320, + .pixclock = 185925, + .left_margin = 9, + .right_margin = 16, + .upper_margin = 7, + .lower_margin = 9, + .hsync_len = 1, + .vsync_len = 1, + .sync = FB_SYNC_HOR_HIGH_ACT | FB_SYNC_SHARP_MODE | \ + FB_SYNC_CLK_INVERT | FB_SYNC_CLK_IDLE_EN, + .vmode = FB_VMODE_NONINTERLACED, + .flag = 0, + } }; -#endif static struct imx_ipu_fb_platform_data ipu_fb_data = { - .mode = &pcm043_fb_mode, + .mode = pcm043_fb_mode, + .num_modes = ARRAY_SIZE(pcm043_fb_mode), .bpp = 16, }; |