[Hackndev-commit] SF.net SVN: hackndev: [838] linux4palm/linux/trunk/arch/arm/mach-pxa/ palmt650/palmt650.c

[<bob...@us...>]

Revision: 838
          http://svn.sourceforge.net/hackndev/?rev=838&view=rev
Author:   bobofdoom
Date:     2007-02-17 17:53:52 -0800 (Sat, 17 Feb 2007)

Log Message:
-----------
palmt650: Updated interrupt and LCD code to compile on 2.6.20.

Modified Paths:
--------------
    linux4palm/linux/trunk/arch/arm/mach-pxa/palmt650/palmt650.c

Modified: linux4palm/linux/trunk/arch/arm/mach-pxa/palmt650/palmt650.c
===================================================================
--- linux4palm/linux/trunk/arch/arm/mach-pxa/palmt650/palmt650.c	2007-02-18 01:37:30 UTC (rev 837)
+++ linux4palm/linux/trunk/arch/arm/mach-pxa/palmt650/palmt650.c	2007-02-18 01:53:52 UTC (rev 838)
@@ -13,7 +13,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>
@@ -43,7 +43,7 @@
  *********************************************************/
 
 static int palmt650_mci_init(struct device *dev,
-		irqreturn_t (*palmt650_detect_int)(int, void *, struct pt_regs *), void *data)
+		irqreturn_t (*palmt650_detect_int)(int, void *), void *data)
 {
 	int err;
 	/* setup an interrupt for detecting card insert/remove events */
@@ -290,9 +290,6 @@
  * LCD
  *********************************************************/
 
-/* when we upgrade to 2.6.19+ remote OLDLCD */
-#define OLDLCD
-#ifndef OLDLCD
 static struct pxafb_mode_info palmt650_lcd_mode __initdata = {
 	/* pixclock is set by lccr3 below */
 	.pixclock		= 50000,	
@@ -311,7 +308,6 @@
 	.lower_margin		= 5,
 	.sync			= FB_SYNC_HOR_HIGH_ACT|FB_SYNC_VERT_HIGH_ACT,
 };
-#endif
 
 static struct pxafb_mach_info palmt650_lcd __initdata = {
 	.lccr0			= 0x4000080,
@@ -319,27 +315,8 @@
 	//.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,
-
-	/* fixme: these are the margins PalmOS has set,
-	  * 	   they seem to work but could be better.
-	  */
-	.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			= &palmt650_lcd_mode,
-#endif
 };
 
 static struct map_desc palmt650_io_desc[] __initdata = {


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.