From: Guennadi Liakhovetski <g.liakhovetski@gmx.de>
Date: Fri, 3 Sep 2010 07:20:42 +0000 (+0000)
Subject: ARM: mach-shmobile: add two more video modes for HDMI
X-Git-Url: http://drtracing.org/?a=commitdiff_plain;h=a91a2d06c9797c0a533a71dbeea37b2d5a60c7f5;p=deliverable%2Flinux.git

ARM: mach-shmobile: add two more video modes for HDMI

Add video modes for 480p and SXGA (1280x1024).

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 4e883e0fb01b..005337904ad5 100644
--- a/arch/arm/mach-shmobile/board-ap4evb.c
+++ b/arch/arm/mach-shmobile/board-ap4evb.c
@@ -599,18 +599,18 @@ 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,
 
-		/*
-		 * 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.
-		 */
 		.left_margin = 200,
 		.right_margin = 88,
 		.hsync_len = 48,
@@ -621,6 +621,35 @@ const static struct fb_videomode ap4evb_hdmi_modes[] = {
 
 		.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,
 	},
 };