From 690e600ab26103abc85b85b65abb7e976bd1e12d Mon Sep 17 00:00:00 2001
From: Bellido Nicolas <ml@acolin.be>
Date: Fri, 28 Oct 2005 16:51:44 +0100
Subject: [PATCH] --- yaml --- r: 10463 b: refs/heads/master c:
 50f4c001bc1534db77663592496204ceba151e97 h: refs/heads/master i:   10461:
 2ecb31360e5deb61c277213b68f105c67f50d3e4   10459:
 f1bacdb8db3ce94b3b23abb7d0999e544d4df15a   10455:
 14e3d86940e1ca1b8606ca4eafb17822fe071684   10447:
 0610a1b02480043daac62a8b9ee78fe452edcd33   10431:
 86f3180bd20c2bf4c25e76308da30018f17d5782 v: v3

---
 [refs]                                  |  2 +-
 trunk/arch/arm/mach-aaec2000/aaed2000.c | 43 +++++++++++++++++++++++++
 2 files changed, 44 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index da0018b285fe..f94df51f018a 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 049eb3298a832a63c55bc8d8ea4cc881ab99f84b
+refs/heads/master: 50f4c001bc1534db77663592496204ceba151e97
diff --git a/trunk/arch/arm/mach-aaec2000/aaed2000.c b/trunk/arch/arm/mach-aaec2000/aaed2000.c
index 7b0a1c7d64a9..f5ef69702296 100644
--- a/trunk/arch/arm/mach-aaec2000/aaed2000.c
+++ b/trunk/arch/arm/mach-aaec2000/aaed2000.c
@@ -31,11 +31,53 @@
 
 #include "core.h"
 
+static void aaed2000_clcd_disable(struct clcd_fb *fb)
+{
+	AAED_EXT_GPIO &= ~AAED_EGPIO_LCD_PWR_EN;
+}
+
+static void aaed2000_clcd_enable(struct clcd_fb *fb)
+{
+	AAED_EXT_GPIO |= AAED_EGPIO_LCD_PWR_EN;
+}
+
+struct aaec2000_clcd_info clcd_info = {
+	.enable = aaed2000_clcd_enable,
+	.disable = aaed2000_clcd_disable,
+	.panel = {
+		.mode	= {
+			.name		= "Sharp",
+			.refresh	= 60,
+			.xres		= 640,
+			.yres		= 480,
+			.pixclock	= 39721,
+			.left_margin	= 20,
+			.right_margin	= 44,
+			.upper_margin	= 21,
+			.lower_margin	= 34,
+			.hsync_len	= 96,
+			.vsync_len	= 2,
+			.sync		= 0,
+			.vmode	= FB_VMODE_NONINTERLACED,
+		},
+		.width	= -1,
+		.height	= -1,
+		.tim2	= TIM2_IVS | TIM2_IHS,
+		.cntl	= CNTL_LCDTFT,
+		.bpp	= 16,
+	},
+};
+
 static void __init aaed2000_init_irq(void)
 {
 	aaec2000_init_irq();
 }
 
+static void __init aaed2000_init(void)
+{
+	aaec2000_set_clcd_plat_data(&clcd_info);
+}
+
 static struct map_desc aaed2000_io_desc[] __initdata = {
   { EXT_GPIO_VBASE, EXT_GPIO_PBASE, EXT_GPIO_LENGTH, MT_DEVICE }, /* Ext GPIO */
 };
@@ -54,4 +96,5 @@ MACHINE_START(AAED2000, "Agilent AAED-2000 Development Platform")
 	.map_io		= aaed2000_map_io,
 	.init_irq	= aaed2000_init_irq,
 	.timer		= &aaec2000_timer,
+	.init_machine	= aaed2000_init,
 MACHINE_END