|
From: <bob...@us...> - 2007-08-03 07:46:46
|
Revision: 1222
http://hackndev.svn.sourceforge.net/hackndev/?rev=1222&view=rev
Author: bobofdoom
Date: 2007-08-03 00:46:27 -0700 (Fri, 03 Aug 2007)
Log Message:
-----------
PalmT680: Updated so that it compiles.
* Removed erroneous __initdata tags on LCD structs.
* Removed version #ifdef to update LCD for new version.
* Included irq.h.
Modified Paths:
--------------
linux4palm/linux/trunk/arch/arm/mach-pxa/palmt680/palmt680.c
Modified: linux4palm/linux/trunk/arch/arm/mach-pxa/palmt680/palmt680.c
===================================================================
--- linux4palm/linux/trunk/arch/arm/mach-pxa/palmt680/palmt680.c 2007-08-03 07:35:28 UTC (rev 1221)
+++ linux4palm/linux/trunk/arch/arm/mach-pxa/palmt680/palmt680.c 2007-08-03 07:46:27 UTC (rev 1222)
@@ -17,7 +17,7 @@
#include <linux/platform_device.h>
#include <linux/fb.h>
#include <linux/input.h>
-//#include <linux/irq.h>
+#include <linux/irq.h>
#include <asm/mach-types.h>
#include <asm/mach/arch.h>
@@ -295,10 +295,7 @@
* LCD
*********************************************************/
-/* when we upgrade to 2.6.19+ remote OLDLCD */
-#define OLDLCD
-#ifndef OLDLCD
-static struct pxafb_mode_info palmt680_lcd_mode __initdata = {
+static struct pxafb_mode_info palmt680_lcd_mode = {
/* pixclock is set by lccr3 below */
.pixclock = 50000,
.xres = 320,
@@ -313,32 +310,12 @@
.lower_margin = 5,
.sync = FB_SYNC_HOR_HIGH_ACT|FB_SYNC_VERT_HIGH_ACT,
};
-#endif
-static struct pxafb_mach_info palmt680_lcd __initdata = {
+static struct pxafb_mach_info palmt680_lcd = {
.lccr0 = 0x4000080,
.lccr3 = 0x4700003,
- //.pxafb_backlight_power = palm_backlight_power,
- //
- //
-#ifdef OLDLCD
- /* pixclock is set by lccr3 below */
- .pixclock = 50000,
- .xres = 320,
- .yres = 320,
- .bpp = 16,
- .hsync_len = 4,
- .vsync_len = 1,
-
- .left_margin = 20,
- .right_margin = 8,
- .upper_margin = 8,
- .lower_margin = 5,
- .sync = FB_SYNC_HOR_HIGH_ACT|FB_SYNC_VERT_HIGH_ACT,
-#else
.num_modes = 1,
.modes = &palmt680_lcd_mode,
-#endif
};
static struct map_desc palmt680_io_desc[] __initdata = {
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|