Menu
▾
▴
[Hackndev-commit] SF.net SVN: hackndev: [944] linux4palm/linux/trunk/arch/arm/mach-pxa/palmtx
|
From: <z7...@us...> - 2007-03-29 07:33:04
|
Revision: 944
http://svn.sourceforge.net/hackndev/?rev=944&view=rev
Author: z72ka
Date: 2007-03-29 00:33:00 -0700 (Thu, 29 Mar 2007)
Log Message:
-----------
palmtx: safety acquisition for suspend (disabling reset during sleep), removing non-existent pcmcia driver from config, clear code
Modified Paths:
--------------
linux4palm/linux/trunk/arch/arm/mach-pxa/palmtx/Kconfig
linux4palm/linux/trunk/arch/arm/mach-pxa/palmtx/Makefile
linux4palm/linux/trunk/arch/arm/mach-pxa/palmtx/palmtx.c
linux4palm/linux/trunk/arch/arm/mach-pxa/palmtx/palmtx_pm.c
Modified: linux4palm/linux/trunk/arch/arm/mach-pxa/palmtx/Kconfig
===================================================================
--- linux4palm/linux/trunk/arch/arm/mach-pxa/palmtx/Kconfig 2007-03-28 18:32:04 UTC (rev 943)
+++ linux4palm/linux/trunk/arch/arm/mach-pxa/palmtx/Kconfig 2007-03-29 07:33:00 UTC (rev 944)
@@ -4,13 +4,6 @@
help
This enables support for Palm TX handheld.
-config PALMTX_PCMCIA
- tristate "Palm TX PCMCIA driver"
- depends on MACH_XSCALE_PALMTX
- default y if MACH_XSCALE_PALMTX
- help
- PCMCIA driver for Palm TX
-
config PALMTX_DEBUG
bool "Debug output for Palm TX"
depends on MACH_XSCALE_PALMTX
Modified: linux4palm/linux/trunk/arch/arm/mach-pxa/palmtx/Makefile
===================================================================
--- linux4palm/linux/trunk/arch/arm/mach-pxa/palmtx/Makefile 2007-03-28 18:32:04 UTC (rev 943)
+++ linux4palm/linux/trunk/arch/arm/mach-pxa/palmtx/Makefile 2007-03-29 07:33:00 UTC (rev 944)
@@ -5,4 +5,4 @@
obj-$(CONFIG_MACH_XSCALE_PALMTX) += palmtx.o
obj-$(CONFIG_PALMTX_BATTERY) += palmtx_battery.o
obj-$(CONFIG_PM) += palmtx_pm.o
-obj-$(CONFIG_PALMTX_PCMCIA) += palmtx_pcmcia.o
+#obj-$(CONFIG_PALMTX_PCMCIA) += palmtx_pcmcia.o
Modified: linux4palm/linux/trunk/arch/arm/mach-pxa/palmtx/palmtx.c
===================================================================
--- linux4palm/linux/trunk/arch/arm/mach-pxa/palmtx/palmtx.c 2007-03-28 18:32:04 UTC (rev 943)
+++ linux4palm/linux/trunk/arch/arm/mach-pxa/palmtx/palmtx.c 2007-03-29 07:33:00 UTC (rev 944)
@@ -49,9 +49,9 @@
#define DEBUG
-/**
- * SD/MMC card controller
- */
+/**************************
+ * SD/MMC card controller *
+ **************************/
static int palmtx_mci_init(struct device *dev, irqreturn_t (*palmtx_detect_int)(int, void *), void *data)
{
@@ -100,7 +100,10 @@
};
-// Keypad driver
+/**********
+ * Keypad *
+ **********/
+
static struct pxa27x_keyboard_platform_data palmtx_kbd_data = {
.nr_rows = 4,
.nr_cols = 3,
@@ -148,7 +151,9 @@
};
-// backlight
+/*************
+ * Backlight *
+ *************/
static void palmtx_bl_on(void){
SET_GPIO(GPIO_NR_PALMTX_BL_POWER, 1);
@@ -179,7 +184,9 @@
};
-// IRDA
+/********
+ * IRDA *
+ ********/
static void palmtx_irda_transceiver_mode(struct device *dev, int mode)
{
@@ -188,17 +195,17 @@
local_irq_save(flags);
if (mode & IR_SIRMODE){
- printk (KERN_INFO "palmtx_irda: setting mode to SIR\n");
+ printk (KERN_INFO "IrDA: setting mode to SIR\n");
}
else if (mode & IR_FIRMODE){
- printk (KERN_INFO "palmtx_irda: setting mode to FIR\n");
+ printk (KERN_INFO "IrDA: setting mode to FIR\n");
}
if (mode & IR_OFF){
- printk (KERN_INFO "palmtx_irda: turning tranceiver OFF\n");
+ printk (KERN_INFO "IrDA: turning OFF\n");
SET_GPIO(GPIO_NR_PALMTX_IR_DISABLE, 1);
}
else {
- printk (KERN_INFO "palmtx_irda: turning tranceiver ON\n");
+ printk (KERN_INFO "IrDA: turning ON\n");
SET_GPIO(GPIO_NR_PALMTX_IR_DISABLE, 0);
SET_GPIO(GPIO_NR_PALMTX_ICP_TXD_MD, 1);
mdelay(30);
@@ -214,13 +221,10 @@
.transceiver_mode = palmtx_irda_transceiver_mode,
};
-
-
-
-
-
-// UDC (USB gadget controller)
-
+/*******
+ * USB *
+ *******/
+
static int palmtx_udc_is_connected (void){
int ret = !(GET_GPIO(GPIO_NR_PALMTX_USB_DETECT));
if (ret)
@@ -258,9 +262,9 @@
-/**
- * * AC97 audio controller
- * */
+/*************************
+ * AC97 audio controller *
+ *************************/
static pxa2xx_audio_ops_t palmtx_audio_ops = {
/*
@@ -296,7 +300,10 @@
&palmtx_backlight,
};
-
+/***************
+ * framebuffer *
+ ***************/
+
/*
* framebuffer settings as from palmos:
*
@@ -352,8 +359,10 @@
iotable_init(palmtx_io_desc, ARRAY_SIZE(palmtx_io_desc));
}
+/****************
+ * Init Machine *
+ ****************/
-
static void __init palmtx_init(void)
{
// disable primary codec interrupt to prevent WM9712 constantly interrupting the CPU
Modified: linux4palm/linux/trunk/arch/arm/mach-pxa/palmtx/palmtx_pm.c
===================================================================
--- linux4palm/linux/trunk/arch/arm/mach-pxa/palmtx/palmtx_pm.c 2007-03-28 18:32:04 UTC (rev 943)
+++ linux4palm/linux/trunk/arch/arm/mach-pxa/palmtx/palmtx_pm.c 2007-03-29 07:33:00 UTC (rev 944)
@@ -32,10 +32,9 @@
static int palmtx_suspend(struct device *dev, pm_message_t state)
{
/* Wake-Up on RTC event, etc. */
- PWER |= PWER_RTC | PWER_WEP1 | PWER_GPIO14 | PWER_GPIO10 | PWER_GPIO13 ;
- PRER |= PWER_GPIO14 | PWER_GPIO10 | PWER_GPIO13 ;
+ PWER |= PWER_RTC | PWER_WEP1 ;
- /* Wakeup by keyboard - in progress */
+ /* Wakeup by keyboard */
PKWR = 0xe0000;
/* Enabled Deep-Sleep mode */
@@ -56,8 +55,8 @@
SET_PALMTX_GPIO(USB_POWER,0);
- /* disable GPIO reset - DO NOT REMOVE! */
- PCFR &= PCFR_GPR_EN;
+ /* disable GPIO reset - DO NOT REMOVE!!!!!!!! Palm totally hangs on reset without disabling GPIO reset during sleep */
+ PCFR = PCFR_GPROD;
return 0;
}
@@ -65,7 +64,7 @@
static int palmtx_resume(struct device *dev)
{
- /* Disabled Deep-Sleep mode ?? */
+ /* Disabled Deep-Sleep mode */
PCFR &= PCFR_DS;
/* Re-enable GPIO reset */
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
