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

[<mar...@us...>]

Revision: 844
          http://svn.sourceforge.net/hackndev/?rev=844&view=rev
Author:   marex_z71
Date:     2007-02-18 04:12:13 -0800 (Sun, 18 Feb 2007)

Log Message:
-----------
PalmTX: Fix palmtx.c to compile again

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

Modified: linux4palm/linux/trunk/arch/arm/mach-pxa/palmtx/palmtx.c
===================================================================
--- linux4palm/linux/trunk/arch/arm/mach-pxa/palmtx/palmtx.c	2007-02-18 10:32:34 UTC (rev 843)
+++ linux4palm/linux/trunk/arch/arm/mach-pxa/palmtx/palmtx.c	2007-02-18 12:12:13 UTC (rev 844)
@@ -24,6 +24,7 @@
 #include <linux/fb.h>
 #include <linux/input.h>
 #include <linux/delay.h>
+#include <linux/irq.h>
 
 #include <asm/mach-types.h>
 #include <asm/mach/arch.h>
@@ -41,7 +42,6 @@
 #include <asm/arch/pxapwm-bl.h>
 
 #include "../generic.h"
-#include "../drivers/serial/pxa-serial.h"
 #include <../drivers/pcmcia/soc_common.h>
 
 #include "asm-arm/arch-pxa/palmtx-init.h"
@@ -53,7 +53,7 @@
  * SD/MMC card controller
  */
 
-static int palmtx_mci_init(struct device *dev, irqreturn_t (*palmtx_detect_int)(int, void *, struct pt_regs *), void *data)
+static int palmtx_mci_init(struct device *dev, irqreturn_t (*palmtx_detect_int)(int, void *), void *data)
 {
 	int err;
 	
@@ -308,8 +308,9 @@
  *
  */
 
-static struct pxafb_mach_info palmtx_fb __initdata = {
-	.pixclock		= 80000,	
+static struct pxafb_mode_info palmtx_lcd_modes[] = {
+    {
+	.pixclock		= 0,	
 	.xres			= 320,	// PPL + 1
 	.yres			= 480,	// LPP + 1
 	.bpp			= 16,	// BPP
@@ -322,8 +323,13 @@
 
 	.hsync_len              = 4,	// HSW + 1  (HSW=3)
 	.vsync_len              = 1,	// VSW + 1  (VSW=0)
-	.sync			= FB_SYNC_HOR_HIGH_ACT|FB_SYNC_VERT_HIGH_ACT,
+    //	.sync			= FB_SYNC_HOR_HIGH_ACT|FB_SYNC_VERT_HIGH_ACT,
+    },
+};
 
+static struct pxafb_mach_info palmtx_lcd_screen = {
+	.modes                  = palmtx_lcd_modes,
+	.num_modes              = ARRAY_SIZE(palmtx_lcd_modes),
 	.lccr0 = PALMTX_INIT_LCD_LLC0,
 	.lccr3 = PALMTX_INIT_LCD_LLC3,
 	
@@ -331,8 +337,6 @@
 	.pxafb_backlight_power	= NULL,
 };
 
-
-
 static struct map_desc palmtx_io_desc[] __initdata = {
 	// PCMCIA socket 0
 	{
@@ -365,7 +369,7 @@
 	pxa_gpio_mode(GPIO30_SDATA_OUT_AC97_MD);
 	pxa_gpio_mode(GPIO31_SYNC_AC97_MD);                                 
 	
-	set_pxa_fb_info   ( &palmtx_fb );
+	set_pxa_fb_info   ( &palmtx_lcd_screen );
 	pxa_set_mci_info  ( &palmtx_mci_platform_data );
 	pxa_set_udc_info  ( &palmtx_udc_mach_info );
 	pxa_set_ficp_info ( &palmtx_ficp_platform_data );	


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