From: Guennadi Liakhovetski <g.liakhovetski@gmx.de>
Date: Fri, 15 Oct 2010 07:53:56 +0000 (+0000)
Subject: ARM: mach-shmobile: remove videomodes from ap4evb platform data
X-Git-Url: http://drtracing.org/?a=commitdiff_plain;h=402f33154ee12de80fafa7f780d338d90cecbb5f;p=deliverable%2Flinux.git

ARM: mach-shmobile: remove videomodes from ap4evb platform data

Now that HDMI videomodes have become optional, they can be safely removed from
ap4evb platform data, since anyway 720p seems to be the best supported mode.

Signed-off-by: Guennadi Liakhovetski <g.liakhovetski@gmx.de>
Signed-off-by: Paul Mundt <lethal@linux-sh.org>
---

diff --git a/arch/arm/mach-shmobile/board-ap4evb.c b/arch/arm/mach-shmobile/board-ap4evb.c
index 1e7beee79086..d21637d0f6dd 100644
--- a/arch/arm/mach-shmobile/board-ap4evb.c
+++ b/arch/arm/mach-shmobile/board-ap4evb.c
@@ -577,60 +577,6 @@ static struct platform_device fsi_device = {
 	},
 };
 
-/*
- * If left and right margins are not multiples of 8,
- * LDHAJR will be adjusted accordingly by the LCDC
- * driver. Until we start using EDID, these values
- * might have to be adjusted for different monitors.
- */
-const static struct fb_videomode ap4evb_hdmi_modes[] = {
-	{
-		.name = "HDMI 720p",
-		.xres = 1280,
-		.yres = 720,
-
-		.left_margin = 200,
-		.right_margin = 88,
-		.hsync_len = 48,
-
-		.upper_margin = 20,
-		.lower_margin = 5,
-		.vsync_len = 5,
-
-		.pixclock = 13468,
-		.sync = FB_SYNC_VERT_HIGH_ACT | FB_SYNC_HOR_HIGH_ACT,
-	}, {
-		.name = "1280x1024",
-		.xres = 1280,
-		.yres = 1024,
-
-		.left_margin = 144,
-		.right_margin = 48,
-		.hsync_len = 64,
-
-		.upper_margin = 35,
-		.lower_margin = 5,
-		.vsync_len = 3,
-
-		.pixclock = 9800,
-		.sync = FB_SYNC_VERT_HIGH_ACT | FB_SYNC_HOR_HIGH_ACT,
-	}, {
-		.name = "HDMI 480p",
-		.xres = 720,
-		.yres = 480,
-
-		.left_margin = 36,
-		.right_margin = 18,
-		.hsync_len = 68,
-
-		.upper_margin = 36,
-		.lower_margin = 3,
-		.vsync_len = 6,
-		.pixclock = 37037,
-		.sync = FB_SYNC_VERT_HIGH_ACT | FB_SYNC_HOR_HIGH_ACT,
-	},
-};
-
 static struct sh_mobile_lcdc_info sh_mobile_lcdc1_info = {
 	.clock_source = LCDC_CLK_EXTERNAL,
 	.ch[0] = {
@@ -639,8 +585,6 @@ static struct sh_mobile_lcdc_info sh_mobile_lcdc1_info = {
 		.interface_type = RGB24,
 		.clock_divider = 1,
 		.flags = LCDC_FLAGS_DWPOL,
-		.lcd_cfg = ap4evb_hdmi_modes,
-		.num_cfg = ARRAY_SIZE(ap4evb_hdmi_modes),
 	}
 };