Menu
▾
▴
[Hackndev-commit] SF.net SVN: hackndev: [875] linux4palm/linux/trunk
|
From: <sle...@us...> - 2007-02-27 00:48:46
|
Revision: 875
http://svn.sourceforge.net/hackndev/?rev=875&view=rev
Author: sleep_walker
Date: 2007-02-26 16:48:43 -0800 (Mon, 26 Feb 2007)
Log Message:
-----------
l4p: some (not only) temporary 2.6.20 fixes for T|T3
Modified Paths:
--------------
linux4palm/linux/trunk/Documentation/filesystems/00-INDEX
linux4palm/linux/trunk/MAINTAINERS
linux4palm/linux/trunk/arch/arm/mach-pxa/palmt3/palmt3.c
linux4palm/linux/trunk/arch/arm/mach-pxa/palmt3/palmt3_buttons.c
linux4palm/linux/trunk/drivers/i2c/chips/tps65010.c
linux4palm/linux/trunk/drivers/input/touchscreen/Kconfig
Modified: linux4palm/linux/trunk/Documentation/filesystems/00-INDEX
===================================================================
--- linux4palm/linux/trunk/Documentation/filesystems/00-INDEX 2007-02-26 00:50:14 UTC (rev 874)
+++ linux4palm/linux/trunk/Documentation/filesystems/00-INDEX 2007-02-27 00:48:43 UTC (rev 875)
@@ -82,6 +82,8 @@
- info and mount options for the UDF filesystem.
ufs.txt
- info on the ufs filesystem.
+unionfs/
+ - info on the unionfs filesystem
v9fs.txt
- v9fs is a Unix implementation of the Plan 9 9p remote fs protocol.
vfat.txt
Modified: linux4palm/linux/trunk/MAINTAINERS
===================================================================
--- linux4palm/linux/trunk/MAINTAINERS 2007-02-26 00:50:14 UTC (rev 874)
+++ linux4palm/linux/trunk/MAINTAINERS 2007-02-27 00:48:43 UTC (rev 875)
@@ -3293,6 +3293,13 @@
W: http://www.kernel.dk
S: Maintained
+UNIONFS
+P: Josef "Jeff" Sipek
+M: js...@cs...
+L: un...@fi...
+W: http://unionfs.filesystems.org/
+S: Maintained
+
USB ACM DRIVER
P: Oliver Neukum
M: ol...@ne...
Modified: linux4palm/linux/trunk/arch/arm/mach-pxa/palmt3/palmt3.c
===================================================================
--- linux4palm/linux/trunk/arch/arm/mach-pxa/palmt3/palmt3.c 2007-02-26 00:50:14 UTC (rev 874)
+++ linux4palm/linux/trunk/arch/arm/mach-pxa/palmt3/palmt3.c 2007-02-27 00:48:43 UTC (rev 875)
@@ -10,6 +10,7 @@
#include <linux/kernel.h>
#include <linux/init.h>
+#include <linux/input.h>
#include <asm/mach/arch.h>
#include <asm/mach-types.h>
#include <asm/arch/hardware.h>
@@ -19,13 +20,17 @@
#include <linux/device.h>
#include <linux/fb.h>
+#include <asm/arch/hardware.h>
#include <asm/arch/pxa-dmabounce.h>
#include <asm/arch/pxafb.h>
#include <asm/arch/pxa-regs.h>
-#include <linux/device.h>
#include <linux/platform_device.h>
+#include <asm/irq.h> //test
#include <asm/arch/ssp.h>
+#include <asm/arch/irq.h> //test
+#include <asm/arch/hardware.h> //test
+
#include <linux/input.h>
#include <linux/soc/tsc2101.h>
#include <asm/arch/pxa-pm_ll.h>
@@ -34,8 +39,8 @@
#include "../generic.h"
// FIXME move this to include/asm/arch/plamt3.h some time
-#define PALMT3_GPIO_TSC2101_SS (24)
-#define PALMT3_GPIO_PENDOWN (37)
+#define PALMT3_GPIO_TSC2101_SS (24)
+#define PALMT3_GPIO_PENDOWN (37)
#define PALMT3_IRQ_GPIO_PENDOWN IRQ_GPIO(PALMT3_GPIO_PENDOWN)
#define DEBUG 1
@@ -60,7 +65,7 @@
CKEN = CKEN & (~CKEN1_PWM1);
}
-static void palmt3_pxafb_lcd_power(int level)
+static void palmt3_pxafb_lcd_power(int level, struct fb_var_screeninfo *var)
{
if(level) {
GPSR1 = GPIO_bit(38);
@@ -72,7 +77,13 @@
}
}
-static struct pxafb_mach_info palmt3lcd = {
+
+
+
+/*** framebuffer ***/
+
+static struct pxafb_mode_info palmt3_lcd_modes[] = {
+ {
.pixclock = 0,
.xres = 320,
.yres = 480,
@@ -84,12 +95,19 @@
.upper_margin = 8,
.lower_margin = 7,
.sync = FB_SYNC_HOR_HIGH_ACT|FB_SYNC_VERT_HIGH_ACT,
+ }
+};
+static struct pxafb_mach_info palmt3_lcd_screen[] = {
+ {
+ .modes = palmt3_lcd_modes,
+ .num_modes = ARRAY_SIZE(palmt3_lcd_modes),
.lccr0 = 0x003008F9,
.lccr3 = 0x03700002,
- .pxafb_backlight_power = palmt3_pxafb_backlight_power,
- .pxafb_lcd_power = palmt3_pxafb_lcd_power,
+ .pxafb_backlight_power = &palmt3_pxafb_backlight_power,
+ .pxafb_lcd_power = &palmt3_pxafb_lcd_power,
+ }
};
/*** SSP ***/
@@ -131,24 +149,25 @@
void palmt3_tsc2101_send(int read, int command, int *values, int numval)
{
+ u32 ret;
+
int i;
GPCR0 = GPIO_bit(PALMT3_GPIO_TSC2101_SS);
ssp_write_word(&palmt3_ssp_dev, command | read);
/* dummy read */
- ssp_read_word(&palmt3_ssp_dev);
+ ssp_read_word(&palmt3_ssp_dev, &ret);
for (i=0; i < numval; i++) {
if (read) {
ssp_write_word(&palmt3_ssp_dev, 0);
- values[i]=ssp_read_word(&palmt3_ssp_dev);
+ values[i]=ssp_read_word(&palmt3_ssp_dev, &ret);
} else {
ssp_write_word(&palmt3_ssp_dev, values[i]);
- ssp_read_word(&palmt3_ssp_dev);
+ ssp_read_word(&palmt3_ssp_dev, &ret);
}
}
-
GPSR0 = GPIO_bit(PALMT3_GPIO_TSC2101_SS);
}
@@ -207,15 +226,15 @@
{
unsigned long * addr;
- addr = 0xC0000000;
+ addr = (unsigned long *) 0xC0000000;
_PM_backup[0] = *addr;
*addr = 0xFEEDC0DE;
- addr = 0xC0000004;
+ addr = (unsigned long *) 0xC0000004;
_PM_backup[1] = *addr;
*addr = 0xBEEFF00D;
- addr = 0xC0000008;
+ addr = (unsigned long *) 0xC0000008;
_PM_backup[2] = *addr;
*addr = ret;
@@ -228,13 +247,13 @@
{
unsigned long * addr;
- addr = 0xC0000000;
+ addr = (unsigned long *) 0xC0000000;
*addr = _PM_backup[0];
- addr = 0xC0000004;
+ addr = (unsigned long *) 0xC0000004;
*addr = _PM_backup[1];
- addr = 0xC0000008;
+ addr = (unsigned long *) 0xC0000008;
*addr = _PM_backup[2];
}
@@ -255,7 +274,7 @@
static void __init palmt3_init(void)
{
- set_pxa_fb_info(&palmt3lcd);
+ set_pxa_fb_info(palmt3_lcd_screen);
#ifdef CONFIG_PM
pxa_pm_set_ll_ops(&palmt3_pm_ops);
#endif
Modified: linux4palm/linux/trunk/arch/arm/mach-pxa/palmt3/palmt3_buttons.c
===================================================================
--- linux4palm/linux/trunk/arch/arm/mach-pxa/palmt3/palmt3_buttons.c 2007-02-26 00:50:14 UTC (rev 874)
+++ linux4palm/linux/trunk/arch/arm/mach-pxa/palmt3/palmt3_buttons.c 2007-02-27 00:48:43 UTC (rev 875)
@@ -12,6 +12,7 @@
#include <linux/platform_device.h>
#include <linux/workqueue.h>
#include <linux/delay.h>
+#include <linux/irq.h>
#include <asm/mach/arch.h>
#include <asm/mach-types.h>
@@ -251,7 +252,7 @@
key_status = 0;
palmt3_workqueue = create_workqueue("palmt3btnw");
- INIT_WORK(&palmt3_irq_task, palmt3_irq_queuework, NULL);
+ INIT_WORK(&palmt3_irq_task, palmt3_irq_queuework);
/* Configure GPIOs as Output and low */
spin_lock_irqsave(&btn_lock, flags);
Modified: linux4palm/linux/trunk/drivers/i2c/chips/tps65010.c
===================================================================
--- linux4palm/linux/trunk/drivers/i2c/chips/tps65010.c 2007-02-26 00:50:14 UTC (rev 874)
+++ linux4palm/linux/trunk/drivers/i2c/chips/tps65010.c 2007-02-27 00:48:43 UTC (rev 875)
@@ -32,6 +32,7 @@
#include <linux/debugfs.h>
#include <linux/seq_file.h>
#include <linux/mutex.h>
+#include <linux/irq.h>
#include <asm/irq.h>
#include <asm/mach-types.h>
@@ -551,7 +552,7 @@
tps->model = TPS65010;
tps->irq = IRQ_GPIO(T3_TPS65010_GPIO);
// is it ok to do this here?
- set_irq_type (IRQ_GPIO(T3_TPS65010_GPIO), IRQT_FALLING);
+// set_irq_type (IRQ_GPIO(T3_TPS65010_GPIO), IRQT_FALLING);
#else
if (machine_is_omap_h2()) {
tps->model = TPS65010;
Modified: linux4palm/linux/trunk/drivers/input/touchscreen/Kconfig
===================================================================
--- linux4palm/linux/trunk/drivers/input/touchscreen/Kconfig 2007-02-26 00:50:14 UTC (rev 874)
+++ linux4palm/linux/trunk/drivers/input/touchscreen/Kconfig 2007-02-27 00:48:43 UTC (rev 875)
@@ -51,12 +51,12 @@
config TOUCHSCREEN_TSC2101
tristate "TI TSC2101 touchscreen input driver"
- depends on MACH_HX2750 && INPUT && INPUT_TOUCHSCREEN
+ depends on (MACH_HX2750 || MACH_T3XSCALE) && INPUT && INPUT_TOUCHSCREEN
select SOC_TSC2101
default y
help
Say Y here to enable the driver for the touchscreen on the
- iPAQ hx2750 series of PDAs.
+ iPAQ hx2750 series of PDAs or Palm Tungsten T3.
If unsure, say N.
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
