Menu
▾
▴
hackndev-commit — Subversion commits (with diffs)
You can subscribe to this list here.
| 2006 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
(26) |
Sep
(22) |
Oct
(55) |
Nov
(24) |
Dec
(30) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2007 |
Jan
(68) |
Feb
(85) |
Mar
(54) |
Apr
(12) |
May
(52) |
Jun
(75) |
Jul
(116) |
Aug
(71) |
Sep
(54) |
Oct
|
Nov
(2) |
Dec
|
|
From: <mar...@us...> - 2007-08-26 11:14:10
|
Revision: 1275
http://hackndev.svn.sourceforge.net/hackndev/?rev=1275&view=rev
Author: marex_z71
Date: 2007-08-25 21:40:15 -0700 (Sat, 25 Aug 2007)
Log Message:
-----------
PalmTX: rewrote udc part, use generic gpio driven udc driver
Modified Paths:
--------------
linux4palm/linux/trunk/arch/arm/mach-pxa/palmtx/palmtx.c
linux4palm/linux/trunk/include/asm-arm/arch-pxa/palmtx-gpio.h
Modified: linux4palm/linux/trunk/arch/arm/mach-pxa/palmtx/palmtx.c
===================================================================
--- linux4palm/linux/trunk/arch/arm/mach-pxa/palmtx/palmtx.c 2007-08-26 04:37:17 UTC (rev 1274)
+++ linux4palm/linux/trunk/arch/arm/mach-pxa/palmtx/palmtx.c 2007-08-26 04:40:15 UTC (rev 1275)
@@ -44,6 +44,7 @@
#include <asm/arch/pxa27x_keyboard.h>
#include <asm/arch/palmtx-init.h>
#include <asm/arch/palmtx-gpio.h>
+#include <asm/arch/pxa2xx_udc_gpio.h>
#include "../generic.h"
@@ -287,44 +288,34 @@
/*******
* USB *
*******/
-
-static int palmtx_udc_is_connected (void){
- int ret = !(GET_GPIO(GPIO_NR_PALMTX_USB_DETECT));
- if (ret)
- printk (KERN_INFO "palmtx_udc: device detected [USB_DETECT: %d]\n",ret);
- else
- printk (KERN_INFO "palmtx_udc: no device detected [USB_DETECT: %d]\n",ret);
-
- return ret;
-}
-
-
-static void palmtx_udc_command (int cmd){
-
- switch (cmd) {
- case PXA2XX_UDC_CMD_DISCONNECT:
- SET_GPIO(GPIO_NR_PALMTX_USB_PULLUP, 0);
- SET_GPIO(GPIO_NR_PALMTX_USB_POWER, 0);
- printk(KERN_INFO "palmtx_udc: got command PXA2XX_UDC_CMD_DISCONNECT\n");
- break;
- case PXA2XX_UDC_CMD_CONNECT:
- SET_GPIO(GPIO_NR_PALMTX_USB_POWER, 1);
- SET_GPIO(GPIO_NR_PALMTX_USB_PULLUP, 1);
- printk(KERN_INFO "palmtx_udc: got command PXA2XX_UDC_CMD_CONNECT\n");
- break;
- default:
- printk("palmtx_udc: unknown command '%d'\n", cmd);
+static int palmtx_udc_power( int power )
+{
+ if (power) {
+ SET_PALMTX_GPIO(USB_POWER, 1);
+ SET_PALMTX_GPIO(USB_PULLUP, 1);
+ } else {
+ SET_PALMTX_GPIO(USB_PULLUP, 0);
+ SET_PALMTX_GPIO(USB_POWER, 0);
}
+
+ return power;
}
+struct pxa2xx_udc_gpio_info palmtx_udc_info = {
+ .detect_gpio = {&pxagpio_device.dev, GPIO_NR_PALMTX_USB_DETECT_N},
+ .detect_gpio_negative = 1,
+ .power_ctrl = {
+ .power = &palmtx_udc_power,
+ },
+};
-static struct pxa2xx_udc_mach_info palmtx_udc_mach_info __initdata = {
- .udc_is_connected = palmtx_udc_is_connected,
- .udc_command = palmtx_udc_command,
+static struct platform_device palmtx_udc = {
+ .name = "pxa2xx-udc-gpio",
+ .dev = {
+ .platform_data = &palmtx_udc_info
+ }
};
-
-
/*************************
* AC97 audio controller *
*************************/
@@ -365,6 +356,7 @@
&palmtx_backlight,
&bcm2035_bt,
&palmtx_border,
+ &palmtx_udc,
};
/***************
@@ -443,7 +435,6 @@
set_pxa_fb_info ( &palmtx_lcd_screen );
pxa_set_btuart_info(&bcm2035_pxa_bt_funcs);
pxa_set_mci_info ( &palmtx_mci_platform_data );
- pxa_set_udc_info ( &palmtx_udc_mach_info );
pxa_set_ficp_info ( &palmtx_ficp_platform_data );
platform_add_devices( devices, ARRAY_SIZE(devices) );
Modified: linux4palm/linux/trunk/include/asm-arm/arch-pxa/palmtx-gpio.h
===================================================================
--- linux4palm/linux/trunk/include/asm-arm/arch-pxa/palmtx-gpio.h 2007-08-26 04:37:17 UTC (rev 1274)
+++ linux4palm/linux/trunk/include/asm-arm/arch-pxa/palmtx-gpio.h 2007-08-26 04:40:15 UTC (rev 1275)
@@ -63,7 +63,7 @@
#define GPIO_NR_PALMTX_ICP_TXD_MD (GPIO_NR_PALMTX_ICP_TXD | GPIO_ALT_FN_2_OUT)
/* USB */
-#define GPIO_NR_PALMTX_USB_DETECT 90
+#define GPIO_NR_PALMTX_USB_DETECT_N 13
#define GPIO_NR_PALMTX_USB_POWER 95
#define GPIO_NR_PALMTX_USB_PULLUP 93
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <mar...@us...> - 2007-08-26 11:13:50
|
Revision: 1273
http://hackndev.svn.sourceforge.net/hackndev/?rev=1273&view=rev
Author: marex_z71
Date: 2007-08-25 18:16:28 -0700 (Sat, 25 Aug 2007)
Log Message:
-----------
PalmLD: improved pcmcia driver
Modified Paths:
--------------
linux4palm/linux/trunk/arch/arm/mach-pxa/palmld/palmld_pcmcia.c
linux4palm/linux/trunk/include/asm-arm/arch-pxa/palmld-gpio.h
Modified: linux4palm/linux/trunk/arch/arm/mach-pxa/palmld/palmld_pcmcia.c
===================================================================
--- linux4palm/linux/trunk/arch/arm/mach-pxa/palmld/palmld_pcmcia.c 2007-08-25 19:48:28 UTC (rev 1272)
+++ linux4palm/linux/trunk/arch/arm/mach-pxa/palmld/palmld_pcmcia.c 2007-08-26 01:16:28 UTC (rev 1273)
@@ -1,3 +1,27 @@
+/*
+ *
+ * Driver for Palm LifeDrive PCMCIA
+ *
+ * Copyright (C) 2007 Marek Vasut <mar...@gm...>
+ * Copyright (C) 2006 Alex Osborne <bob...@gm...>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; see the file COPYING. If not, write to
+ * the Free Software Foundation, Inc., 51 Franklin Steet, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
+ *
+ */
+
#include <linux/module.h>
#include <linux/kernel.h>
#include <linux/errno.h>
@@ -27,18 +51,38 @@
#define palmld_pcmcia_dbg(format, args...) do {} while (0)
#endif
-/* GPIO defines */
-#define PALMLD_PCMCIA_IRQ 38
-#define PALMLD_PCMCIA_POWER 36
-#define PALMLD_PCMCIA_RESET 81
+static struct pcmcia_irqs palmld_socket_state_irqs[] = {
+};
static int palmld_pcmcia_hw_init (struct soc_pcmcia_socket *skt)
{
- set_irq_type(PALMLD_PCMCIA_IRQ, IRQT_FALLING);
- skt->irq = IRQ_GPIO(PALMLD_PCMCIA_IRQ);
+ GPSR(GPIO48_nPOE_MD) = GPIO_bit(GPIO48_nPOE_MD) |
+ GPIO_bit(GPIO49_nPWE_MD) |
+ GPIO_bit(GPIO50_nPIOR_MD) |
+ GPIO_bit(GPIO51_nPIOW_MD) |
+ GPIO_bit(GPIO85_nPCE_1_MD) |
+ GPIO_bit(GPIO54_nPCE_2_MD) |
+ GPIO_bit(GPIO79_pSKTSEL_MD) |
+ GPIO_bit(GPIO55_nPREG_MD) |
+ GPIO_bit(GPIO56_nPWAIT_MD) |
+ GPIO_bit(GPIO57_nIOIS16_MD);
+ pxa_gpio_mode(GPIO48_nPOE_MD);
+ pxa_gpio_mode(GPIO49_nPWE_MD);
+ pxa_gpio_mode(GPIO50_nPIOR_MD);
+ pxa_gpio_mode(GPIO51_nPIOW_MD);
+ pxa_gpio_mode(GPIO85_nPCE_1_MD);
+ pxa_gpio_mode(GPIO54_nPCE_2_MD);
+ pxa_gpio_mode(GPIO79_pSKTSEL_MD);
+ pxa_gpio_mode(GPIO55_nPREG_MD);
+ pxa_gpio_mode(GPIO56_nPWAIT_MD);
+ pxa_gpio_mode(GPIO57_nIOIS16_MD);
+
+ skt->irq = IRQ_GPIO(GPIO_NR_PALMLD_PCMCIA_READY);
+
palmld_pcmcia_dbg("%s:%i, Socket:%d\n", __FUNCTION__, __LINE__, skt->nr);
- return 0;
+ return soc_pcmcia_request_irqs(skt, palmld_socket_state_irqs,
+ ARRAY_SIZE(palmld_socket_state_irqs));
}
static void palmld_pcmcia_hw_shutdown (struct soc_pcmcia_socket *skt)
@@ -46,30 +90,16 @@
palmld_pcmcia_dbg("%s:%i\n", __FUNCTION__, __LINE__);
}
-
static void
palmld_pcmcia_socket_state (struct soc_pcmcia_socket *skt, struct pcmcia_state *state)
{
state->detect = 1; /* always inserted */
- state->ready = GET_GPIO(PALMLD_PCMCIA_IRQ) ? 1 : 0;
+ state->ready = GET_PALMLD_GPIO(PCMCIA_READY) ? 1 : 0;
state->bvd1 = 1;
state->bvd2 = 1;
- state->wrprot = 1;
+ state->wrprot = 0;
state->vs_3v = 1;
state->vs_Xv = 0;
-
- /*
- state->detect = GET_AXIMX5_GPIO (PCMCIA_DETECT_N) ? 0 : 1;
- state->ready = mq_base->get_GPIO (mq_base, 2) ? 1 : 0;
- state->bvd1 = GET_AXIMX5_GPIO (PCMCIA_BVD1) ? 1 : 0;
- state->bvd2 = GET_AXIMX5_GPIO (PCMCIA_BVD2) ? 1 : 0;
- state->wrprot = 0;
- state->vs_3v = mq_base->get_GPIO (mq_base, 65) ? 1 : 0;
- state->vs_Xv = 0;
- */
- /*printk ("detect:%d ready:%d vcc:%d bvd1:%d bvd2:%d\n",
- state->detect, state->ready, state->vs_3v, state->bvd1, state->bvd2);
- */
}
static int
@@ -78,11 +108,8 @@
palmld_pcmcia_dbg("%s:%i Reset:%d Vcc:%d\n", __FUNCTION__, __LINE__,
(state->flags & SS_RESET) ? 1 : 0, state->Vcc);
- /* GPIO 36 appears to control power to the chip */
- SET_GPIO(PALMLD_PCMCIA_POWER, 1);
-
- /* GPIO 81 appears to be reset */
- SET_GPIO(PALMLD_PCMCIA_RESET, (state->flags & SS_RESET) ? 1 : 0);
+ SET_PALMLD_GPIO(PCMCIA_POWER, 1);
+ SET_PALMLD_GPIO(PCMCIA_RESET, (state->flags & SS_RESET) ? 1 : 0);
return 0;
}
@@ -100,11 +127,9 @@
static struct pcmcia_low_level palmld_pcmcia_ops = {
.owner = THIS_MODULE,
- /* Setting it this way makes pcmcia-cs
- scream about memory-cs (because of
- HDD/CF memory in socket 0), but it's
- much nicer than make some weird changes
- in pxa pcmcia subsystem */
+ /* Setting it this way makes pcmcia-cs scream about memory-cs
+ (because of HDD/CF memory in socket 0), but it's much nicer
+ than make some weird changes in pxa pcmcia subsystem */
.first = 0,
.nr = 2,
@@ -124,7 +149,6 @@
palmld_pcmcia_dbg("%s:%i\n", __FUNCTION__, __LINE__);
}
-
static struct platform_device palmld_pcmcia_device = {
.name = "pxa2xx-pcmcia",
.id = 0,
@@ -154,6 +178,6 @@
module_init(palmld_pcmcia_init);
module_exit(palmld_pcmcia_exit);
-MODULE_AUTHOR ("Alex Osborne <bob...@gm...>");
+MODULE_AUTHOR ("Alex Osborne <bob...@gm...>, Marek Vasut <mar...@gm...>");
MODULE_DESCRIPTION ("PCMCIA support for Palm LifeDrive");
MODULE_LICENSE ("GPL");
Modified: linux4palm/linux/trunk/include/asm-arm/arch-pxa/palmld-gpio.h
===================================================================
--- linux4palm/linux/trunk/include/asm-arm/arch-pxa/palmld-gpio.h 2007-08-25 19:48:28 UTC (rev 1272)
+++ linux4palm/linux/trunk/include/asm-arm/arch-pxa/palmld-gpio.h 2007-08-26 01:16:28 UTC (rev 1273)
@@ -96,6 +96,11 @@
#define GPIO_NR_PALMLD_BT_UART_CTS_MD (GPIO_NR_PALMLD_BT_CTS | GPIO_ALT_FN_1_IN)
#define GPIO_NR_PALMLD_BT_UART_RTS_MD (GPIO_NR_PALMLD_BT_RTS | GPIO_ALT_FN_2_OUT)
+/* PCMCIA, WiFi */
+#define GPIO_NR_PALMLD_PCMCIA_READY 38
+#define GPIO_NR_PALMLD_PCMCIA_POWER 36
+#define GPIO_NR_PALMLD_PCMCIA_RESET 81
+
/* Utility macros */
#define GET_PALMLD_GPIO(gpio) \
(GPLR(GPIO_NR_PALMLD_ ## gpio) & GPIO_bit(GPIO_NR_PALMLD_ ## gpio))
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <mar...@us...> - 2007-08-26 11:13:49
|
Revision: 1278
http://hackndev.svn.sourceforge.net/hackndev/?rev=1278&view=rev
Author: marex_z71
Date: 2007-08-25 22:59:10 -0700 (Sat, 25 Aug 2007)
Log Message:
-----------
PalmTX: use TABs in Makefile
Modified Paths:
--------------
linux4palm/linux/trunk/arch/arm/mach-pxa/palmtx/Makefile
Modified: linux4palm/linux/trunk/arch/arm/mach-pxa/palmtx/Makefile
===================================================================
--- linux4palm/linux/trunk/arch/arm/mach-pxa/palmtx/Makefile 2007-08-26 05:41:29 UTC (rev 1277)
+++ linux4palm/linux/trunk/arch/arm/mach-pxa/palmtx/Makefile 2007-08-26 05:59:10 UTC (rev 1278)
@@ -2,8 +2,8 @@
## Palm TX Linux kernel Makefile
#
#
-obj-$(CONFIG_MACH_XSCALE_PALMTX) += palmtx.o
+obj-$(CONFIG_MACH_XSCALE_PALMTX) += palmtx.o
obj-$(CONFIG_PALMTX_BATTERY) += palmtx_battery.o
obj-$(CONFIG_PALMTX_PM) += palmtx_pm.o
-obj-$(CONFIG_PALMTX_PCMCIA) += palmtx_pcmcia.o
-obj-$(CONFIG_PALMTX_BORDER) += palmtx_border.o
+obj-$(CONFIG_PALMTX_PCMCIA) += palmtx_pcmcia.o
+obj-$(CONFIG_PALMTX_BORDER) += palmtx_border.o
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <mar...@us...> - 2007-08-26 11:13:33
|
Revision: 1279
http://hackndev.svn.sourceforge.net/hackndev/?rev=1279&view=rev
Author: marex_z71
Date: 2007-08-26 03:17:16 -0700 (Sun, 26 Aug 2007)
Log Message:
-----------
HTC_Beetles: fix some bugs
Modified Paths:
--------------
linux4palm/linux/trunk/arch/arm/mach-pxa/htcsable/htcsable_buttons.c
linux4palm/linux/trunk/arch/arm/mach-pxa/htcsable/htcsable_kbd.c
linux4palm/linux/trunk/arch/arm/mach-pxa/htcsable/htcsable_lcd.c
Modified: linux4palm/linux/trunk/arch/arm/mach-pxa/htcsable/htcsable_buttons.c
===================================================================
--- linux4palm/linux/trunk/arch/arm/mach-pxa/htcsable/htcsable_buttons.c 2007-08-26 05:59:10 UTC (rev 1278)
+++ linux4palm/linux/trunk/arch/arm/mach-pxa/htcsable/htcsable_buttons.c 2007-08-26 10:17:16 UTC (rev 1279)
@@ -50,7 +50,7 @@
static int __init htcsable_buttons_init(void)
{
- if (!machine_is_hw6900())
+ if (!(machine_is_hw6900() || machine_is_htcbeetles()))
return -ENODEV;
return platform_driver_register(&htcsable_buttons_driver);
Modified: linux4palm/linux/trunk/arch/arm/mach-pxa/htcsable/htcsable_kbd.c
===================================================================
--- linux4palm/linux/trunk/arch/arm/mach-pxa/htcsable/htcsable_kbd.c 2007-08-26 05:59:10 UTC (rev 1278)
+++ linux4palm/linux/trunk/arch/arm/mach-pxa/htcsable/htcsable_kbd.c 2007-08-26 10:17:16 UTC (rev 1279)
@@ -37,7 +37,7 @@
static int __init htcsable_kbd_probe(struct platform_device * pdev)
{
- if (!machine_is_hw6900())
+ if (!(machine_is_hw6900() || machine_is_htcbeetles()))
return -ENODEV;
if (!(htcsable_kbd = input_allocate_device()))
Modified: linux4palm/linux/trunk/arch/arm/mach-pxa/htcsable/htcsable_lcd.c
===================================================================
--- linux4palm/linux/trunk/arch/arm/mach-pxa/htcsable/htcsable_lcd.c 2007-08-26 05:59:10 UTC (rev 1278)
+++ linux4palm/linux/trunk/arch/arm/mach-pxa/htcsable/htcsable_lcd.c 2007-08-26 10:17:16 UTC (rev 1279)
@@ -147,7 +147,7 @@
static int htcsable_lcd_init(void)
{
- if (!machine_is_hw6900())
+ if (!(machine_is_hw6900() || machine_is_htcbeetles()))
return -ENODEV;
return platform_driver_register(&htcsable_lcd_driver);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <mar...@us...> - 2007-08-25 00:24:36
|
Revision: 1268
http://hackndev.svn.sourceforge.net/hackndev/?rev=1268&view=rev
Author: marex_z71
Date: 2007-08-24 17:24:34 -0700 (Fri, 24 Aug 2007)
Log Message:
-----------
PalmTX: remove warning from MTD driver
Modified Paths:
--------------
linux4palm/linux/trunk/drivers/mtd/nand/palmtx.c
Modified: linux4palm/linux/trunk/drivers/mtd/nand/palmtx.c
===================================================================
--- linux4palm/linux/trunk/drivers/mtd/nand/palmtx.c 2007-08-24 23:46:45 UTC (rev 1267)
+++ linux4palm/linux/trunk/drivers/mtd/nand/palmtx.c 2007-08-25 00:24:34 UTC (rev 1268)
@@ -104,10 +104,12 @@
/*
* read device ready pin
*/
+#if 0
static int palmtx_device_ready(struct mtd_info *mtd)
{
return GET_PALMTX_GPIO(NAND_READY);
}
+#endif
/*
* Main initialization routine
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ke...@us...> - 2007-08-24 23:46:49
|
Revision: 1267
http://hackndev.svn.sourceforge.net/hackndev/?rev=1267&view=rev
Author: keddar
Date: 2007-08-24 16:46:45 -0700 (Fri, 24 Aug 2007)
Log Message:
-----------
HnD: kernel cleanup - console hack removal
Modified Paths:
--------------
linux4palm/linux/trunk/kernel/power/console.c
Modified: linux4palm/linux/trunk/kernel/power/console.c
===================================================================
--- linux4palm/linux/trunk/kernel/power/console.c 2007-08-24 22:57:20 UTC (rev 1266)
+++ linux4palm/linux/trunk/kernel/power/console.c 2007-08-24 23:46:45 UTC (rev 1267)
@@ -16,15 +16,6 @@
int pm_prepare_console(void)
{
- /* <Alex>
- * OPIE locks the console so we can't switch vts, this means we hang when
- * trying to suspend. I'm not sure how we're supposed to get around it,
- * other than this. The suspend console is ugly, anyhow. ;-)
- */
-#ifndef CONFIG_MACH_PALMZ72
-#ifndef CONFIG_MACH_XSCALE_PALMLD
-#ifndef CONFIG_MACH_T3XSCALE
-
acquire_console_sem();
orig_fgconsole = fg_console;
@@ -53,24 +44,15 @@
}
orig_kmsg = kmsg_redirect;
kmsg_redirect = SUSPEND_CONSOLE;
-#endif
-#endif
-#endif
return 0;
}
void pm_restore_console(void)
{
-#ifndef CONFIG_MACH_PALMZ72
-#ifndef CONFIG_MACH_XSCALE_PALMLD
-#ifndef CONFIG_MACH_T3XSCALE
acquire_console_sem();
set_console(orig_fgconsole);
release_console_sem();
kmsg_redirect = orig_kmsg;
-#endif
-#endif
-#endif
return;
}
#endif
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <mar...@us...> - 2007-08-24 22:57:24
|
Revision: 1266
http://hackndev.svn.sourceforge.net/hackndev/?rev=1266&view=rev
Author: marex_z71
Date: 2007-08-24 15:57:20 -0700 (Fri, 24 Aug 2007)
Log Message:
-----------
PalmTX: updated defconfig
Modified Paths:
--------------
linux4palm/linux/trunk/arch/arm/configs/palmtx_defconfig
Modified: linux4palm/linux/trunk/arch/arm/configs/palmtx_defconfig
===================================================================
--- linux4palm/linux/trunk/arch/arm/configs/palmtx_defconfig 2007-08-24 22:49:55 UTC (rev 1265)
+++ linux4palm/linux/trunk/arch/arm/configs/palmtx_defconfig 2007-08-24 22:57:20 UTC (rev 1266)
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
# Linux kernel version: 2.6.21-hnd3
-# Tue Aug 14 17:01:07 2007
+# Sat Aug 25 00:55:16 2007
#
CONFIG_ARM=y
CONFIG_SYS_SUPPORTS_APM_EMULATION=y
@@ -165,19 +165,15 @@
# CONFIG_MACH_MAGICIAN is not set
# CONFIG_MACH_HTCAPACHE is not set
# CONFIG_MACH_BLUEANGEL is not set
-# CONFIG_MACH_HTCBEETLES is not set
-# CONFIG_MACH_HW6900 is not set
+# CONFIG_HTC_HW6X00 is not set
# CONFIG_MACH_HTCATHENA is not set
# CONFIG_ARCH_AXIMX3 is not set
# CONFIG_ARCH_AXIMX5 is not set
# CONFIG_MACH_X50 is not set
# CONFIG_ARCH_ROVERP1 is not set
# CONFIG_ARCH_ROVERP5P is not set
-# CONFIG_MACH_XSCALE_PALMLD is not set
-# CONFIG_MACH_XSCALE_PALMTREO650 is not set
-# CONFIG_MACH_XSCALE_TREO680 is not set
-# CONFIG_MACH_T700WX is not set
# CONFIG_MACH_TUNGE2 is not set
+# CONFIG_MACH_OMAP_PALMTC is not set
# CONFIG_MACH_T3XSCALE is not set
# CONFIG_MACH_XSCALE_PALMTT5 is not set
CONFIG_MACH_XSCALE_PALMTX=y
@@ -185,11 +181,15 @@
CONFIG_PALMTX_BATTERY=m
CONFIG_PALMTX_PM=y
CONFIG_PALMTX_PCMCIA=m
-# CONFIG_MACH_PALMZ72 is not set
-# CONFIG_MACH_OMAP_PALMTC is not set
+CONFIG_PALMTX_BORDER=m
+# CONFIG_MACH_XSCALE_PALMLD is not set
# CONFIG_MACH_ZIRE31 is not set
CONFIG_GPIOED=m
CONFIG_GPIOEDNG=m
+# CONFIG_MACH_PALMZ72 is not set
+# CONFIG_MACH_XSCALE_PALMTREO650 is not set
+# CONFIG_MACH_XSCALE_TREO680 is not set
+# CONFIG_MACH_T700WX is not set
# CONFIG_MACH_GHI270HG is not set
# CONFIG_MACH_GHI270 is not set
# CONFIG_MACH_LOOXC550 is not set
@@ -837,7 +837,6 @@
CONFIG_BACKLIGHT_CLASS_DEVICE=y
# CONFIG_LCD_CLASS_DEVICE is not set
CONFIG_BACKLIGHT_CORGI=m
-# CONFIG_BACKLIGHT_PXAPWM is not set
CONFIG_FB=y
CONFIG_FIRMWARE_EDID=y
# CONFIG_FB_DDC is not set
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <mar...@us...> - 2007-08-24 22:50:05
|
Revision: 1265
http://hackndev.svn.sourceforge.net/hackndev/?rev=1265&view=rev
Author: marex_z71
Date: 2007-08-24 15:49:55 -0700 (Fri, 24 Aug 2007)
Log Message:
-----------
HnD: kernel cleanup - time hack removal (thanks kEdAR)
Modified Paths:
--------------
linux4palm/linux/trunk/arch/arm/mach-pxa/pm.c
linux4palm/linux/trunk/arch/arm/mach-pxa/time.c
Modified: linux4palm/linux/trunk/arch/arm/mach-pxa/pm.c
===================================================================
--- linux4palm/linux/trunk/arch/arm/mach-pxa/pm.c 2007-08-23 22:32:31 UTC (rev 1264)
+++ linux4palm/linux/trunk/arch/arm/mach-pxa/pm.c 2007-08-24 22:49:55 UTC (rev 1265)
@@ -80,6 +80,7 @@
{
unsigned long sleep_save[SLEEP_SAVE_SIZE];
unsigned long checksum = 0;
+ struct timespec delta, rtc;
int i;
extern void pxa_cpu_pm_enter(suspend_state_t state);
extern void pxa_cpu_resume(void);
@@ -90,6 +91,11 @@
iwmmxt_task_disable(NULL);
#endif
+ /* preserve current time */
+ rtc.tv_sec = RCNR;
+ rtc.tv_nsec = 0;
+ save_time_delta(&delta, &rtc);
+
SAVE(GPLR0); SAVE(GPLR1); SAVE(GPLR2);
SAVE(GPDR0); SAVE(GPDR1); SAVE(GPDR2);
SAVE(GRER0); SAVE(GRER1); SAVE(GRER2);
@@ -193,6 +199,10 @@
RESTORE(PSTR);
+ /* restore current time */
+ rtc.tv_sec = RCNR;
+ restore_time_delta(&delta, &rtc);
+
#ifdef DEBUG
printk(KERN_DEBUG "*** made it back from resume\n");
#endif
Modified: linux4palm/linux/trunk/arch/arm/mach-pxa/time.c
===================================================================
--- linux4palm/linux/trunk/arch/arm/mach-pxa/time.c 2007-08-23 22:32:31 UTC (rev 1264)
+++ linux4palm/linux/trunk/arch/arm/mach-pxa/time.c 2007-08-24 22:49:55 UTC (rev 1265)
@@ -29,6 +29,7 @@
#include <asm/mach/time.h>
#include <asm/arch/pxa-regs.h>
+
static inline unsigned long pxa_get_rtc_time(void)
{
return RCNR;
@@ -180,7 +181,6 @@
#ifdef CONFIG_PM
static unsigned long osmr[4], oier;
-static struct timespec delta, rtc;
static void pxa_timer_suspend(void)
{
@@ -189,19 +189,10 @@
osmr[2] = OSMR2;
osmr[3] = OSMR3;
oier = OIER;
-
- /* preserve current time */
- rtc.tv_sec = RCNR;
- rtc.tv_nsec = 0;
- save_time_delta(&delta, &rtc);
}
static void pxa_timer_resume(void)
{
- /* restore current time */
- rtc.tv_sec = RCNR;
- restore_time_delta(&delta, &rtc);
-
OSMR0 = osmr[0];
OSMR1 = osmr[1];
OSMR2 = osmr[2];
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <mar...@us...> - 2007-08-23 22:32:32
|
Revision: 1264
http://hackndev.svn.sourceforge.net/hackndev/?rev=1264&view=rev
Author: marex_z71
Date: 2007-08-23 15:32:31 -0700 (Thu, 23 Aug 2007)
Log Message:
-----------
PalmLD: USB2 demo fix and cleanup
Modified Paths:
--------------
linux4palm/linux/trunk/arch/arm/mach-pxa/palmld/palmld.c
linux4palm/linux/trunk/drivers/usb/gadget/sx2_udc.c
linux4palm/linux/trunk/drivers/usb/gadget/sx2_udc.h
Removed Paths:
-------------
linux4palm/linux/trunk/include/asm-arm/arch-pxa/sx2.h
Modified: linux4palm/linux/trunk/arch/arm/mach-pxa/palmld/palmld.c
===================================================================
--- linux4palm/linux/trunk/arch/arm/mach-pxa/palmld/palmld.c 2007-08-23 17:55:14 UTC (rev 1263)
+++ linux4palm/linux/trunk/arch/arm/mach-pxa/palmld/palmld.c 2007-08-23 22:32:31 UTC (rev 1264)
@@ -33,7 +33,6 @@
#include <asm/arch/palmld-init.h>
#include <asm/arch/pxa27x_keyboard.h>
#include <asm/arch/pxa-pm_ll.h>
-#include <asm/arch/sx2.h>
#include <asm/arch/serial.h>
#include <sound/driver.h>
@@ -208,37 +207,17 @@
/*********************************************************
* Cypress EZUSB SX2 USB2.0 Controller
*********************************************************/
-static struct sx2_udc_mach_info palmldusb2_platform_data = {
- .virt_base = PALMLD_USB_VIRT,
-
- .ready_pin = GPIO_NR_PALMLD_USB_READY,
- .int_pin = 0, // gotta detect it
- .reset_pin = GPIO_NR_PALMLD_USB_RESET,
- .power_pin = GPIO_NR_PALMLD_USB_POWER,
-
- .sloe_pin = 0, // gotta detect it
- .slrd_pin = 0, // gotta detect it
- .slwr_pin = 0, // gotta detect it
-};
-
static struct platform_device palmldusb2_device = {
.name = "sx2-udc",
.id = -1,
- .dev = {
- .platform_data = &palmldusb2_platform_data,
- },
};
/*********************************************************
* LCD Border
*********************************************************/
-
struct platform_device palmld_border = {
.name = "palmld-border",
.id = -1,
- .dev = {
- .platform_data = NULL,
- },
};
/*********************************************************
Modified: linux4palm/linux/trunk/drivers/usb/gadget/sx2_udc.c
===================================================================
--- linux4palm/linux/trunk/drivers/usb/gadget/sx2_udc.c 2007-08-23 17:55:14 UTC (rev 1263)
+++ linux4palm/linux/trunk/drivers/usb/gadget/sx2_udc.c 2007-08-23 22:32:31 UTC (rev 1264)
@@ -1,9 +1,12 @@
/*
* linux/drivers/usb/gadget/sx2_udc.c
- * Cypress EZUSB SX2 high speed USB device controller
+ * Cypress EZUSB SX2 high speed USB device controller driver for
+ * Palm LifeDrive
*
- * Copyright (C) 2007 Marek Vasut
+ * !! THIS IS JUST A DEMO !!
*
+ * Copyright (C) 2007 Marek Vasut <mar...@gm...>
+ *
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2 of the License, or
@@ -47,17 +50,13 @@
#include <asm/unaligned.h>
#include <asm/hardware.h>
-#include <asm/arch/gpio.h>
+#include <asm/arch/palmld-gpio.h>
#include <linux/usb/ch9.h>
#include <linux/usb_gadget.h>
-#include <asm/arch/sx2.h>
-
#include "sx2_udc.h"
-struct sx2_udc_mach_info sx2_mach;
-
/*
TESTING STUFF
*/
@@ -266,7 +265,7 @@
printk("READING 0x%02x\n",reg);
writeb(data,SX2_ADDR_CMD);
-/* while((gpio_get_value(sx2_mach.ready_pin)?1:0)==0) {
+/* while(!GET_PALMLD_GPIO(USB_READY)) {
msleep(1);
};
*/
@@ -282,7 +281,7 @@
printk("SETTING 0x%02x\n",(reg | SX2_CMD_ADDR));
writeb((reg | SX2_CMD_ADDR),(SX2_ADDR_CMD));
/* wait for READY line */
- while((gpio_get_value(sx2_mach.ready_pin)?1:0)==0) {
+ while(!GET_PALMLD_GPIO(USB_READY)) {
};
return 0;
@@ -298,13 +297,13 @@
printk("UPPER NIBBLE %02x\n",(data1 | SX2_CMD_WRITE));
writeb((data1 | SX2_CMD_WRITE),(SX2_ADDR_CMD));
/* wait for READY line */
- while((gpio_get_value(sx2_mach.ready_pin)?1:0)==0) {
+ while(!GET_PALMLD_GPIO(USB_READY)) {
};
printk("LOWER NIBBLE %02x\n",(data2 | SX2_CMD_WRITE));
writeb((data2 | SX2_CMD_WRITE),(SX2_ADDR_CMD));
/* wait for READY line */
- while((gpio_get_value(sx2_mach.ready_pin)?1:0)==0) {
+ while(!GET_PALMLD_GPIO(USB_READY)) {
};
return 0;
@@ -317,33 +316,33 @@
for (;;) {
writeb(0x05,SX2_ADDR_CMD);
printk("%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s\n",
- (gpio_get_value(0)?"X":"-"), // 1 1 1
- (gpio_get_value(9)?"X":"-"), // 0 0 0
- (gpio_get_value(11)?"X":"-"), // 0 0 0
- (gpio_get_value(18)?"X":"-"), // 1 1 1
- (gpio_get_value(20)?"X":"-"), // 0 1 1
- (gpio_get_value(23)?"X":"-"), // 1 1 1
- (gpio_get_value(24)?"X":"-"), // 1 1 1
- (gpio_get_value(34)?"X":"-"), // 1 1 1
- (gpio_get_value(37)?"X":"-"), // 1 1 1
- (gpio_get_value(39)?"X":"-"), // 1 1 1
- (gpio_get_value(53)?"X":"-"), // 1 0 0
- (gpio_get_value(82)?"X":"-"), // 1 1 1
- (gpio_get_value(86)?"X":"-"), // 1 1 X
- (gpio_get_value(87)?"X":"-"), // 0 0 0
- (gpio_get_value(88)?"X":"-"), // 1 1 1
- (gpio_get_value(90)?"X":"-"), // 0 0 0
- (gpio_get_value(93)?"X":"-"), // 1 1 1
- (gpio_get_value(99)?"X":"-"), // 0 0 0
- (gpio_get_value(106)?"X":"-"), // 0 0 0
- (gpio_get_value(107)?"X":"-"), // 0 0 0
- (gpio_get_value(113)?"X":"-"), // 1 1 1
- (gpio_get_value(114)?"X":"-"), // 0 0 0
- (gpio_get_value(116)?"X":"-"), // 1 1 1
- (gpio_get_value(117)?"X":"-"), // 1 1 1
- (gpio_get_value(118)?"X":"-"), // 1 1 1
- (gpio_get_value(119)?"X":"-"), // 1 1 1
- (gpio_get_value(120)?"X":"-") // 1 1 1
+ (GET_GPIO(0)?"X":"-"), // 1 1 1
+ (GET_GPIO(9)?"X":"-"), // 0 0 0
+ (GET_GPIO(11)?"X":"-"), // 0 0 0
+ (GET_GPIO(18)?"X":"-"), // 1 1 1
+ (GET_GPIO(20)?"X":"-"), // 0 1 1
+ (GET_GPIO(23)?"X":"-"), // 1 1 1
+ (GET_GPIO(24)?"X":"-"), // 1 1 1
+ (GET_GPIO(34)?"X":"-"), // 1 1 1
+ (GET_GPIO(37)?"X":"-"), // 1 1 1
+ (GET_GPIO(39)?"X":"-"), // 1 1 1
+ (GET_GPIO(53)?"X":"-"), // 1 0 0
+ (GET_GPIO(82)?"X":"-"), // 1 1 1
+ (GET_GPIO(86)?"X":"-"), // 1 1 X
+ (GET_GPIO(87)?"X":"-"), // 0 0 0
+ (GET_GPIO(88)?"X":"-"), // 1 1 1
+ (GET_GPIO(90)?"X":"-"), // 0 0 0
+ (GET_GPIO(93)?"X":"-"), // 1 1 1
+ (GET_GPIO(99)?"X":"-"), // 0 0 0
+ (GET_GPIO(106)?"X":"-"), // 0 0 0
+ (GET_GPIO(107)?"X":"-"), // 0 0 0
+ (GET_GPIO(113)?"X":"-"), // 1 1 1
+ (GET_GPIO(114)?"X":"-"), // 0 0 0
+ (GET_GPIO(116)?"X":"-"), // 1 1 1
+ (GET_GPIO(117)?"X":"-"), // 1 1 1
+ (GET_GPIO(118)?"X":"-"), // 1 1 1
+ (GET_GPIO(119)?"X":"-"), // 1 1 1
+ (GET_GPIO(120)?"X":"-") // 1 1 1
); // def rst wrt
}
/* printk("REG 0x%02x %02x %02x %02x %02x %02x\n",0x05,readb(SX2_ADDR_FIFO2),readb(SX2_ADDR_FIFO4),
@@ -354,22 +353,22 @@
/*
- GADGET LEVEL HANDLING STUFF
+ * GADGET LEVEL HANDLING STUFF
*/
static const char driver_name [] = "sx2_udc";
int usb_gadget_register_driver(struct usb_gadget_driver *driver)
{
-printk("SX2: usb_gadget_register_driver\n");
-return 0;
+ printk("SX2: usb_gadget_register_driver\n");
+ return 0;
}
EXPORT_SYMBOL(usb_gadget_register_driver);
int usb_gadget_unregister_driver(struct usb_gadget_driver *driver)
{
-printk("SX2: usb_gadget_unregister_driver\n");
-return 0;
+ printk("SX2: usb_gadget_unregister_driver\n");
+ return 0;
}
EXPORT_SYMBOL(usb_gadget_unregister_driver);
@@ -382,14 +381,14 @@
/*
- HARDWARE LEVEL HANDLING STUFF
+ * HARDWARE LEVEL HANDLING STUFF
*/
static int sx2_udc_probe(struct platform_device *pdev)
{
static struct sx2_dev *usb;
/*
-INIT THE CONTROLLER - POWER UP ETC
-*/
+ * INIT THE CONTROLLER - POWER UP ETC
+ */
/* FIXME - this cant be static :-E */
if(!request_mem_region(SX2_ADDR_BASE, 0x10000, "sx2-udc"))
return -EBUSY;
@@ -402,13 +401,11 @@
platform_set_drvdata(pdev, usb);
usb->dev = &(pdev->dev);
- usb->mach = pdev->dev.platform_data;
- sx2_mach = *(usb->mach);
/* Now power down and up the chip */
- gpio_set_value(usb->mach->power_pin,0);
+ SET_PALMLD_GPIO(USB_POWER,0);
udelay(100);
- gpio_set_value(usb->mach->power_pin,1);
+ SET_PALMLD_GPIO(USB_POWER,1);
udelay(500);
/* sx2_hwtest(); */
sx2_enum();
@@ -450,5 +447,5 @@
module_exit(udc_exit);
MODULE_DESCRIPTION("Cypress EZUSB SX2 Peripheral Controller");
-MODULE_AUTHOR("Marek Vasut");
+MODULE_AUTHOR("Marek Vasut <mar...@gm...>");
MODULE_LICENSE("GPL");
Modified: linux4palm/linux/trunk/drivers/usb/gadget/sx2_udc.h
===================================================================
--- linux4palm/linux/trunk/drivers/usb/gadget/sx2_udc.h 2007-08-23 17:55:14 UTC (rev 1263)
+++ linux4palm/linux/trunk/drivers/usb/gadget/sx2_udc.h 2007-08-23 22:32:31 UTC (rev 1264)
@@ -121,7 +121,6 @@
struct sx2_dev {
struct device *dev;
- struct sx2_udc_mach_info *mach;
spinlock_t lock;
/*
* EP0 write thread.
Deleted: linux4palm/linux/trunk/include/asm-arm/arch-pxa/sx2.h
===================================================================
--- linux4palm/linux/trunk/include/asm-arm/arch-pxa/sx2.h 2007-08-23 17:55:14 UTC (rev 1263)
+++ linux4palm/linux/trunk/include/asm-arm/arch-pxa/sx2.h 2007-08-23 22:32:31 UTC (rev 1264)
@@ -1,21 +0,0 @@
-/*
- * linux/include/asm-arm/arch-pxa/sx2.h
- *
- * This supports machine-specific differences in how the Cypress SX2
- * USB Device Controller (UDC) is wired.
- *
- */
-
-struct sx2_udc_mach_info {
- u32 virt_base;
-
- int ready_pin;
- int int_pin;
- int reset_pin;
- int power_pin;
-
- int sloe_pin;
- int slrd_pin;
- int slwr_pin;
-};
-
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <mar...@us...> - 2007-08-23 17:55:15
|
Revision: 1263
http://hackndev.svn.sourceforge.net/hackndev/?rev=1263&view=rev
Author: marex_z71
Date: 2007-08-23 10:55:14 -0700 (Thu, 23 Aug 2007)
Log Message:
-----------
HnD: make Kconfig and Makefile for palms less messy, sort things
Modified Paths:
--------------
linux4palm/linux/trunk/arch/arm/mach-pxa/Kconfig
linux4palm/linux/trunk/arch/arm/mach-pxa/Makefile
Modified: linux4palm/linux/trunk/arch/arm/mach-pxa/Kconfig
===================================================================
--- linux4palm/linux/trunk/arch/arm/mach-pxa/Kconfig 2007-08-23 17:35:31 UTC (rev 1262)
+++ linux4palm/linux/trunk/arch/arm/mach-pxa/Kconfig 2007-08-23 17:55:14 UTC (rev 1263)
@@ -43,17 +43,17 @@
source "arch/arm/mach-pxa/aximx30/Kconfig"
source "arch/arm/mach-pxa/aximx50/Kconfig"
source "arch/arm/mach-pxa/rover/Kconfig"
-source "arch/arm/mach-pxa/palmld/Kconfig"
-source "arch/arm/mach-pxa/palmt650/Kconfig"
-source "arch/arm/mach-pxa/palmt680/Kconfig"
-source "arch/arm/mach-pxa/palmt700wx/Kconfig"
source "arch/arm/mach-pxa/palmte2/Kconfig"
+source "arch/arm/mach-pxa/palmtc/Kconfig"
source "arch/arm/mach-pxa/palmtt3/Kconfig"
source "arch/arm/mach-pxa/palmtt5/Kconfig"
source "arch/arm/mach-pxa/palmtx/Kconfig"
+source "arch/arm/mach-pxa/palmld/Kconfig"
+source "arch/arm/mach-pxa/palmz31/Kconfig"
source "arch/arm/mach-pxa/palmz72/Kconfig"
-source "arch/arm/mach-pxa/palmtc/Kconfig"
-source "arch/arm/mach-pxa/palmz31/Kconfig"
+source "arch/arm/mach-pxa/palmt650/Kconfig"
+source "arch/arm/mach-pxa/palmt680/Kconfig"
+source "arch/arm/mach-pxa/palmt700wx/Kconfig"
config MACH_GHI270HG
bool "Grayhill Duramax HG"
Modified: linux4palm/linux/trunk/arch/arm/mach-pxa/Makefile
===================================================================
--- linux4palm/linux/trunk/arch/arm/mach-pxa/Makefile 2007-08-23 17:35:31 UTC (rev 1262)
+++ linux4palm/linux/trunk/arch/arm/mach-pxa/Makefile 2007-08-23 17:55:14 UTC (rev 1263)
@@ -47,17 +47,17 @@
obj-$(CONFIG_MACH_RECON) += plat-recon/
obj-$(CONFIG_MACH_LOOXC550) += looxc550/
obj-$(CONFIG_MACH_X50) += aximx50/
+obj-$(CONFIG_MACH_TUNGE2) += palmte2/
+obj-$(CONFIG_MACH_OMAP_PALMTC) += ssp.o palmtc/
+obj-$(CONFIG_MACH_T3XSCALE) += ssp.o palmtt3/
+obj-$(CONFIG_MACH_XSCALE_PALMTT5) += palmtt5/
+obj-$(CONFIG_MACH_XSCALE_PALMTX) += palmtx/
obj-$(CONFIG_MACH_XSCALE_PALMLD) += palmld/
+obj-$(CONFIG_MACH_ZIRE31) += palmz31/
+obj-$(CONFIG_MACH_PALMZ72) += palmz72/
obj-$(CONFIG_MACH_XSCALE_PALMTREO650) += palmt650/
obj-$(CONFIG_MACH_XSCALE_TREO680) += palmt680/
obj-$(CONFIG_MACH_T700WX) += palmt700wx/
-obj-$(CONFIG_MACH_T3XSCALE) += ssp.o palmtt3/
-obj-$(CONFIG_MACH_XSCALE_PALMTT5) += palmtt5/
-obj-$(CONFIG_MACH_XSCALE_PALMTX) += palmtx/
-obj-$(CONFIG_MACH_PALMZ72) += palmz72/
-obj-$(CONFIG_MACH_TUNGE2) += palmte2/
-obj-$(CONFIG_MACH_OMAP_PALMTC) += ssp.o palmtc/
-obj-$(CONFIG_MACH_ZIRE31) += palmz31/
# Support for blinky lights
led-y := leds.o
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <mar...@us...> - 2007-08-23 17:35:33
|
Revision: 1262
http://hackndev.svn.sourceforge.net/hackndev/?rev=1262&view=rev
Author: marex_z71
Date: 2007-08-23 10:35:31 -0700 (Thu, 23 Aug 2007)
Log Message:
-----------
HnD: remove deprecated pxapwm_bl
Modified Paths:
--------------
linux4palm/linux/trunk/drivers/video/backlight/Kconfig
linux4palm/linux/trunk/drivers/video/backlight/Makefile
Removed Paths:
-------------
linux4palm/linux/trunk/drivers/video/backlight/pxapwm_bl.c
linux4palm/linux/trunk/include/asm-arm/arch-pxa/pxapwm-bl.h
Modified: linux4palm/linux/trunk/drivers/video/backlight/Kconfig
===================================================================
--- linux4palm/linux/trunk/drivers/video/backlight/Kconfig 2007-08-23 17:34:23 UTC (rev 1261)
+++ linux4palm/linux/trunk/drivers/video/backlight/Kconfig 2007-08-23 17:35:31 UTC (rev 1262)
@@ -78,14 +78,6 @@
If you have an iPAQ h2200, say Y to enable the backlight driver.
-config BACKLIGHT_PXAPWM
- tristate "PXA PWM Backlight Driver (deprecated)"
- depends on BACKLIGHT_CLASS_DEVICE && ARCH_PXA
- default n
- help
- If your backlight is driven by the PXA PWM, say y to enable the backlight
- driver.
-
config BACKLIGHT_S3C2410
tristate "Samsung S3C2410 Backlight Driver"
depends on (BACKLIGHT_CLASS_DEVICE || LCD_CLASS_DEVICE) && ARCH_S3C2410
Modified: linux4palm/linux/trunk/drivers/video/backlight/Makefile
===================================================================
--- linux4palm/linux/trunk/drivers/video/backlight/Makefile 2007-08-23 17:34:23 UTC (rev 1261)
+++ linux4palm/linux/trunk/drivers/video/backlight/Makefile 2007-08-23 17:35:31 UTC (rev 1262)
@@ -9,6 +9,5 @@
obj-$(CONFIG_BACKLIGHT_HX2750) += hx2750_bl.o
obj-$(CONFIG_BACKLIGHT_H2200) += h2200_bl.o
obj-$(CONFIG_LCD_H2200) += h2200_lcd.o
-obj-$(CONFIG_BACKLIGHT_PXAPWM) += pxapwm_bl.o
obj-$(CONFIG_BACKLIGHT_S3C2410) += s3c2410_lcd.o
Deleted: linux4palm/linux/trunk/drivers/video/backlight/pxapwm_bl.c
===================================================================
--- linux4palm/linux/trunk/drivers/video/backlight/pxapwm_bl.c 2007-08-23 17:34:23 UTC (rev 1261)
+++ linux4palm/linux/trunk/drivers/video/backlight/pxapwm_bl.c 2007-08-23 17:35:31 UTC (rev 1262)
@@ -1,240 +0,0 @@
-/*
- * Support for XScale PWM driven backlights.
- *
- * Authors: Vladimir "Farcaller" Pouzanov <far...@gm...>
- * Alex Osborne <bob...@gm...>
- *
- * Based on Sharp Corgi driver
- *
- */
-
-#warning ---------------------------------------------------------------------
-#warning PXA PWM backlight driver is deperecated, please use corgi_bl instead.
-#warning ---------------------------------------------------------------------
-
-#include <linux/module.h>
-#include <linux/kernel.h>
-#include <linux/init.h>
-#include <linux/platform_device.h>
-#include <linux/spinlock.h>
-#include <linux/fb.h>
-#include <linux/backlight.h>
-#include <asm/arch/pxa-regs.h>
-#include <asm/arch/pxapwm-bl.h>
-
-static struct backlight_ops pxapwmbl_ops;
-static void (*pxapwmbl_mach_turn_bl_on)(void);
-static void (*pxapwmbl_mach_turn_bl_off)(void);
-
-static void pxapwmbl_send_intensity(struct pxapwmbl_platform_data *bl, int intensity)
-{
- unsigned long flags;
- unsigned int period, prescaler;
-
- if (bl->limit)
- intensity &= bl->limit_mask;
-
- // set intensity to 0 if in power saving or fb is blanked
- if (bl->dev->props.power != FB_BLANK_UNBLANK)
- intensity = 0;
- if (bl->dev->props.fb_blank != FB_BLANK_UNBLANK)
- intensity = 0;
-
- /* Does the backlight frequency need to be configured on a per device basis?
- * What are sensible defaults? Farcaller had prescaler 2, period 0x12bi (~6.1khz).
- * LD is configured for 1.2khz.
- *
- * h2200_lcd says "450 Hz which is quite enough."
- */
- if (intensity) {
- period = bl->period;
- prescaler = bl->prescaler;
- } else {
- period = 0;
- prescaler=0;
- }
-
- //printk("pxapwmbl: setting intensity to %d [bl->intensity=%d]\n", intensity, bl->intensity);
- spin_lock_irqsave(&bl->lock, flags);
-
- // poweron backlight if possible and needed
- if (pxapwmbl_mach_turn_bl_on){
- if ((bl->intensity <= bl->off_threshold) && (intensity > bl->off_threshold)){
- pxapwmbl_mach_turn_bl_on();
- }
- }
-
- //printk("pxapwmbl: setting intensity to %d [bl->intensity = %d]\n", intensity, bl->intensity);
- switch (bl->pwm) {
- case 0:
- PWM_CTRL0 = prescaler;
- PWM_PWDUTY0 = intensity;
- PWM_PERVAL0 = period;
- break;
- case 1:
- PWM_CTRL1 = prescaler;
- PWM_PWDUTY1 = intensity;
- PWM_PERVAL1 = period;
- break;
-
- /* Note: PXA270 has 2 more PWMs, however the registers don't seem to be
- * defined in pxa-regs.h. If you have device which uses PWM 2 or 3,
- * you'll need to add them here.
- */
-
- default:
- printk(KERN_ERR "pxapwmbl_send_intensity: invalid PWM selected in"
- " platform data.\n");
- }
-
- // poweroff backlight if possible and needed
- if (pxapwmbl_mach_turn_bl_off){
- if ((bl->intensity > bl->off_threshold) && (intensity <= bl->off_threshold)){
- pxapwmbl_mach_turn_bl_off();
- }
- }
-
- bl->dev->props.brightness = intensity;
- bl->intensity=intensity;
-
- spin_unlock_irqrestore(&bl->lock, flags);
-}
-
-#ifdef CONFIG_PM
-static int stored_intensity = 0;
-static int pxapwmbl_suspend(struct platform_device *pdev, pm_message_t state)
-{
- struct pxapwmbl_platform_data *bl = pdev->dev.platform_data;
- stored_intensity = bl->intensity;
- pxapwmbl_send_intensity(bl, 0);
- return 0;
-}
-
-static int pxapwmbl_resume(struct platform_device *pdev)
-{
- struct pxapwmbl_platform_data *bl = pdev->dev.platform_data;
- pxapwmbl_send_intensity(bl,stored_intensity);
- return 0;
-}
-#else
-#define pxapwmbl_suspend NULL
-#define pxapwmbl_resume NULL
-#endif
-
-static int pxapwmbl_update_status(struct backlight_device *bd)
-{
- int intensity;
- struct pxapwmbl_platform_data *bl = class_get_devdata(&bd->class_dev);
-
- intensity = bd->props.brightness;
-
- if (intensity > bd->props.max_brightness)
- intensity = bd->props.max_brightness;
-
- if (intensity < 0)
- intensity = 0;
-
- pxapwmbl_send_intensity(bl, intensity);
-
- return 0;
-}
-
-static int pxapwmbl_get_intensity(struct backlight_device *bd)
-{
- struct pxapwmbl_platform_data *bl = class_get_devdata(&bd->class_dev);
- return bl->intensity;
-}
-
-/*
- * Called when the battery is low to limit the backlight intensity.
- * If limit==0 clear any limit, otherwise limit the intensity
- */
-void pxapwmbl_limit_intensity(struct platform_device *pdev, int limit)
-{
- struct pxapwmbl_platform_data *bl = pdev->dev.platform_data;
-
- bl->limit = (limit ? 1 : 0);
- pxapwmbl_send_intensity(bl, bl->intensity);
-}
-EXPORT_SYMBOL(pxapwmbl_limit_intensity);
-
-static struct backlight_ops pxapwmbl_ops = {
- .get_brightness = pxapwmbl_get_intensity,
- .update_status = pxapwmbl_update_status,
-};
-
-static int pxapwmbl_probe(struct platform_device *pdev)
-{
- struct pxapwmbl_platform_data *bl = pdev->dev.platform_data;
-
- bl->dev = backlight_device_register ("pxapwm-bl", &pdev->dev,
- bl, &pxapwmbl_ops);
-
- bl->dev->props.max_brightness = bl->max_intensity;
-
- pxapwmbl_mach_turn_bl_on = bl->turn_bl_on;
- pxapwmbl_mach_turn_bl_off = bl->turn_bl_off;
-
- bl->limit = 0;
- bl->lock = SPIN_LOCK_UNLOCKED;
-
- bl->dev->props.brightness = bl->default_intensity;
- bl->dev->props.power = FB_BLANK_UNBLANK;
- bl->dev->props.fb_blank = FB_BLANK_UNBLANK;
-
- bl->off_threshold = 5;
-
- if (IS_ERR (bl->dev))
- return PTR_ERR (bl->dev);
-
- platform_set_drvdata(pdev, bl->dev);
-
- pxapwmbl_send_intensity(bl, bl->default_intensity);
- CKEN = CKEN | (bl->pwm?CKEN1_PWM1:CKEN0_PWM0);
- bl->intensity = bl->default_intensity;
- pxapwmbl_limit_intensity(pdev, 0);
-
- printk("PXA PWM backlight driver initialized.\n");
- return 0;
-}
-
-static int pxapwmbl_remove(struct platform_device *pdev)
-{
- struct pxapwmbl_platform_data *bl = pdev->dev.platform_data;
-
- pxapwmbl_send_intensity(bl, bl->default_intensity);
-
- backlight_device_unregister(bl->dev);
-
- printk("PXA PWM backlight driver unloaded\n");
- return 0;
-}
-
-static struct platform_driver pxapwmbl_driver = {
- .probe = pxapwmbl_probe,
- .remove = pxapwmbl_remove,
- .suspend = pxapwmbl_suspend,
- .resume = pxapwmbl_resume,
- .driver = {
- .name = "pxapwm-bl",
- },
-};
-
-static int __init pxapwmbl_init(void)
-{
- int pdreg = platform_driver_register(&pxapwmbl_driver);
-
- return pdreg;
-}
-
-static void __exit pxapwmbl_exit(void)
-{
- platform_driver_unregister(&pxapwmbl_driver);
-}
-
-module_init(pxapwmbl_init);
-module_exit(pxapwmbl_exit);
-
-MODULE_AUTHOR("Vladimir Pouzanov <far...@gm...>");
-MODULE_DESCRIPTION("XScale PWM Backlight Driver");
-MODULE_LICENSE("GPL");
Deleted: linux4palm/linux/trunk/include/asm-arm/arch-pxa/pxapwm-bl.h
===================================================================
--- linux4palm/linux/trunk/include/asm-arm/arch-pxa/pxapwm-bl.h 2007-08-23 17:34:23 UTC (rev 1261)
+++ linux4palm/linux/trunk/include/asm-arm/arch-pxa/pxapwm-bl.h 2007-08-23 17:35:31 UTC (rev 1262)
@@ -1,42 +0,0 @@
-/*
- * linux/include/asm-arm/arch-pxa/pxa27x-keypad.h
- *
- * Support for XScale PWM driven backlights.
- *
- * Author: Alex Osborne <bob...@gm...>
- * Created: May 2006
- *
- */
-
-/*
-#define PALMT3_MAX_INTENSITY 0x100
-#define PALMT3_DEFAULT_INTENSITY 0x050
-#define PALMT3_LIMIT_MASK 0x7F
-*/
-
-#ifndef __ASM_ARCH_PXA27X_KEYPAD_H
-#define __ASM_ARCH_PXA27X_KEYPAD_H
-
-#include <linux/backlight.h>
-#include <linux/spinlock.h>
-
-struct pxapwmbl_platform_data {
- int pwm;
- int max_intensity;
- int default_intensity;
- int limit_mask;
- int period;
- int prescaler;
-
- int intensity;
- int limit;
- int off_threshold;
-
- spinlock_t lock;
- struct backlight_device *dev;
- void (*turn_bl_on)(void);
- void (*turn_bl_off)(void);
-
-};
-
-#endif
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <mar...@us...> - 2007-08-23 17:34:24
|
Revision: 1261
http://hackndev.svn.sourceforge.net/hackndev/?rev=1261&view=rev
Author: marex_z71
Date: 2007-08-23 10:34:23 -0700 (Thu, 23 Aug 2007)
Log Message:
-----------
HnD: cleanup
Modified Paths:
--------------
linux4palm/linux/trunk/sound/arm/pxa2xx-i2sound.h
Modified: linux4palm/linux/trunk/sound/arm/pxa2xx-i2sound.h
===================================================================
--- linux4palm/linux/trunk/sound/arm/pxa2xx-i2sound.h 2007-08-23 17:28:03 UTC (rev 1260)
+++ linux4palm/linux/trunk/sound/arm/pxa2xx-i2sound.h 2007-08-23 17:34:23 UTC (rev 1261)
@@ -55,15 +55,15 @@
#ifdef CONFIG_PM
/* Power Management */
- int (*suspend)(pm_message_t state);
- int (*resume)(void);
+ int (*suspend) (pm_message_t state);
+ int (*resume) (void);
#endif
};
#define SND_PXA2xx_I2SOUND_INFO_CLOCK_FROM_PXA 1 << 0
-#define SND_PXA2xx_I2SOUND_INFO_SYSCLOCK_DISABLE 1 << 3
#define SND_PXA2xx_I2SOUND_INFO_CAN_CAPTURE 1 << 1
#define SND_PXA2xx_I2SOUND_INFO_HALF_DUPLEX 1 << 2
+#define SND_PXA2xx_I2SOUND_INFO_SYSCLOCK_DISABLE 1 << 3
void snd_pxa2xx_i2sound_i2slink_get(void);
void snd_pxa2xx_i2sound_i2slink_free(void);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <far...@us...> - 2007-08-23 17:28:08
|
Revision: 1260
http://hackndev.svn.sourceforge.net/hackndev/?rev=1260&view=rev
Author: farcaller
Date: 2007-08-23 10:28:03 -0700 (Thu, 23 Aug 2007)
Log Message:
-----------
linux: and pxapwm_bl.h too...
Removed Paths:
-------------
linux4palm/linux/branches/rt/include/asm-arm/arch-pxa/pxapwm-bl.h
Deleted: linux4palm/linux/branches/rt/include/asm-arm/arch-pxa/pxapwm-bl.h
===================================================================
--- linux4palm/linux/branches/rt/include/asm-arm/arch-pxa/pxapwm-bl.h 2007-08-23 17:25:07 UTC (rev 1259)
+++ linux4palm/linux/branches/rt/include/asm-arm/arch-pxa/pxapwm-bl.h 2007-08-23 17:28:03 UTC (rev 1260)
@@ -1,42 +0,0 @@
-/*
- * linux/include/asm-arm/arch-pxa/pxa27x-keypad.h
- *
- * Support for XScale PWM driven backlights.
- *
- * Author: Alex Osborne <bob...@gm...>
- * Created: May 2006
- *
- */
-
-/*
-#define PALMT3_MAX_INTENSITY 0x100
-#define PALMT3_DEFAULT_INTENSITY 0x050
-#define PALMT3_LIMIT_MASK 0x7F
-*/
-
-#ifndef __ASM_ARCH_PXA27X_KEYPAD_H
-#define __ASM_ARCH_PXA27X_KEYPAD_H
-
-#include <linux/backlight.h>
-#include <linux/spinlock.h>
-
-struct pxapwmbl_platform_data {
- int pwm;
- int max_intensity;
- int default_intensity;
- int limit_mask;
- int period;
- int prescaler;
-
- int intensity;
- int limit;
- int off_threshold;
-
- spinlock_t lock;
- struct backlight_device *dev;
- void (*turn_bl_on)(void);
- void (*turn_bl_off)(void);
-
-};
-
-#endif
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <far...@us...> - 2007-08-23 17:25:10
|
Revision: 1259
http://hackndev.svn.sourceforge.net/hackndev/?rev=1259&view=rev
Author: farcaller
Date: 2007-08-23 10:25:07 -0700 (Thu, 23 Aug 2007)
Log Message:
-----------
linux: removed pxapwm_bl
Modified Paths:
--------------
linux4palm/linux/branches/rt/drivers/video/backlight/Kconfig
linux4palm/linux/branches/rt/drivers/video/backlight/Makefile
Removed Paths:
-------------
linux4palm/linux/branches/rt/drivers/video/backlight/pxapwm_bl.c
Modified: linux4palm/linux/branches/rt/drivers/video/backlight/Kconfig
===================================================================
--- linux4palm/linux/branches/rt/drivers/video/backlight/Kconfig 2007-08-23 17:00:22 UTC (rev 1258)
+++ linux4palm/linux/branches/rt/drivers/video/backlight/Kconfig 2007-08-23 17:25:07 UTC (rev 1259)
@@ -78,14 +78,6 @@
If you have an iPAQ h2200, say Y to enable the backlight driver.
-config BACKLIGHT_PXAPWM
- tristate "PXA PWM Backlight Driver (deprecated)"
- depends on BACKLIGHT_CLASS_DEVICE && ARCH_PXA
- default n
- help
- If your backlight is driven by the PXA PWM, say y to enable the backlight
- driver.
-
config BACKLIGHT_S3C2410
tristate "Samsung S3C2410 Backlight Driver"
depends on (BACKLIGHT_CLASS_DEVICE || LCD_CLASS_DEVICE) && ARCH_S3C2410
Modified: linux4palm/linux/branches/rt/drivers/video/backlight/Makefile
===================================================================
--- linux4palm/linux/branches/rt/drivers/video/backlight/Makefile 2007-08-23 17:00:22 UTC (rev 1258)
+++ linux4palm/linux/branches/rt/drivers/video/backlight/Makefile 2007-08-23 17:25:07 UTC (rev 1259)
@@ -9,6 +9,5 @@
obj-$(CONFIG_BACKLIGHT_HX2750) += hx2750_bl.o
obj-$(CONFIG_BACKLIGHT_H2200) += h2200_bl.o
obj-$(CONFIG_LCD_H2200) += h2200_lcd.o
-obj-$(CONFIG_BACKLIGHT_PXAPWM) += pxapwm_bl.o
obj-$(CONFIG_BACKLIGHT_S3C2410) += s3c2410_lcd.o
Deleted: linux4palm/linux/branches/rt/drivers/video/backlight/pxapwm_bl.c
===================================================================
--- linux4palm/linux/branches/rt/drivers/video/backlight/pxapwm_bl.c 2007-08-23 17:00:22 UTC (rev 1258)
+++ linux4palm/linux/branches/rt/drivers/video/backlight/pxapwm_bl.c 2007-08-23 17:25:07 UTC (rev 1259)
@@ -1,240 +0,0 @@
-/*
- * Support for XScale PWM driven backlights.
- *
- * Authors: Vladimir "Farcaller" Pouzanov <far...@gm...>
- * Alex Osborne <bob...@gm...>
- *
- * Based on Sharp Corgi driver
- *
- */
-
-#warning ---------------------------------------------------------------------
-#warning PXA PWM backlight driver is deperecated, please use corgi_bl instead.
-#warning ---------------------------------------------------------------------
-
-#include <linux/module.h>
-#include <linux/kernel.h>
-#include <linux/init.h>
-#include <linux/platform_device.h>
-#include <linux/spinlock.h>
-#include <linux/fb.h>
-#include <linux/backlight.h>
-#include <asm/arch/pxa-regs.h>
-#include <asm/arch/pxapwm-bl.h>
-
-static struct backlight_ops pxapwmbl_ops;
-static void (*pxapwmbl_mach_turn_bl_on)(void);
-static void (*pxapwmbl_mach_turn_bl_off)(void);
-
-static void pxapwmbl_send_intensity(struct pxapwmbl_platform_data *bl, int intensity)
-{
- unsigned long flags;
- unsigned int period, prescaler;
-
- if (bl->limit)
- intensity &= bl->limit_mask;
-
- // set intensity to 0 if in power saving or fb is blanked
- if (bl->dev->props.power != FB_BLANK_UNBLANK)
- intensity = 0;
- if (bl->dev->props.fb_blank != FB_BLANK_UNBLANK)
- intensity = 0;
-
- /* Does the backlight frequency need to be configured on a per device basis?
- * What are sensible defaults? Farcaller had prescaler 2, period 0x12bi (~6.1khz).
- * LD is configured for 1.2khz.
- *
- * h2200_lcd says "450 Hz which is quite enough."
- */
- if (intensity) {
- period = bl->period;
- prescaler = bl->prescaler;
- } else {
- period = 0;
- prescaler=0;
- }
-
- //printk("pxapwmbl: setting intensity to %d [bl->intensity=%d]\n", intensity, bl->intensity);
- spin_lock_irqsave(&bl->lock, flags);
-
- // poweron backlight if possible and needed
- if (pxapwmbl_mach_turn_bl_on){
- if ((bl->intensity <= bl->off_threshold) && (intensity > bl->off_threshold)){
- pxapwmbl_mach_turn_bl_on();
- }
- }
-
- //printk("pxapwmbl: setting intensity to %d [bl->intensity = %d]\n", intensity, bl->intensity);
- switch (bl->pwm) {
- case 0:
- PWM_CTRL0 = prescaler;
- PWM_PWDUTY0 = intensity;
- PWM_PERVAL0 = period;
- break;
- case 1:
- PWM_CTRL1 = prescaler;
- PWM_PWDUTY1 = intensity;
- PWM_PERVAL1 = period;
- break;
-
- /* Note: PXA270 has 2 more PWMs, however the registers don't seem to be
- * defined in pxa-regs.h. If you have device which uses PWM 2 or 3,
- * you'll need to add them here.
- */
-
- default:
- printk(KERN_ERR "pxapwmbl_send_intensity: invalid PWM selected in"
- " platform data.\n");
- }
-
- // poweroff backlight if possible and needed
- if (pxapwmbl_mach_turn_bl_off){
- if ((bl->intensity > bl->off_threshold) && (intensity <= bl->off_threshold)){
- pxapwmbl_mach_turn_bl_off();
- }
- }
-
- bl->dev->props.brightness = intensity;
- bl->intensity=intensity;
-
- spin_unlock_irqrestore(&bl->lock, flags);
-}
-
-#ifdef CONFIG_PM
-static int stored_intensity = 0;
-static int pxapwmbl_suspend(struct platform_device *pdev, pm_message_t state)
-{
- struct pxapwmbl_platform_data *bl = pdev->dev.platform_data;
- stored_intensity = bl->intensity;
- pxapwmbl_send_intensity(bl, 0);
- return 0;
-}
-
-static int pxapwmbl_resume(struct platform_device *pdev)
-{
- struct pxapwmbl_platform_data *bl = pdev->dev.platform_data;
- pxapwmbl_send_intensity(bl,stored_intensity);
- return 0;
-}
-#else
-#define pxapwmbl_suspend NULL
-#define pxapwmbl_resume NULL
-#endif
-
-static int pxapwmbl_update_status(struct backlight_device *bd)
-{
- int intensity;
- struct pxapwmbl_platform_data *bl = class_get_devdata(&bd->class_dev);
-
- intensity = bd->props.brightness;
-
- if (intensity > bd->props.max_brightness)
- intensity = bd->props.max_brightness;
-
- if (intensity < 0)
- intensity = 0;
-
- pxapwmbl_send_intensity(bl, intensity);
-
- return 0;
-}
-
-static int pxapwmbl_get_intensity(struct backlight_device *bd)
-{
- struct pxapwmbl_platform_data *bl = class_get_devdata(&bd->class_dev);
- return bl->intensity;
-}
-
-/*
- * Called when the battery is low to limit the backlight intensity.
- * If limit==0 clear any limit, otherwise limit the intensity
- */
-void pxapwmbl_limit_intensity(struct platform_device *pdev, int limit)
-{
- struct pxapwmbl_platform_data *bl = pdev->dev.platform_data;
-
- bl->limit = (limit ? 1 : 0);
- pxapwmbl_send_intensity(bl, bl->intensity);
-}
-EXPORT_SYMBOL(pxapwmbl_limit_intensity);
-
-static struct backlight_ops pxapwmbl_ops = {
- .get_brightness = pxapwmbl_get_intensity,
- .update_status = pxapwmbl_update_status,
-};
-
-static int pxapwmbl_probe(struct platform_device *pdev)
-{
- struct pxapwmbl_platform_data *bl = pdev->dev.platform_data;
-
- bl->dev = backlight_device_register ("pxapwm-bl", &pdev->dev,
- bl, &pxapwmbl_ops);
-
- bl->dev->props.max_brightness = bl->max_intensity;
-
- pxapwmbl_mach_turn_bl_on = bl->turn_bl_on;
- pxapwmbl_mach_turn_bl_off = bl->turn_bl_off;
-
- bl->limit = 0;
- bl->lock = SPIN_LOCK_UNLOCKED;
-
- bl->dev->props.brightness = bl->default_intensity;
- bl->dev->props.power = FB_BLANK_UNBLANK;
- bl->dev->props.fb_blank = FB_BLANK_UNBLANK;
-
- bl->off_threshold = 5;
-
- if (IS_ERR (bl->dev))
- return PTR_ERR (bl->dev);
-
- platform_set_drvdata(pdev, bl->dev);
-
- pxapwmbl_send_intensity(bl, bl->default_intensity);
- CKEN = CKEN | (bl->pwm?CKEN1_PWM1:CKEN0_PWM0);
- bl->intensity = bl->default_intensity;
- pxapwmbl_limit_intensity(pdev, 0);
-
- printk("PXA PWM backlight driver initialized.\n");
- return 0;
-}
-
-static int pxapwmbl_remove(struct platform_device *pdev)
-{
- struct pxapwmbl_platform_data *bl = pdev->dev.platform_data;
-
- pxapwmbl_send_intensity(bl, bl->default_intensity);
-
- backlight_device_unregister(bl->dev);
-
- printk("PXA PWM backlight driver unloaded\n");
- return 0;
-}
-
-static struct platform_driver pxapwmbl_driver = {
- .probe = pxapwmbl_probe,
- .remove = pxapwmbl_remove,
- .suspend = pxapwmbl_suspend,
- .resume = pxapwmbl_resume,
- .driver = {
- .name = "pxapwm-bl",
- },
-};
-
-static int __init pxapwmbl_init(void)
-{
- int pdreg = platform_driver_register(&pxapwmbl_driver);
-
- return pdreg;
-}
-
-static void __exit pxapwmbl_exit(void)
-{
- platform_driver_unregister(&pxapwmbl_driver);
-}
-
-module_init(pxapwmbl_init);
-module_exit(pxapwmbl_exit);
-
-MODULE_AUTHOR("Vladimir Pouzanov <far...@gm...>");
-MODULE_DESCRIPTION("XScale PWM Backlight Driver");
-MODULE_LICENSE("GPL");
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <mar...@us...> - 2007-08-23 17:00:28
|
Revision: 1258
http://hackndev.svn.sourceforge.net/hackndev/?rev=1258&view=rev
Author: marex_z71
Date: 2007-08-23 10:00:22 -0700 (Thu, 23 Aug 2007)
Log Message:
-----------
HnD: tree cleanups, preparations for upstreaming
Modified Paths:
--------------
linux4palm/linux/trunk/Makefile
Modified: linux4palm/linux/trunk/Makefile
===================================================================
--- linux4palm/linux/trunk/Makefile 2007-08-21 20:33:54 UTC (rev 1257)
+++ linux4palm/linux/trunk/Makefile 2007-08-23 17:00:22 UTC (rev 1258)
@@ -183,7 +183,7 @@
# Note: Some architectures assign CROSS_COMPILE in their arch/*/Makefile
ARCH := arm
-CROSS_COMPILE ?= arm-softfloat-linux-gnu-
+CROSS_COMPILE ?= arm-linux-
# Architecture as present in compile.h
UTS_MACHINE := $(ARCH)
@@ -293,7 +293,7 @@
DEPMOD = /sbin/depmod
KALLSYMS = scripts/kallsyms
PERL = perl
-CHECK = sparse -Wbitwise
+CHECK = sparse
CHECKFLAGS := -D__linux__ -Dlinux -D__STDC__ -Dunix -D__unix__ -Wbitwise $(CF)
MODFLAGS = -DMODULE
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <mar...@us...> - 2007-08-21 20:33:55
|
Revision: 1257
http://hackndev.svn.sourceforge.net/hackndev/?rev=1257&view=rev
Author: marex_z71
Date: 2007-08-21 13:33:54 -0700 (Tue, 21 Aug 2007)
Log Message:
-----------
HTC_Beetles: more formating (hope this is all)
Modified Paths:
--------------
linux4palm/linux/trunk/include/asm-arm/arch-pxa/htcsable-asic.h
linux4palm/linux/trunk/include/asm-arm/arch-pxa/htcsable-gpio.h
Modified: linux4palm/linux/trunk/include/asm-arm/arch-pxa/htcsable-asic.h
===================================================================
--- linux4palm/linux/trunk/include/asm-arm/arch-pxa/htcsable-asic.h 2007-08-21 16:30:37 UTC (rev 1256)
+++ linux4palm/linux/trunk/include/asm-arm/arch-pxa/htcsable-asic.h 2007-08-21 20:33:54 UTC (rev 1257)
@@ -24,45 +24,44 @@
/* ASIC3 GPIO A bank */
-#define GPIOA_I2C_PWR_ON 0 /* Output */ /* lkcl: guess!! */
-#define GPIOA_CODEC_ON 1 /* Output */ /* ak4641 codec on */
-#define GPIOA_HEADPHONE_PWR_ON 3 /* Output */ /* headphone power-on? */
-#define GPIOA_SPKMIC_PWR2_ON 6 /* Output */ /* speaker power-on */
-#define GPIOA_USB_PUEN 7 /* Output */
-#define GPIOA_LCD_PWR_5 15 /* Output */
+#define GPIOA_I2C_PWR_ON 0 /* Output */ /* lkcl: guess!! */
+#define GPIOA_CODEC_ON 1 /* Output */ /* ak4641 codec on */
+#define GPIOA_HEADPHONE_PWR_ON 3 /* Output */ /* headphone power-on? */
+#define GPIOA_SPKMIC_PWR2_ON 6 /* Output */ /* speaker power-on */
+#define GPIOA_USB_PUEN 7 /* Output */
+#define GPIOA_LCD_PWR_5 15 /* Output */
/* ASIC3 GPIO B bank */
-#define GPIOB_GSM_DCD 0 /* Input */ /* phone-related: not sure of name or purpose */
-#define GPIOB_BB_READY 2 /* Input */ /* phone-related: not sure of name or purpose */
-#define GPIOB_ACX_IRQ_N 5 /* Input */ /* acx wifi irq ? */
-#define GPIOB_USB_DETECT 6 /* Input */
-#define GPIOB_HEADPHONE 9 /* Input */ /* lkcl: guess!!! */
-#define GPIOB_CODEC_RESET 10 /* Output */ /* think this is right... */
-#define GPIOB_ACX_PWR_1 15 /* Output */ /* acx wifi power 1 */
+#define GPIOB_GSM_DCD 0 /* Input */ /* phone-related: not sure of name or purpose */
+#define GPIOB_BB_READY 2 /* Input */ /* phone-related: not sure of name or purpose */
+#define GPIOB_ACX_IRQ_N 5 /* Input */ /* acx wifi irq ? */
+#define GPIOB_USB_DETECT 6 /* Input */
+#define GPIOB_HEADPHONE 9 /* Input */ /* lkcl: guess!!! */
+#define GPIOB_CODEC_RESET 10 /* Output */ /* think this is right... */
+#define GPIOB_ACX_PWR_1 15 /* Output */ /* acx wifi power 1 */
/* ASIC3 GPIO C bank */
-#define GPIOC_BT_RESET 7 /* Output */
-#define GPIOC_PHONE_4 12 /* Output */ /* phone-related: not sure of name or purpose */
-#define GPIOC_ACX_RESET 8 /* Output */ /* acx wifi reset */
-#define GPIOC_PHONE_5 13 /* Output */ /* phone-related: not sure of name or purpose */
-#define GPIOC_LCD_PWR_1 9 /* Output */
-#define GPIOC_LCD_PWR_2 10 /* Output */
-#define GPIOC_ACX_PWR_3 15 /* Output */ /* acx wifi power 3 */
+#define GPIOC_BT_RESET 7 /* Output */
+#define GPIOC_ACX_RESET 8 /* Output */ /* acx wifi reset */
+#define GPIOC_PHONE_4 12 /* Output */ /* phone-related: not sure of name or purpose */
+#define GPIOC_PHONE_5 13 /* Output */ /* phone-related: not sure of name or purpose */
+#define GPIOC_LCD_PWR_1 9 /* Output */
+#define GPIOC_LCD_PWR_2 10 /* Output */
+#define GPIOC_ACX_PWR_3 15 /* Output */ /* acx wifi power 3 */
/* ASIC3 GPIO D bank */
-#define GPIOD_BT_PWR_ON 6 /* Output */
-#define GPIOD_PHONE_1 4 /* Output */ /* phone-related: not sure of name or purpose */
-#define GPIOD_ACX_PWR_2 3 /* Output */ /* acx wifi power 2 */
-#define GPIOD_PHONE_6 5 /* Output */ /* phone-related: not sure of name or purpose */
-#define GPIOD_PHONE_2 8 /* Output */ /* phone-related: not sure of name or purpose */
-#define GPIOD_VIBRATE 10 /* Output */ /* vibrate */
-#define GPIOD_LCD_BACKLIGHT 12 /* Output */
+#define GPIOD_BT_PWR_ON 6 /* Output */
+#define GPIOD_ACX_PWR_2 3 /* Output */ /* acx wifi power 2 */
+#define GPIOD_PHONE_1 4 /* Output */ /* phone-related: not sure of name or purpose */
+#define GPIOD_PHONE_2 8 /* Output */ /* phone-related: not sure of name or purpose */
+#define GPIOD_PHONE_6 5 /* Output */ /* phone-related: not sure of name or purpose */
+#define GPIOD_VIBRATE 10 /* Output */ /* vibrate */
+#define GPIOD_LCD_BACKLIGHT 12 /* Output */
extern struct platform_device htcsable_asic3;
#endif /* _HTCSABLE_ASIC_H_ */
-
Modified: linux4palm/linux/trunk/include/asm-arm/arch-pxa/htcsable-gpio.h
===================================================================
--- linux4palm/linux/trunk/include/asm-arm/arch-pxa/htcsable-gpio.h 2007-08-21 16:30:37 UTC (rev 1256)
+++ linux4palm/linux/trunk/include/asm-arm/arch-pxa/htcsable-gpio.h 2007-08-21 20:33:54 UTC (rev 1257)
@@ -11,93 +11,69 @@
#include <asm/arch/pxa-regs.h>
-#define GET_HTCSABLE_GPIO(gpio) \
- (GPLR(GPIO_NR_HTCSABLE_ ## gpio) & GPIO_bit(GPIO_NR_HTCSABLE_ ## gpio))
+/* Misc defines */
+#define GPIO_NR_HTCSABLE_KEY_ON_N 0
+#define GPIO_NR_HTCSABLE_GP_RST_N 1
-#define SET_HTCSABLE_GPIO(gpio, setp) \
-do { \
-if (setp) \
- GPSR(GPIO_NR_HTCSABLE_ ## gpio) = GPIO_bit(GPIO_NR_HTCSABLE_ ## gpio); \
-else \
- GPCR(GPIO_NR_HTCSABLE_ ## gpio) = GPIO_bit(GPIO_NR_HTCSABLE_ ## gpio); \
-} while (0)
+#define GPIO_NR_HTCSABLE_ASIC3_EXT_INT 9
+#define GPIO_NR_HTCSABLE_ASIC3_SDIO_INT_N 13
-#define SET_HTCSABLE_GPIO_N(gpio, setp) \
-do { \
-if (setp) \
- GPCR(GPIO_NR_HTCSABLE_ ## gpio ## _N) = GPIO_bit(GPIO_NR_HTCSABLE_ ## gpio ## _N); \
-else \
- GPSR(GPIO_NR_HTCSABLE_ ## gpio ## _N) = GPIO_bit(GPIO_NR_HTCSABLE_ ## gpio ## _N); \
-} while (0)
+#define EGPIO6_BT_3V3_ON (1<<6) /* Bluetooth 3.3V enable */
+#define GPIO_NR_HTCSABLE_POE_N_MD (48 | GPIO_ALT_FN_2_OUT | GPIO_DFLT_HIGH)
+#define GPIO_NR_HTCSABLE_PWE_N_MD (49 | GPIO_ALT_FN_2_OUT | GPIO_DFLT_HIGH)
-#define HTCSABLE_IRQ(gpio) \
- IRQ_GPIO(GPIO_NR_HTCSABLE_ ## gpio)
-
-#define GPIO_NR_HTCSABLE_KEY_ON_N 0
-#define GPIO_NR_HTCSABLE_GP_RST_N 1
+#define GPIO_NR_HTCSABLE_ACX 111
+#define GPIO_NR_HTCSABLE_PWM1OUT_MD (115 | GPIO_ALT_FN_3_OUT)
-#define GPIO_NR_HTCSABLE_PHONE_3 11 /* phone-related output */
+/* nope - this should be STUART!
+#define GPIO_NR_HTCSABLE_COM_RXD_MD (34 | GPIO_ALT_FN_1_IN)
+#define GPIO_NR_HTCSABLE_COM_CTS_MD (35 | GPIO_ALT_FN_1_IN)
+#define GPIO_NR_HTCSABLE_COM_TXD_MD (39 | GPIO_ALT_FN_2_OUT)
+#define GPIO_NR_HTCSABLE_COM_RTS_MD (41 | GPIO_ALT_FN_2_OUT)
+*/
-#define GPIO_NR_HTCSABLE_ASIC3_EXT_INT 9
-#define GPIO_NR_HTCSABLE_ASIC3_SDIO_INT_N 13
-
-#define GPIO_NR_HTCSABLE_I2S_BCK 28
-#define GPIO_NR_HTCSABLE_I2S_DIN 29
-#define GPIO_NR_HTCSABLE_I2S_DOUT 30
-#define GPIO_NR_HTCSABLE_I2S_SYNC 31
-
-#define GPIO_NR_HTCSABLE_I2S_SYSCLK 113
+/* Touchscreen */
+#define GPIO_NR_HTCSABLE_TOUCHSCREEN_SPI_CLK_MD (23 | GPIO_ALT_FN_2_IN)
+#define GPIO_NR_HTCSABLE_TOUCHSCREEN_SPI_CS_N_MD (24 | GPIO_ALT_FN_2_IN)
+#define GPIO_NR_HTCSABLE_TOUCHSCREEN_SPI_DO_MD (25 | GPIO_ALT_FN_2_OUT)
+#define GPIO_NR_HTCSABLE_TOUCHSCREEN_SPI_DI_MD (26 | GPIO_ALT_FN_1_IN)
#define GPIO_NR_HTCSABLE_TOUCHPANEL_IRQ_N 115
-#define EGPIO6_BT_3V3_ON (1<<6) /* Bluetooth 3.3V enable */
+/* I2S - sound */
+#define GPIO_NR_HTCSABLE_I2S_BCK 28
+#define GPIO_NR_HTCSABLE_I2S_DIN 29
+#define GPIO_NR_HTCSABLE_I2S_DOUT 30
+#define GPIO_NR_HTCSABLE_I2S_SYNC 31
+#define GPIO_NR_HTCSABLE_I2S_SYSCLK 113
-/* TODO: should be checked */
+#define GPIO_NR_HTCSABLE_I2S_BCK_MD (28 | GPIO_ALT_FN_1_OUT)
+#define GPIO_NR_HTCSABLE_I2S_DIN_MD (29 | GPIO_ALT_FN_2_IN)
+#define GPIO_NR_HTCSABLE_I2S_DOUT_MD (30 | GPIO_ALT_FN_1_OUT)
+#define GPIO_NR_HTCSABLE_I2S_SYNC_MD (31 | GPIO_ALT_FN_1_OUT)
+#define GPIO_NR_HTCSABLE_I2S_SYSCLK_MD (113 | GPIO_ALT_FN_1_OUT)
-#define GPIO_NR_HTCSABLE_TOUCHSCREEN_SPI_CLK_MD (23 | GPIO_ALT_FN_2_IN)
-#define GPIO_NR_HTCSABLE_TOUCHSCREEN_SPI_CS_N_MD (24 | GPIO_ALT_FN_2_IN)
-#define GPIO_NR_HTCSABLE_TOUCHSCREEN_SPI_DO_MD (25 | GPIO_ALT_FN_2_OUT)
-#define GPIO_NR_HTCSABLE_TOUCHSCREEN_SPI_DI_MD (26 | GPIO_ALT_FN_1_IN)
+/* UART */
+#define GPIO_NR_HTCSABLE_STD_RXD_MD (46 | GPIO_ALT_FN_2_IN)
+#define GPIO_NR_HTCSABLE_STD_TXD_MD (47 | GPIO_ALT_FN_1_OUT)
-#define GPIO_NR_HTCSABLE_I2S_BCK_MD (28 | GPIO_ALT_FN_1_OUT)
-#define GPIO_NR_HTCSABLE_I2S_DIN_MD (29 | GPIO_ALT_FN_2_IN)
-#define GPIO_NR_HTCSABLE_I2S_DOUT_MD (30 | GPIO_ALT_FN_1_OUT)
-#define GPIO_NR_HTCSABLE_I2S_SYNC_MD (31 | GPIO_ALT_FN_1_OUT)
-
-/* nope - this should be STUART!
-#define GPIO_NR_HTCSABLE_COM_RXD_MD (34 | GPIO_ALT_FN_1_IN)
-#define GPIO_NR_HTCSABLE_COM_CTS_MD (35 | GPIO_ALT_FN_1_IN)
-#define GPIO_NR_HTCSABLE_COM_TXD_MD (39 | GPIO_ALT_FN_2_OUT)
-#define GPIO_NR_HTCSABLE_COM_RTS_MD (41 | GPIO_ALT_FN_2_OUT)
-*/
-
-#define GPIO_NR_HTCSABLE_PHONE_RXD_MD (42 | GPIO_ALT_FN_1_IN) /* BTUART */
+/* Phone */
+#define GPIO_NR_HTCSABLE_PHONE_3 11 /* phone-related output */
+#define GPIO_NR_HTCSABLE_PHONE_RXD_MD (42 | GPIO_ALT_FN_1_IN) /* BTUART */
#define GPIO_NR_HTCSABLE_PHONE_TXD_MD (43 | GPIO_ALT_FN_2_OUT) /* BTUART */
-#define GPIO_NR_HTCSABLE_PHONE_UART_CTS_MD (44 | GPIO_ALT_FN_1_IN) /* BTUART */
-#define GPIO_NR_HTCSABLE_PHONE_UART_RTS_MD (45 | GPIO_ALT_FN_2_OUT) /* BTUART */
+#define GPIO_NR_HTCSABLE_PHONE_UART_CTS_MD (44 | GPIO_ALT_FN_1_IN) /* BTUART */
+#define GPIO_NR_HTCSABLE_PHONE_UART_RTS_MD (45 | GPIO_ALT_FN_2_OUT) /* BTUART */
-#define GPIO_NR_HTCSABLE_BT_RXD_MD (34 | GPIO_ALT_FN_1_IN) /* FFUART */
+/* Bluetooth */
+#define GPIO_NR_HTCSABLE_BT_RXD_MD (34 | GPIO_ALT_FN_1_IN) /* FFUART */
#define GPIO_NR_HTCSABLE_BT_TXD_MD (39 | GPIO_ALT_FN_2_OUT) /* FFUART */
-#define GPIO_NR_HTCSABLE_BT_UART_CTS_MD (35 | GPIO_ALT_FN_1_IN) /* FFUART */
+#define GPIO_NR_HTCSABLE_BT_UART_CTS_MD (35 | GPIO_ALT_FN_1_IN) /* FFUART */
#define GPIO_NR_HTCSABLE_BT_UART_RTS_MD (41 | GPIO_ALT_FN_2_OUT) /* FFUART */
-#define GPIO_NR_HTCSABLE_STD_RXD_MD (46 | GPIO_ALT_FN_2_IN)
-#define GPIO_NR_HTCSABLE_STD_TXD_MD (47 | GPIO_ALT_FN_1_OUT)
+/* I2C */
+#define GPIO_NR_HTCSABLE_I2C_SCL_MD (117 | GPIO_ALT_FN_1_OUT)
+#define GPIO_NR_HTCSABLE_I2C_SDA_MD (118 | GPIO_ALT_FN_1_OUT)
-#define GPIO_NR_HTCSABLE_POE_N_MD (48 | GPIO_ALT_FN_2_OUT | GPIO_DFLT_HIGH)
-#define GPIO_NR_HTCSABLE_PWE_N_MD (49 | GPIO_ALT_FN_2_OUT | GPIO_DFLT_HIGH)
-
-#define GPIO_NR_HTCSABLE_I2S_SYSCLK_MD (113 | GPIO_ALT_FN_1_OUT)
-
-#define GPIO_NR_HTCSABLE_ACX (111)
-#define GPIO_NR_HTCSABLE_PWM1OUT_MD (115 | GPIO_ALT_FN_3_OUT)
-
-#define GPIO_NR_HTCSABLE_I2C_SCL_MD (117 | GPIO_ALT_FN_1_OUT)
-#define GPIO_NR_HTCSABLE_I2C_SDA_MD (118 | GPIO_ALT_FN_1_OUT)
-
-/****************************************************************
- * Pull out keyboard
- ****************************************************************/
-
+/* Keyboard */
#define GPIO_NR_HTCSABLE_KP_MKIN0 100
#define GPIO_NR_HTCSABLE_KP_MKIN1 101
#define GPIO_NR_HTCSABLE_KP_MKIN2 102
@@ -116,21 +92,45 @@
#define GPIO_NR_HTCSABLE_KP_MKOUT6 40
#define GPIO_NR_HTCSABLE_KP_MKOUT7 22
-#define GPIO_NR_HTCSABLE_KP_MKIN0_MD (GPIO_NR_HTCSABLE_KP_MKIN0 | GPIO_ALT_FN_1_IN)
-#define GPIO_NR_HTCSABLE_KP_MKIN1_MD (GPIO_NR_HTCSABLE_KP_MKIN1 | GPIO_ALT_FN_1_IN)
-#define GPIO_NR_HTCSABLE_KP_MKIN2_MD (GPIO_NR_HTCSABLE_KP_MKIN2 | GPIO_ALT_FN_1_IN)
-#define GPIO_NR_HTCSABLE_KP_MKIN3_MD (GPIO_NR_HTCSABLE_KP_MKIN3 | GPIO_ALT_FN_3_IN)
-#define GPIO_NR_HTCSABLE_KP_MKIN4_MD (GPIO_NR_HTCSABLE_KP_MKIN4 | GPIO_ALT_FN_2_IN)
-#define GPIO_NR_HTCSABLE_KP_MKIN5_MD (GPIO_NR_HTCSABLE_KP_MKIN5 | GPIO_ALT_FN_1_IN)
-#define GPIO_NR_HTCSABLE_KP_MKIN6_MD (GPIO_NR_HTCSABLE_KP_MKIN6 | GPIO_ALT_FN_1_IN)
-#define GPIO_NR_HTCSABLE_KP_MKIN7_MD (GPIO_NR_HTCSABLE_KP_MKIN7 | GPIO_ALT_FN_3_IN)
+#define GPIO_NR_HTCSABLE_KP_MKIN0_MD (GPIO_NR_HTCSABLE_KP_MKIN0 | GPIO_ALT_FN_1_IN)
+#define GPIO_NR_HTCSABLE_KP_MKIN1_MD (GPIO_NR_HTCSABLE_KP_MKIN1 | GPIO_ALT_FN_1_IN)
+#define GPIO_NR_HTCSABLE_KP_MKIN2_MD (GPIO_NR_HTCSABLE_KP_MKIN2 | GPIO_ALT_FN_1_IN)
+#define GPIO_NR_HTCSABLE_KP_MKIN3_MD (GPIO_NR_HTCSABLE_KP_MKIN3 | GPIO_ALT_FN_3_IN)
+#define GPIO_NR_HTCSABLE_KP_MKIN4_MD (GPIO_NR_HTCSABLE_KP_MKIN4 | GPIO_ALT_FN_2_IN)
+#define GPIO_NR_HTCSABLE_KP_MKIN5_MD (GPIO_NR_HTCSABLE_KP_MKIN5 | GPIO_ALT_FN_1_IN)
+#define GPIO_NR_HTCSABLE_KP_MKIN6_MD (GPIO_NR_HTCSABLE_KP_MKIN6 | GPIO_ALT_FN_1_IN)
+#define GPIO_NR_HTCSABLE_KP_MKIN7_MD (GPIO_NR_HTCSABLE_KP_MKIN7 | GPIO_ALT_FN_3_IN)
-#define GPIO_NR_HTCSABLE_KP_MKOUT0_MD (GPIO_NR_HTCSABLE_KP_MKOUT0 | GPIO_ALT_FN_2_OUT)
-#define GPIO_NR_HTCSABLE_KP_MKOUT1_MD (GPIO_NR_HTCSABLE_KP_MKOUT1 | GPIO_ALT_FN_2_OUT)
-#define GPIO_NR_HTCSABLE_KP_MKOUT2_MD (GPIO_NR_HTCSABLE_KP_MKOUT2 | GPIO_ALT_FN_2_OUT)
-#define GPIO_NR_HTCSABLE_KP_MKOUT3_MD (GPIO_NR_HTCSABLE_KP_MKOUT3 | GPIO_ALT_FN_2_OUT)
-#define GPIO_NR_HTCSABLE_KP_MKOUT4_MD (GPIO_NR_HTCSABLE_KP_MKOUT4 | GPIO_ALT_FN_2_OUT)
-#define GPIO_NR_HTCSABLE_KP_MKOUT5_MD (GPIO_NR_HTCSABLE_KP_MKOUT5 | GPIO_ALT_FN_2_OUT)
-#define GPIO_NR_HTCSABLE_KP_MKOUT6_MD (GPIO_NR_HTCSABLE_KP_MKOUT6 | GPIO_ALT_FN_1_OUT)
-#define GPIO_NR_HTCSABLE_KP_MKOUT7_MD (GPIO_NR_HTCSABLE_KP_MKOUT7 | GPIO_ALT_FN_1_OUT)
+#define GPIO_NR_HTCSABLE_KP_MKOUT0_MD (GPIO_NR_HTCSABLE_KP_MKOUT0 | GPIO_ALT_FN_2_OUT)
+#define GPIO_NR_HTCSABLE_KP_MKOUT1_MD (GPIO_NR_HTCSABLE_KP_MKOUT1 | GPIO_ALT_FN_2_OUT)
+#define GPIO_NR_HTCSABLE_KP_MKOUT2_MD (GPIO_NR_HTCSABLE_KP_MKOUT2 | GPIO_ALT_FN_2_OUT)
+#define GPIO_NR_HTCSABLE_KP_MKOUT3_MD (GPIO_NR_HTCSABLE_KP_MKOUT3 | GPIO_ALT_FN_2_OUT)
+#define GPIO_NR_HTCSABLE_KP_MKOUT4_MD (GPIO_NR_HTCSABLE_KP_MKOUT4 | GPIO_ALT_FN_2_OUT)
+#define GPIO_NR_HTCSABLE_KP_MKOUT5_MD (GPIO_NR_HTCSABLE_KP_MKOUT5 | GPIO_ALT_FN_2_OUT)
+#define GPIO_NR_HTCSABLE_KP_MKOUT6_MD (GPIO_NR_HTCSABLE_KP_MKOUT6 | GPIO_ALT_FN_1_OUT)
+#define GPIO_NR_HTCSABLE_KP_MKOUT7_MD (GPIO_NR_HTCSABLE_KP_MKOUT7 | GPIO_ALT_FN_1_OUT)
+
+/* Macros */
+#define GET_HTCSABLE_GPIO(gpio) \
+ (GPLR(GPIO_NR_HTCSABLE_ ## gpio) & GPIO_bit(GPIO_NR_HTCSABLE_ ## gpio))
+
+#define SET_HTCSABLE_GPIO(gpio, setp) \
+do { \
+if (setp) \
+ GPSR(GPIO_NR_HTCSABLE_ ## gpio) = GPIO_bit(GPIO_NR_HTCSABLE_ ## gpio); \
+else \
+ GPCR(GPIO_NR_HTCSABLE_ ## gpio) = GPIO_bit(GPIO_NR_HTCSABLE_ ## gpio); \
+} while (0)
+
+#define SET_HTCSABLE_GPIO_N(gpio, setp) \
+do { \
+if (setp) \
+ GPCR(GPIO_NR_HTCSABLE_ ## gpio ## _N) = GPIO_bit(GPIO_NR_HTCSABLE_ ## gpio ## _N); \
+else \
+ GPSR(GPIO_NR_HTCSABLE_ ## gpio ## _N) = GPIO_bit(GPIO_NR_HTCSABLE_ ## gpio ## _N); \
+} while (0)
+
+#define HTCSABLE_IRQ(gpio) \
+ IRQ_GPIO(GPIO_NR_HTCSABLE_ ## gpio)
+
#endif /* _HTCSABLE_GPIO_H */
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <mar...@us...> - 2007-08-21 16:32:36
|
Revision: 1256
http://hackndev.svn.sourceforge.net/hackndev/?rev=1256&view=rev
Author: marex_z71
Date: 2007-08-21 09:30:37 -0700 (Tue, 21 Aug 2007)
Log Message:
-----------
HTC_Beetles: formating improvements, removal of useless ifdefs
Modified Paths:
--------------
linux4palm/linux/trunk/arch/arm/mach-pxa/htcsable/htcsable.c
Modified: linux4palm/linux/trunk/arch/arm/mach-pxa/htcsable/htcsable.c
===================================================================
--- linux4palm/linux/trunk/arch/arm/mach-pxa/htcsable/htcsable.c 2007-08-21 14:42:26 UTC (rev 1255)
+++ linux4palm/linux/trunk/arch/arm/mach-pxa/htcsable/htcsable.c 2007-08-21 16:30:37 UTC (rev 1256)
@@ -41,49 +41,20 @@
#include "htcsable_phone.h"
#endif
-/*
- * * Bluetooth - Relies on other loadable modules, like ASIC3 and Core,
- * * so make the calls indirectly through pointers. Requires that the
- * * hx4700 bluetooth module be loaded before any attempt to use
- * * bluetooth (obviously).
- * */
-
-#ifdef CONFIG_HTCSABLE_BT
-static struct htcsable_bt_funcs bt_funcs;
-
-static void
-htcsable_bt_configure( int state )
-{
- if (bt_funcs.configure != NULL)
- bt_funcs.configure( state );
-}
-#endif
-
-#ifdef CONFIG_HTCSABLE_PHONE
-static struct htcsable_phone_funcs phone_funcs;
-
-static void
-htcsable_phone_configure( int state )
-{
- if (phone_funcs.configure != NULL)
- phone_funcs.configure( state );
-}
-#endif
-
static struct pxafb_mode_info htcsable_lcd_modes[] = {
{
- .pixclock = 480769, // LCCR4 bit is set!
- .xres = 240,
- .yres = 240,
- .bpp = 16,
- .hsync_len = 4,
- .vsync_len = 2,
- .left_margin = 12,
- .right_margin = 8,
- .upper_margin = 3,
- .lower_margin = 3,
+ .pixclock = 480769, /* LCCR4 bit is set! */
+ .xres = 240,
+ .yres = 240,
+ .bpp = 16,
+ .hsync_len = 4,
+ .vsync_len = 2,
+ .left_margin = 12,
+ .right_margin = 8,
+ .upper_margin = 3,
+ .lower_margin = 3,
-// .sync = FB_SYNC_HOR_LOW_ACT|FB_SYNC_VERT_LOW_ACT,
+/* .sync = FB_SYNC_HOR_LOW_ACT|FB_SYNC_VERT_LOW_ACT, */
},
};
@@ -92,9 +63,9 @@
.modes = htcsable_lcd_modes,
.num_modes = ARRAY_SIZE(htcsable_lcd_modes),
- .lccr0 = 0x042000b1,
- .lccr3 = 0x04700019,
-// .lccr4 = 0x80000000,
+ .lccr0 = 0x042000b1,
+ .lccr3 = 0x04700019,
+/* .lccr4 = 0x80000000, */
};
@@ -103,29 +74,52 @@
extern struct platform_device htcsable_bl;
#endif
extern struct platform_device htcsable_keyboard;
-static struct platform_device htcsable_udc = { .name = "htcsable_udc", };
-static struct platform_device htcsable_ts = { .name = "htcsable_ts", };
-static struct platform_device htcsable_kbd = { .name = "htcsable_kbd", };
-static struct platform_device htcsable_buttons = { .name = "htcsable_buttons", };
-static struct platform_device htcsable_lcd = { .name = "htcsable_lcd", };
+static struct platform_device htcsable_udc = { .name = "htcsable_udc", };
+static struct platform_device htcsable_ts = { .name = "htcsable_ts", };
+static struct platform_device htcsable_kbd = { .name = "htcsable_kbd", };
+static struct platform_device htcsable_buttons = { .name = "htcsable_buttons", };
+static struct platform_device htcsable_lcd = { .name = "htcsable_lcd", };
-/* Bluetooth */
+/*
+ * Bluetooth - Relies on other loadable modules, like ASIC3 and Core,
+ * so make the calls indirectly through pointers. Requires that the
+ * hx4700 bluetooth module be loaded before any attempt to use
+ * bluetooth (obviously).
+ */
#ifdef CONFIG_HTCSABLE_BT
+static struct htcsable_bt_funcs bt_funcs;
+
+static void
+htcsable_bt_configure( int state )
+{
+ if (bt_funcs.configure)
+ bt_funcs.configure( state );
+}
+
static struct platform_device htcsable_bt = {
- .name = "htcsable_bt",
- .id = -1,
- .dev = {
+ .name = "htcsable_bt",
+ .id = -1,
+ .dev = {
.platform_data = &bt_funcs,
},
};
#endif
#ifdef CONFIG_HTCSABLE_PHONE
+static struct htcsable_phone_funcs phone_funcs;
+
+static void
+htcsable_phone_configure( int state )
+{
+ if (phone_funcs.configure)
+ phone_funcs.configure( state );
+}
+
static struct platform_device htcsable_phone = {
- .name = "htcsable_phone",
- .id = -1,
- .dev = {
+ .name = "htcsable_phone",
+ .id = -1,
+ .dev = {
.platform_data = &phone_funcs,
},
};
@@ -150,56 +144,57 @@
};
static struct tmio_mmc_hwconfig htcsable_mmc_hwconfig = {
- .mmc_get_ro = TMIO_WP_ALWAYS_RW,
+ .mmc_get_ro = TMIO_WP_ALWAYS_RW,
};
static struct asic3_platform_data htcsable_asic3_platform_data = {
- /*
- * These registers are configured as they are on Wince.
- *
- * A0 is set high by default as we think it's the i2c initialisation
- * pin. that means less worry about having to have a pxa-i2s module
- * init function on a per-device basis. nasty hack, really.
- */
+ /*
+ * These registers are configured as they are on Wince.
+ *
+ * A0 is set high by default as we think it's the i2c initialisation
+ * pin. that means less worry about having to have a pxa-i2s module
+ * init function on a per-device basis. nasty hack, really.
+ */
.gpio_a = {
- .dir = 0xbffb,
- .init = 0xc084,
- .sleep_out = 0x0000,
- .batt_fault_out = 0x0000,
- .alt_function = 0x6000, //
- .sleep_conf = 0x000c,
+ .dir = 0xbffb,
+ .init = 0xc084,
+ .sleep_out = 0x0000,
+ .batt_fault_out = 0x0000,
+ .alt_function = 0x6000,
+ .sleep_conf = 0x000c,
},
.gpio_b = {
- .dir = 0xe408,
- .init = 0x1762,
- .sleep_out = 0x0000,
- .batt_fault_out = 0x0000,
- .alt_function = 0x0000, //
- .sleep_conf = 0x000c,
+ .dir = 0xe408,
+ .init = 0x1762,
+ .sleep_out = 0x0000,
+ .batt_fault_out = 0x0000,
+ .alt_function = 0x0000,
+ .sleep_conf = 0x000c,
},
.gpio_c = {
- .dir = 0xfff7,
- .init = 0x8640,
- .sleep_out = 0x0000,
- .batt_fault_out = 0x0000,
- .alt_function = 0x0038, // GPIOC_LED_RED | GPIOC_LED_GREEN | GPIOC_LED_BLUE
- .sleep_conf = 0x000c,
+ .dir = 0xfff7,
+ .init = 0x8640,
+ .sleep_out = 0x0000,
+ .batt_fault_out = 0x0000,
+ .alt_function = 0x0038, /* GPIOC_LED_RED | GPIOC_LED_GREEN | GPIOC_LED_BLUE */
+ .sleep_conf = 0x000c,
},
.gpio_d = {
- .dir = 0xffff,
- .init = 0xd000,
- .sleep_out = 0x0000,
- .batt_fault_out = 0x0000,
- .alt_function = 0x0000, //
- .sleep_conf = 0x0008,
+ .dir = 0xffff,
+ .init = 0xd000,
+ .sleep_out = 0x0000,
+ .batt_fault_out = 0x0000,
+ .alt_function = 0x0000,
+ .sleep_conf = 0x0008,
},
- .bus_shift = 1,
- .irq_base = HTCSABLE_ASIC3_IRQ_BASE,
- .child_devs = htcsable_asic3_devices,
- .num_child_devs = ARRAY_SIZE(htcsable_asic3_devices),
- .tmio_mmc_hwconfig = &htcsable_mmc_hwconfig,
+ .bus_shift = 1,
+ .irq_base = HTCSABLE_ASIC3_IRQ_BASE,
+
+ .child_devs = htcsable_asic3_devices,
+ .num_child_devs = ARRAY_SIZE(htcsable_asic3_devices),
+ .tmio_mmc_hwconfig = &htcsable_mmc_hwconfig,
};
static struct resource htcsable_asic3_resources[] = {
@@ -214,101 +209,101 @@
.flags = IORESOURCE_IRQ,
},
[2] = {
- .start = HTCSABLE_ASIC3_MMC_PHYS,
- .end = HTCSABLE_ASIC3_MMC_PHYS + IPAQ_ASIC3_MAP_SIZE,
- .flags = IORESOURCE_MEM,
+ .start = HTCSABLE_ASIC3_MMC_PHYS,
+ .end = HTCSABLE_ASIC3_MMC_PHYS + IPAQ_ASIC3_MAP_SIZE,
+ .flags = IORESOURCE_MEM,
},
[3] = {
- .start = HTCSABLE_IRQ(ASIC3_SDIO_INT_N),
- .flags = IORESOURCE_IRQ,
+ .start = HTCSABLE_IRQ(ASIC3_SDIO_INT_N),
+ .flags = IORESOURCE_IRQ,
},
};
struct platform_device htcsable_asic3 = {
- .name = "asic3",
- .id = 0,
- .num_resources = ARRAY_SIZE(htcsable_asic3_resources),
- .resource = htcsable_asic3_resources,
- .dev = { .platform_data = &htcsable_asic3_platform_data, },
+ .name = "asic3",
+ .id = 0,
+ .num_resources = ARRAY_SIZE(htcsable_asic3_resources),
+ .resource = htcsable_asic3_resources,
+ .dev = {
+ .platform_data = &htcsable_asic3_platform_data,
+ },
};
EXPORT_SYMBOL(htcsable_asic3);
/* Core Hardware Functions */
struct platform_device htcsable_core = {
- .name = "htcsable_core",
- .id = 0,
- .dev = {
- .platform_data = NULL,
- },
+ .name = "htcsable_core",
+ .id = 0,
+ .dev = {
+ .platform_data = NULL,
+ },
};
static struct platform_device *devices[] __initdata = {
- &htcsable_core,
+ &htcsable_core,
};
#ifdef CONFIG_HTCSABLE_BT
static struct platform_pxa_serial_funcs htcsable_pxa_bt_funcs = {
- .configure = htcsable_bt_configure,
+ .configure = htcsable_bt_configure,
};
#endif
#ifdef CONFIG_HTCSABLE_PHONE
static struct platform_pxa_serial_funcs htcsable_pxa_phone_funcs = {
- .configure = htcsable_phone_configure,
+ .configure = htcsable_phone_configure,
#if 0
- .ioctl = htcsable_phone_ioctl,
+ .ioctl = htcsable_phone_ioctl,
#endif
};
#endif
static void __init htcsable_map_io(void)
{
- struct ffuart_pxa_port *sport;
+ struct ffuart_pxa_port *sport;
- pxa_map_io();
+ pxa_map_io();
- /* Is this correct? If yes, please add comment, that vendor was drunk when did soldering. */
+ /* Is this correct? If yes, please add comment, that vendor was drunk when did soldering. */
#ifdef CONFIG_HTCSABLE_BT
- pxa_set_ffuart_info(&htcsable_pxa_bt_funcs);
+ pxa_set_ffuart_info(&htcsable_pxa_bt_funcs);
#endif
#ifdef CONFIG_HTCSABLE_PHONE
- pxa_set_btuart_info(&htcsable_pxa_phone_funcs);
+ pxa_set_btuart_info(&htcsable_pxa_phone_funcs);
#endif
-// sport = platform_get_drvdata(&ffuart device);
-// printk("sport=0x%x\n", (unsigned int)sport);
+/* sport = platform_get_drvdata(&ffuart device);
+ printk("sport=0x%x\n", (unsigned int)sport); */
- pxa_set_cken(CKEN8_I2S, 0);
- printk("CKEN=0x%x CKEN11_USB=0x%x\n", CKEN, CKEN11_USB);
- pxa_set_cken(CKEN11_USB, 1);
- printk("CKEN=0x%x\n", CKEN);
+ pxa_set_cken(CKEN8_I2S, 0);
+ printk("CKEN=0x%x CKEN11_USB=0x%x\n", CKEN, CKEN11_USB);
+ pxa_set_cken(CKEN11_USB, 1);
+ printk("CKEN=0x%x\n", CKEN);
}
static void __init htcsable_init(void)
{
- set_pxa_fb_info( &htcsable_lcd_screen );
+ set_pxa_fb_info( &htcsable_lcd_screen );
- pxa_gpio_mode( GPIO_NR_HTCSABLE_I2C_SCL_MD );
- pxa_gpio_mode( GPIO_NR_HTCSABLE_I2C_SDA_MD );
+ pxa_gpio_mode( GPIO_NR_HTCSABLE_I2C_SCL_MD );
+ pxa_gpio_mode( GPIO_NR_HTCSABLE_I2C_SDA_MD );
- platform_device_register(&htcsable_asic3);
- platform_add_devices( devices, ARRAY_SIZE(devices) );
+ platform_device_register(&htcsable_asic3);
+ platform_add_devices( devices, ARRAY_SIZE(devices) );
}
-#ifdef CONFIG_MACH_HTCBEETLES
MACHINE_START(HTCBEETLES, "HTC Beetles")
.phys_io = 0x40000000,
.io_pg_offst = (io_p2v(0x40000000) >> 18) & 0xfffc,
.boot_params = 0xa0000100,
.map_io = htcsable_map_io,
.init_irq = pxa_init_irq,
- .timer = &pxa_timer,
+ .timer = &pxa_timer,
.init_machine = htcsable_init,
MACHINE_END
-#endif
-#ifdef CONFIG_MACH_HW6900
+
MACHINE_START(HW6900, "HTC Sable")
.phys_io = 0x40000000,
.io_pg_offst = (io_p2v(0x40000000) >> 18) & 0xfffc,
@@ -318,4 +313,3 @@
.timer = &pxa_timer,
.init_machine = htcsable_init,
MACHINE_END
-#endif
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <far...@us...> - 2007-08-21 14:23:39
|
Revision: 1254
http://hackndev.svn.sourceforge.net/hackndev/?rev=1254&view=rev
Author: farcaller
Date: 2007-08-21 07:23:37 -0700 (Tue, 21 Aug 2007)
Log Message:
-----------
rt: fixed compilation bug with locks in led code
Modified Paths:
--------------
linux4palm/linux/branches/rt/drivers/leds/ledtrig-shared.c
Modified: linux4palm/linux/branches/rt/drivers/leds/ledtrig-shared.c
===================================================================
--- linux4palm/linux/branches/rt/drivers/leds/ledtrig-shared.c 2007-08-21 14:11:59 UTC (rev 1253)
+++ linux4palm/linux/branches/rt/drivers/leds/ledtrig-shared.c 2007-08-21 14:23:37 UTC (rev 1254)
@@ -40,7 +40,7 @@
if (!trig) return;
- read_lock(trig->trigger.leddev_list_lock);
+ read_lock(&trig->trigger.leddev_list_lock);
if (b == LED_FULL) {
trig->cnt++;
}
@@ -55,7 +55,7 @@
led_set_brightness(led_cdev, b);
}
return_unlock:
- read_unlock(trig->trigger.leddev_list_lock);
+ read_unlock(&trig->trigger.leddev_list_lock);
return;
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <far...@us...> - 2007-08-21 14:12:03
|
Revision: 1253
http://hackndev.svn.sourceforge.net/hackndev/?rev=1253&view=rev
Author: farcaller
Date: 2007-08-21 07:11:59 -0700 (Tue, 21 Aug 2007)
Log Message:
-----------
rt: branched kernel to rt (performance/batterysave experimental fork)
Added Paths:
-----------
linux4palm/linux/branches/rt/
Copied: linux4palm/linux/branches/rt (from rev 1252, linux4palm/linux/trunk)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <mar...@us...> - 2007-08-21 10:57:19
|
Revision: 1252
http://hackndev.svn.sourceforge.net/hackndev/?rev=1252&view=rev
Author: marex_z71
Date: 2007-08-21 03:57:15 -0700 (Tue, 21 Aug 2007)
Log Message:
-----------
HTC_Beetles: part 2
Modified Paths:
--------------
linux4palm/linux/trunk/arch/arm/mach-pxa/Kconfig
linux4palm/linux/trunk/arch/arm/mach-pxa/Makefile
Modified: linux4palm/linux/trunk/arch/arm/mach-pxa/Kconfig
===================================================================
--- linux4palm/linux/trunk/arch/arm/mach-pxa/Kconfig 2007-08-21 10:56:33 UTC (rev 1251)
+++ linux4palm/linux/trunk/arch/arm/mach-pxa/Kconfig 2007-08-21 10:57:15 UTC (rev 1252)
@@ -36,7 +36,6 @@
source "arch/arm/mach-pxa/magician/Kconfig"
source "arch/arm/mach-pxa/htcapache/Kconfig"
source "arch/arm/mach-pxa/htcblueangel/Kconfig"
-source "arch/arm/mach-pxa/htcbeetles/Kconfig"
source "arch/arm/mach-pxa/htcsable/Kconfig"
source "arch/arm/mach-pxa/htcathena/Kconfig"
source "arch/arm/mach-pxa/aximx3/Kconfig"
Modified: linux4palm/linux/trunk/arch/arm/mach-pxa/Makefile
===================================================================
--- linux4palm/linux/trunk/arch/arm/mach-pxa/Makefile 2007-08-21 10:56:33 UTC (rev 1251)
+++ linux4palm/linux/trunk/arch/arm/mach-pxa/Makefile 2007-08-21 10:57:15 UTC (rev 1252)
@@ -36,7 +36,7 @@
obj-$(CONFIG_MACH_MAGICIAN) += magician/
obj-$(CONFIG_MACH_HTCAPACHE) += htcapache/
obj-$(CONFIG_MACH_BLUEANGEL) += htcblueangel/
-obj-$(CONFIG_MACH_HTCBEETLES) += htcbeetles/
+obj-$(CONFIG_MACH_HTCBEETLES) += htcsable/
obj-$(CONFIG_MACH_HTCATHENA) += htcathena/
obj-$(CONFIG_MACH_HW6900) += htcsable/
obj-$(CONFIG_ARCH_ROVERP1) += rover/
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <mar...@us...> - 2007-08-21 10:56:35
|
Revision: 1251
http://hackndev.svn.sourceforge.net/hackndev/?rev=1251&view=rev
Author: marex_z71
Date: 2007-08-21 03:56:33 -0700 (Tue, 21 Aug 2007)
Log Message:
-----------
HTC_Beetles: major update
Modified Paths:
--------------
linux4palm/linux/trunk/arch/arm/mach-pxa/htcsable/Kconfig
linux4palm/linux/trunk/arch/arm/mach-pxa/htcsable/Makefile
linux4palm/linux/trunk/arch/arm/mach-pxa/htcsable/htcsable.c
linux4palm/linux/trunk/arch/arm/mach-pxa/htcsable/htcsable_rom.c
Removed Paths:
-------------
linux4palm/linux/trunk/arch/arm/mach-pxa/htcbeetles/
linux4palm/linux/trunk/include/asm-arm/arch-pxa/htcbeetles-asic.h
linux4palm/linux/trunk/include/asm-arm/arch-pxa/htcbeetles-gpio.h
linux4palm/linux/trunk/include/asm-arm/arch-pxa/htcbeetles.h
Modified: linux4palm/linux/trunk/arch/arm/mach-pxa/htcsable/Kconfig
===================================================================
--- linux4palm/linux/trunk/arch/arm/mach-pxa/htcsable/Kconfig 2007-08-20 22:56:19 UTC (rev 1250)
+++ linux4palm/linux/trunk/arch/arm/mach-pxa/htcsable/Kconfig 2007-08-21 10:56:33 UTC (rev 1251)
@@ -1,27 +1,64 @@
-menuconfig MACH_HW6900
- bool "HTC Sable (hPaq hw69xx)"
+menuconfig HTC_HW6X00
+ bool "HTC Beetles/Sable (hPaq hw65xx/hw69xx)"
select PXA27x
select BOARD_IRQ_MAP_BIG
select KEYBOARD_GPIO
select KEYBOARD_PXA27x
help
Say Y here if you intend to run this kernel on a
- HTC Sable (iPAQ hw691x). Currently there is only basic support
- for this PDA.
+ HTC Beetles or Sable (iPAQ hw651x or hw691x).
+ Currently there is only basic support for this PDA.
+config MACH_HTCBEETLES
+ bool "HTC Beetles (hPaq hw65xx)"
+ depends on HTC_HW6X00
+ select PXA27x
+ select BOARD_IRQ_MAP_BIG
+ select KEYBOARD_GPIO
+ select KEYBOARD_PXA27x
+ help
+ HTC Beetles (iPAQ hw651x) support.
+
+config MACH_HW6900
+ bool "HTC Sable (hPaq hw69xx)"
+ depends on HTC_HW6X00
+ select PXA27x
+ select BOARD_IRQ_MAP_BIG
+ select KEYBOARD_GPIO
+ select KEYBOARD_PXA27x
+ help
+ HTC Sable (iPAQ hw691x) support.
+
config HTCSABLE_LCD
- tristate "HTC Sable LCD"
- depends on MACH_HW6900 && HTC_ASIC3 && LCD_CLASS_DEVICE
+ tristate "HTC Beetles/Sable LCD"
+ depends on HTC_HW6X00 && ( MACH_HW6900 || MACH_HTCBEETLES ) && HTC_ASIC3 && LCD_CLASS_DEVICE
help
This driver provides support for changing power and brightness
on HTC Sable LCD display.
config HTCSABLE_BACKLIGHT
- bool "HTC Sable Backlight"
- depends on MACH_HW6900 && HTC_ASIC3 && BACKLIGHT_CLASS_DEVICE
+ bool "HTC Beetles/Sable Backlight"
+ depends on HTC_HW6X00 && ( MACH_HW6900 || MACH_HTCBEETLES ) && HTC_ASIC3 && BACKLIGHT_CLASS_DEVICE
help
This driver provides support for changing power and brightness
on HTC Sable LCD backlight.
+config HTCSABLE_ROM
+ bool "HTC Beetles/Sable ROM"
+ depends on HTC_HW6X00 && ( MACH_HW6900 || MACH_HTCBEETLES ) && HTC_ASIC3 && MTD
+ help
+ This driver provides access to devices' ROM
+ (where IPL bootloader) is stored.
+config HTCSABLE_BT
+ bool "HTC Beetles/Sable Bluetooth"
+ depends on HTC_HW6X00 && ( MACH_HW6900 || MACH_HTCBEETLES ) && HTC_ASIC3 && BT
+ help
+ This driver provides support for Bluetooth module.
+
+config HTCSABLE_PHONE
+ bool "HTC Beetles/Sable Phone"
+ depends on HTC_HW6X00 && ( MACH_HW6900 || MACH_HTCBEETLES ) && HTC_ASIC3
+ help
+ This driver provides support for Phone module.
Modified: linux4palm/linux/trunk/arch/arm/mach-pxa/htcsable/Makefile
===================================================================
--- linux4palm/linux/trunk/arch/arm/mach-pxa/htcsable/Makefile 2007-08-20 22:56:19 UTC (rev 1250)
+++ linux4palm/linux/trunk/arch/arm/mach-pxa/htcsable/Makefile 2007-08-21 10:56:33 UTC (rev 1251)
@@ -1,16 +1,17 @@
#
# Makefile for HTC Sable
#
-obj-$(CONFIG_MACH_HW6900) += htcsable.o htcsable_udc.o \
+obj-$(CONFIG_MACH_HTCBEETLES) += htcsable.o htcsable_udc.o \
htcsable_ts2.o \
htcsable_pm.o \
htcsable_core.o \
htcsable_keyboard.o \
htcsable_buttons.o \
- htcsable_kbd.o \
- htcsable_bt.o htcsable_phone.o \
- htcsable_rom.o
+ htcsable_kbd.o
-obj-$(CONFIG_HTCSABLE_LCD) += htcsable_lcd.o
-obj-$(CONFIG_HTCSABLE_BACKLIGHT) += htcsable_bl.o
+obj-$(CONFIG_HTCSABLE_BT) += htcsable_bt.o
+obj-$(CONFIG_HTCSABLE_PHONE) += htcsable_phone.o
+obj-$(CONFIG_HTCSABLE_ROM) += htcsable_rom.o
+obj-$(CONFIG_HTCSABLE_LCD) += htcsable_lcd.o
+obj-$(CONFIG_HTCSABLE_BACKLIGHT) += htcsable_bl.o
Modified: linux4palm/linux/trunk/arch/arm/mach-pxa/htcsable/htcsable.c
===================================================================
--- linux4palm/linux/trunk/arch/arm/mach-pxa/htcsable/htcsable.c 2007-08-20 22:56:19 UTC (rev 1250)
+++ linux4palm/linux/trunk/arch/arm/mach-pxa/htcsable/htcsable.c 2007-08-21 10:56:33 UTC (rev 1251)
@@ -33,8 +33,13 @@
#include "../generic.h"
+#ifdef CONFIG_HTCSABLE_BT
#include "htcsable_bt.h"
+#endif
+
+#ifdef CONFIG_HTCSABLE_PHONE
#include "htcsable_phone.h"
+#endif
/*
* * Bluetooth - Relies on other loadable modules, like ASIC3 and Core,
@@ -43,6 +48,7 @@
* * bluetooth (obviously).
* */
+#ifdef CONFIG_HTCSABLE_BT
static struct htcsable_bt_funcs bt_funcs;
static void
@@ -51,7 +57,9 @@
if (bt_funcs.configure != NULL)
bt_funcs.configure( state );
}
+#endif
+#ifdef CONFIG_HTCSABLE_PHONE
static struct htcsable_phone_funcs phone_funcs;
static void
@@ -60,6 +68,7 @@
if (phone_funcs.configure != NULL)
phone_funcs.configure( state );
}
+#endif
static struct pxafb_mode_info htcsable_lcd_modes[] = {
{
@@ -102,6 +111,7 @@
/* Bluetooth */
+#ifdef CONFIG_HTCSABLE_BT
static struct platform_device htcsable_bt = {
.name = "htcsable_bt",
.id = -1,
@@ -109,7 +119,9 @@
.platform_data = &bt_funcs,
},
};
+#endif
+#ifdef CONFIG_HTCSABLE_PHONE
static struct platform_device htcsable_phone = {
.name = "htcsable_phone",
.id = -1,
@@ -117,8 +129,8 @@
.platform_data = &phone_funcs,
},
};
+#endif
-
static struct platform_device *htcsable_asic3_devices[] __initdata = {
&htcsable_ts,
&htcsable_kbd,
@@ -128,8 +140,12 @@
#ifdef CONFIG_HTCSABLE_BACKLIGHT
&htcsable_bl,
#endif
+#ifdef CONFIG_HTCSABLE_BT
&htcsable_bt,
+#endif
+#ifdef CONFIG_HTCSABLE_PHONE
&htcsable_phone,
+#endif
&htcsable_udc,
};
@@ -231,15 +247,20 @@
&htcsable_core,
};
+#ifdef CONFIG_HTCSABLE_BT
static struct platform_pxa_serial_funcs htcsable_pxa_bt_funcs = {
.configure = htcsable_bt_configure,
};
+#endif
+
+#ifdef CONFIG_HTCSABLE_PHONE
static struct platform_pxa_serial_funcs htcsable_pxa_phone_funcs = {
.configure = htcsable_phone_configure,
#if 0
.ioctl = htcsable_phone_ioctl,
#endif
};
+#endif
static void __init htcsable_map_io(void)
{
@@ -248,8 +269,12 @@
pxa_map_io();
/* Is this correct? If yes, please add comment, that vendor was drunk when did soldering. */
+#ifdef CONFIG_HTCSABLE_BT
pxa_set_ffuart_info(&htcsable_pxa_bt_funcs);
+#endif
+#ifdef CONFIG_HTCSABLE_PHONE
pxa_set_btuart_info(&htcsable_pxa_phone_funcs);
+#endif
// sport = platform_get_drvdata(&ffuart device);
// printk("sport=0x%x\n", (unsigned int)sport);
@@ -272,6 +297,18 @@
platform_add_devices( devices, ARRAY_SIZE(devices) );
}
+#ifdef CONFIG_MACH_HTCBEETLES
+MACHINE_START(HTCBEETLES, "HTC Beetles")
+ .phys_io = 0x40000000,
+ .io_pg_offst = (io_p2v(0x40000000) >> 18) & 0xfffc,
+ .boot_params = 0xa0000100,
+ .map_io = htcsable_map_io,
+ .init_irq = pxa_init_irq,
+ .timer = &pxa_timer,
+ .init_machine = htcsable_init,
+MACHINE_END
+#endif
+#ifdef CONFIG_MACH_HW6900
MACHINE_START(HW6900, "HTC Sable")
.phys_io = 0x40000000,
.io_pg_offst = (io_p2v(0x40000000) >> 18) & 0xfffc,
@@ -281,4 +318,4 @@
.timer = &pxa_timer,
.init_machine = htcsable_init,
MACHINE_END
-
+#endif
Modified: linux4palm/linux/trunk/arch/arm/mach-pxa/htcsable/htcsable_rom.c
===================================================================
--- linux4palm/linux/trunk/arch/arm/mach-pxa/htcsable/htcsable_rom.c 2007-08-20 22:56:19 UTC (rev 1250)
+++ linux4palm/linux/trunk/arch/arm/mach-pxa/htcsable/htcsable_rom.c 2007-08-21 10:56:33 UTC (rev 1251)
@@ -37,10 +37,8 @@
{
int retval = 0;
-#if defined(CONFIG_MACH_BLUEANGEL)
- if (! machine_is_sable() )
+ if (!(machine_is_hw6900() || machine_is_htcbeetles()))
return -ENODEV;
-#endif
sable_map.virt = ioremap(sable_map.phys, sable_map.size);
if (!sable_map.virt) {
Deleted: linux4palm/linux/trunk/include/asm-arm/arch-pxa/htcbeetles-asic.h
===================================================================
--- linux4palm/linux/trunk/include/asm-arm/arch-pxa/htcbeetles-asic.h 2007-08-20 22:56:19 UTC (rev 1250)
+++ linux4palm/linux/trunk/include/asm-arm/arch-pxa/htcbeetles-asic.h 2007-08-21 10:56:33 UTC (rev 1251)
@@ -1,39 +0,0 @@
-/*
- * include/asm/arm/arch-pxa/htcbeetles-asic.h
- *
- * Authors: Giuseppe Zompatori <giu...@ya...>
- *
- * based on previews work, see below:
- *
- * include/asm/arm/arch-pxa/hx4700-asic.h
- * Copyright (c) 2004 SDG Systems, LLC
- *
- */
-
-#ifndef _HTCBEETLES_ASIC_H_
-#define _HTCBEETLES_ASIC_H_
-
-#include <asm/hardware/ipaq-asic3.h>
-
-/* ASIC3 */
-
-#define HTCBEETLES_ASIC3_GPIO_PHYS PXA_CS4_PHYS
-#define HTCBEETLES_ASIC3_MMC_PHYS PXA_CS3_PHYS+0x02000000
-
-/* TODO: some information is missing here :) */
-
-/* ASIC3 GPIO A bank */
-
-#define GPIOA_USB_PUEN 7 /* Output */
-
-/* ASIC3 GPIO B bank */
-
-#define GPIOB_USB_DETECT 6 /* Input */
-
-/* ASIC3 GPIO C bank */
-
-/* ASIC3 GPIO D bank */
-
-#endif /* _HTCBEETLES_ASIC_H_ */
-
-extern struct platform_device htcbeetles_asic3;
Deleted: linux4palm/linux/trunk/include/asm-arm/arch-pxa/htcbeetles-gpio.h
===================================================================
--- linux4palm/linux/trunk/include/asm-arm/arch-pxa/htcbeetles-gpio.h 2007-08-20 22:56:19 UTC (rev 1250)
+++ linux4palm/linux/trunk/include/asm-arm/arch-pxa/htcbeetles-gpio.h 2007-08-21 10:56:33 UTC (rev 1251)
@@ -1,80 +0,0 @@
-/*
- * include/asm-arm/arch-pxa/htcbeetles-gpio.h
- * History:
- *
- * 2004-12-10 Michael Opdenacker. Wrote down GPIO settings as identified by Jamey Hicks.
- * Reused the h2200-gpio.h file as a template.
- */
-
-#ifndef _HTCBEETLES_GPIO_H_
-#define _HTCBEETLES_GPIO_H_
-
-#include <asm/arch/pxa-regs.h>
-
-#define GET_HTCBEETLES_GPIO(gpio) \
- (GPLR(GPIO_NR_HTCBEETLES_ ## gpio) & GPIO_bit(GPIO_NR_HTCBEETLES_ ## gpio))
-
-#define SET_HTCBEETLES_GPIO(gpio, setp) \
-do { \
-if (setp) \
- GPSR(GPIO_NR_HTCBEETLES_ ## gpio) = GPIO_bit(GPIO_NR_HTCBEETLES_ ## gpio); \
-else \
- GPCR(GPIO_NR_HTCBEETLES_ ## gpio) = GPIO_bit(GPIO_NR_HTCBEETLES_ ## gpio); \
-} while (0)
-
-#define SET_HTCBEETLES_GPIO_N(gpio, setp) \
-do { \
-if (setp) \
- GPCR(GPIO_NR_HTCBEETLES_ ## gpio ## _N) = GPIO_bit(GPIO_NR_HTCBEETLES_ ## gpio ## _N); \
-else \
- GPSR(GPIO_NR_HTCBEETLES_ ## gpio ## _N) = GPIO_bit(GPIO_NR_HTCBEETLES_ ## gpio ## _N); \
-} while (0)
-
-#define HTCBEETLES_IRQ(gpio) \
- IRQ_GPIO(GPIO_NR_HTCBEETLES_ ## gpio)
-
-#define GPIO_NR_HTCBEETLES_KEY_ON_N 0
-#define GPIO_NR_HTCBEETLES_GP_RST_N 1
-
-#define GPIO_NR_HTCBEETLES_ASIC3_EXT_INT 9
-#define GPIO_NR_HTCBEETLES_ASIC3_SDIO_INT_N 13
-
-#define GPIO_NR_HTCBEETLES_TOUCHPANEL_IRQ_N 115
-
-/* TODO: should be checked */
-
-#define GPIO_NR_HTCBEETLES_TOUCHSCREEN_SPI_CLK_MD (23 | GPIO_ALT_FN_2_IN)
-#define GPIO_NR_HTCBEETLES_TOUCHSCREEN_SPI_CS_N_MD (24 | GPIO_ALT_FN_2_IN)
-#define GPIO_NR_HTCBEETLES_TOUCHSCREEN_SPI_DO_MD (25 | GPIO_ALT_FN_2_OUT)
-#define GPIO_NR_HTCBEETLES_TOUCHSCREEN_SPI_DI_MD (26 | GPIO_ALT_FN_1_IN)
-
-#define GPIO_NR_HTCBEETLES_I2S_BCK_MD (28 | GPIO_ALT_FN_1_OUT)
-#define GPIO_NR_HTCBEETLES_I2S_DIN_MD (29 | GPIO_ALT_FN_2_IN)
-#define GPIO_NR_HTCBEETLES_I2S_DOUT_MD (30 | GPIO_ALT_FN_1_OUT)
-#define GPIO_NR_HTCBEETLES_I2S_SYNC_MD (31 | GPIO_ALT_FN_1_OUT)
-
-#define GPIO_NR_HTCBEETLES_COM_RXD_MD (34 | GPIO_ALT_FN_1_IN)
-#define GPIO_NR_HTCBEETLES_COM_CTS_MD (35 | GPIO_ALT_FN_1_IN)
-
-#define GPIO_NR_HTCBEETLES_COM_TXD_MD (39 | GPIO_ALT_FN_2_OUT)
-#define GPIO_NR_HTCBEETLES_COM_RTS_MD (41 | GPIO_ALT_FN_2_OUT)
-
-#define GPIO_NR_HTCBEETLES_BT_RXD_MD (42 | GPIO_ALT_FN_1_IN)
-#define GPIO_NR_HTCBEETLES_BT_TXD_MD (43 | GPIO_ALT_FN_2_OUT)
-#define GPIO_NR_HTCBEETLES_BT_UART_CTS_MD (44 | GPIO_ALT_FN_1_IN)
-#define GPIO_NR_HTCBEETLES_BT_UART_RTS_MD (45 | GPIO_ALT_FN_2_OUT)
-
-#define GPIO_NR_HTCBEETLES_STD_RXD_MD (46 | GPIO_ALT_FN_2_IN)
-#define GPIO_NR_HTCBEETLES_STD_TXD_MD (47 | GPIO_ALT_FN_1_OUT)
-
-#define GPIO_NR_HTCBEETLES_POE_N_MD (48 | GPIO_ALT_FN_2_OUT | GPIO_DFLT_HIGH)
-#define GPIO_NR_HTCBEETLES_PWE_N_MD (49 | GPIO_ALT_FN_2_OUT | GPIO_DFLT_HIGH)
-
-#define GPIO_NR_HTCBEETLES_I2S_SYSCLK_MD (113 | GPIO_ALT_FN_1_OUT)
-
-#define GPIO_NR_HTCBEETLES_PWM1OUT_MD (115 | GPIO_ALT_FN_3_OUT)
-
-#define GPIO_NR_HTCBEETLES_I2C_SCL_MD (117 | GPIO_ALT_FN_1_OUT)
-#define GPIO_NR_HTCBEETLES_I2C_SDA_MD (118 | GPIO_ALT_FN_1_OUT)
-
-#endif /* _HTCBEETLES_GPIO_H */
Deleted: linux4palm/linux/trunk/include/asm-arm/arch-pxa/htcbeetles.h
===================================================================
--- linux4palm/linux/trunk/include/asm-arm/arch-pxa/htcbeetles.h 2007-08-20 22:56:19 UTC (rev 1250)
+++ linux4palm/linux/trunk/include/asm-arm/arch-pxa/htcbeetles.h 2007-08-21 10:56:33 UTC (rev 1251)
@@ -1,3 +0,0 @@
-#include <asm/arch/irqs.h>
-
-#define HTCBEETLES_ASIC3_IRQ_BASE IRQ_BOARD_START
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <mar...@us...> - 2007-08-20 22:56:20
|
Revision: 1250
http://hackndev.svn.sourceforge.net/hackndev/?rev=1250&view=rev
Author: marex_z71
Date: 2007-08-20 15:56:19 -0700 (Mon, 20 Aug 2007)
Log Message:
-----------
PalmTX: more realistic approach of NAND flash driver ... iolines mapped to CS1 and gpio driven control lines
Modified Paths:
--------------
linux4palm/linux/trunk/drivers/mtd/nand/palmtx.c
linux4palm/linux/trunk/include/asm-arm/arch-pxa/palmtx-gpio.h
Modified: linux4palm/linux/trunk/drivers/mtd/nand/palmtx.c
===================================================================
--- linux4palm/linux/trunk/drivers/mtd/nand/palmtx.c 2007-08-20 17:05:21 UTC (rev 1249)
+++ linux4palm/linux/trunk/drivers/mtd/nand/palmtx.c 2007-08-20 22:56:19 UTC (rev 1250)
@@ -31,6 +31,19 @@
#include <asm/memory.h>
#include <asm/mach-types.h>
+/* Select the chip by setting nCE to low */
+#define NAND_CTL_SETNCE 1
+/* Deselect the chip by setting nCE to high */
+#define NAND_CTL_CLRNCE 2
+/* Select the command latch by setting CLE to high */
+#define NAND_CTL_SETCLE 3
+/* Deselect the command latch by setting CLE to low */
+#define NAND_CTL_CLRCLE 4
+/* Select the address latch by setting ALE to high */
+#define NAND_CTL_SETALE 5
+/* Deselect the address latch by setting ALE to low */
+#define NAND_CTL_CLRALE 6
+
/*
* MTD structure
*/
@@ -56,16 +69,34 @@
/*
* hardware specific access to control-lines
- *
- * NAND_NCE: bit 0 - don't care
- * NAND_CLE: bit 1 - address bit 2
- * NAND_ALE: bit 2 - address bit 3
*/
static void palmtx_hwcontrol(struct mtd_info *mtd, int cmd,
unsigned int ctrl)
{
struct nand_chip *chip = mtd->priv;
+ if (ctrl & NAND_CTRL_CHANGE) {
+ switch (cmd) {
+ case NAND_CTL_SETCLE:
+ SET_PALMTX_GPIO(NAND_CLE,1);
+ break;
+ case NAND_CTL_CLRCLE:
+ SET_PALMTX_GPIO(NAND_CLE,0);
+ break;
+ case NAND_CTL_SETALE:
+ SET_PALMTX_GPIO(NAND_ALE,1);
+ break;
+ case NAND_CTL_CLRALE:
+ SET_PALMTX_GPIO(NAND_ALE,0);
+ break;
+ case NAND_CTL_SETNCE:
+ SET_PALMTX_GPIO(NAND_NCE,1);
+ break;
+ case NAND_CTL_CLRNCE:
+ SET_PALMTX_GPIO(NAND_NCE,0);
+ break;
+ }
+ }
if (cmd != NAND_CMD_NONE)
writeb(cmd, (void __iomem *)((unsigned long)chip->IO_ADDR_W));
}
Modified: linux4palm/linux/trunk/include/asm-arm/arch-pxa/palmtx-gpio.h
===================================================================
--- linux4palm/linux/trunk/include/asm-arm/arch-pxa/palmtx-gpio.h 2007-08-20 17:05:21 UTC (rev 1249)
+++ linux4palm/linux/trunk/include/asm-arm/arch-pxa/palmtx-gpio.h 2007-08-20 22:56:19 UTC (rev 1250)
@@ -97,7 +97,10 @@
/* NAND Flash ... these GPIOs are probably incorrect! */
#define GPIO_NR_PALMTX_NAND_POWER 19
-#define GPIO_NR_PALMTX_NAND_READY 37
+#define GPIO_NR_PALMTX_NAND_READY 115
+#define GPIO_NR_PALMTX_NAND_CLE 79
+#define GPIO_NR_PALMTX_NAND_ALE 113
+#define GPIO_NR_PALMTX_NAND_NCE 114
/* INTERRUPTS */
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <mar...@us...> - 2007-08-20 17:05:23
|
Revision: 1249
http://hackndev.svn.sourceforge.net/hackndev/?rev=1249&view=rev
Author: marex_z71
Date: 2007-08-20 10:05:21 -0700 (Mon, 20 Aug 2007)
Log Message:
-----------
PalmTX: add some tweaks to still not working NAND flash driver
Modified Paths:
--------------
linux4palm/linux/trunk/drivers/mtd/nand/palmtx.c
linux4palm/linux/trunk/include/asm-arm/arch-pxa/palmtx-init.h
Modified: linux4palm/linux/trunk/drivers/mtd/nand/palmtx.c
===================================================================
--- linux4palm/linux/trunk/drivers/mtd/nand/palmtx.c 2007-08-20 16:06:44 UTC (rev 1248)
+++ linux4palm/linux/trunk/drivers/mtd/nand/palmtx.c 2007-08-20 17:05:21 UTC (rev 1249)
@@ -67,7 +67,7 @@
struct nand_chip *chip = mtd->priv;
if (cmd != NAND_CMD_NONE)
- writeb(cmd, (void __iomem *)((unsigned long)chip->IO_ADDR_W | ((ctrl & 0x6) << 1)));
+ writeb(cmd, (void __iomem *)((unsigned long)chip->IO_ADDR_W));
}
/*
@@ -118,9 +118,11 @@
palmtx_nand_mtd->owner = THIS_MODULE;
/*
- * Enable VPEN
+ * Enable VPEN ... isnt it on all the time?
*/
+#if 0
SET_PALMTX_GPIO(NAND_POWER, 1);
+#endif
/* insert callbacks */
this->IO_ADDR_R = nandaddr;
Modified: linux4palm/linux/trunk/include/asm-arm/arch-pxa/palmtx-init.h
===================================================================
--- linux4palm/linux/trunk/include/asm-arm/arch-pxa/palmtx-init.h 2007-08-20 16:06:44 UTC (rev 1248)
+++ linux4palm/linux/trunk/include/asm-arm/arch-pxa/palmtx-init.h 2007-08-20 17:05:21 UTC (rev 1249)
@@ -19,10 +19,12 @@
#define _INCLUDE_PALMTX_INIT_H_
+#include <asm/arch/pxa-regs.h>
+
/* Various addresses */
-#define PALMTX_PHYS_FLASH_START 0x00000000 /* ChipSelect 0 */
-#define PALMTX_PHYS_NAND_START 0x04000000 /* ChipSelect 1 */
+#define PALMTX_PHYS_FLASH_START PXA_CS0_PHYS /* ChipSelect 0 */
+#define PALMTX_PHYS_NAND_START PXA_CS1_PHYS /* ChipSelect 1 */
#define PALMTX_PHYS_RAM_START 0xa0000000
#define PALMTX_PHYS_IO_START 0x40000000
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <mar...@us...> - 2007-08-20 16:06:46
|
Revision: 1248
http://hackndev.svn.sourceforge.net/hackndev/?rev=1248&view=rev
Author: marex_z71
Date: 2007-08-20 09:06:44 -0700 (Mon, 20 Aug 2007)
Log Message:
-----------
PalmZ72: some more cleanup
Modified Paths:
--------------
linux4palm/linux/trunk/include/asm-arm/arch-pxa/palmz72-gpio.h
Modified: linux4palm/linux/trunk/include/asm-arm/arch-pxa/palmz72-gpio.h
===================================================================
--- linux4palm/linux/trunk/include/asm-arm/arch-pxa/palmz72-gpio.h 2007-08-20 16:04:15 UTC (rev 1247)
+++ linux4palm/linux/trunk/include/asm-arm/arch-pxa/palmz72-gpio.h 2007-08-20 16:06:44 UTC (rev 1248)
@@ -43,7 +43,7 @@
/* IRDA */
#define GPIO_NR_PALMZ72_IR_SD 49
-#define GPIO_NR_PALMZ72_ICP_RXD 46
+#define GPIO_NR_PALMZ72_ICP_RXD 46
#define GPIO_NR_PALMZ72_ICP_TXD 47
#define GPIO_NR_PALMZ72_ICP_RXD_MD (GPIO_NR_PALMZ72_ICP_RXD | GPIO_ALT_FN_1_IN)
@@ -56,7 +56,7 @@
#define GPIO_NR_PALMZ72_BT_CTS 44
#define GPIO_NR_PALMZ72_BT_RTS 45
#define GPIO_NR_PALMZ72_BT_RESET 83
-#define GPIO_NR_PALMZ72_BT_POWER 17
+#define GPIO_NR_PALMZ72_BT_POWER 17
#define GPIO_NR_PALMZ72_BT_RXD_MD (GPIO_NR_PALMZ72_BT_RXD | GPIO_ALT_FN_1_IN)
#define GPIO_NR_PALMZ72_BT_TXD_MD (GPIO_NR_PALMZ72_BT_TXD | GPIO_ALT_FN_2_OUT)
@@ -71,7 +71,7 @@
/* USB */
#define GPIO_NR_PALMZ72_USB_DETECT 15
-#define GPIO_NR_PALMZ72_USB_POWER 95
+#define GPIO_NR_PALMZ72_USB_POWER 95
#define GPIO_NR_PALMZ72_USB_PULLUP 12
#define IRQ_GPIO_PALMZ72_USB_DETECT IRQ_GPIO(GPIO_NR_PALMZ72_USB_DETECT)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <mar...@us...> - 2007-08-20 16:04:18
|
Revision: 1247
http://hackndev.svn.sourceforge.net/hackndev/?rev=1247&view=rev
Author: marex_z71
Date: 2007-08-20 09:04:15 -0700 (Mon, 20 Aug 2007)
Log Message:
-----------
PalmZ72: use tabs and C-style comments :F
Modified Paths:
--------------
linux4palm/linux/trunk/include/asm-arm/arch-pxa/palmz72-gpio.h
Modified: linux4palm/linux/trunk/include/asm-arm/arch-pxa/palmz72-gpio.h
===================================================================
--- linux4palm/linux/trunk/include/asm-arm/arch-pxa/palmz72-gpio.h 2007-08-20 15:43:00 UTC (rev 1246)
+++ linux4palm/linux/trunk/include/asm-arm/arch-pxa/palmz72-gpio.h 2007-08-20 16:04:15 UTC (rev 1247)
@@ -20,48 +20,48 @@
#define GPIO_NR_PALMZ72_KP_DKIN7 13 /* Voice button */
-#define GPIO_NR_PALMZ72_KP_MKOUT0 103 // up, right, calendar, power
-#define GPIO_NR_PALMZ72_KP_MKOUT1 104 // contacts, camera,
-#define GPIO_NR_PALMZ72_KP_MKOUT2 105 // down, left, center, music,
+#define GPIO_NR_PALMZ72_KP_MKOUT0 103 /* up, right, calendar, power */
+#define GPIO_NR_PALMZ72_KP_MKOUT1 104 /* contacts, camera */
+#define GPIO_NR_PALMZ72_KP_MKOUT2 105 /* down, left, center, music */
-#define GPIO_NR_PALMZ72_KP_MKIN0_MD (GPIO_NR_PALMZ72_KP_MKIN0 | GPIO_ALT_FN_1_IN)
-#define GPIO_NR_PALMZ72_KP_MKIN1_MD (GPIO_NR_PALMZ72_KP_MKIN1 | GPIO_ALT_FN_1_IN)
-#define GPIO_NR_PALMZ72_KP_MKIN2_MD (GPIO_NR_PALMZ72_KP_MKIN2 | GPIO_ALT_FN_1_IN)
-#define GPIO_NR_PALMZ72_KP_MKIN3_MD (GPIO_NR_PALMZ72_KP_MKIN3 | GPIO_ALT_FN_3_IN)
+#define GPIO_NR_PALMZ72_KP_MKIN0_MD (GPIO_NR_PALMZ72_KP_MKIN0 | GPIO_ALT_FN_1_IN)
+#define GPIO_NR_PALMZ72_KP_MKIN1_MD (GPIO_NR_PALMZ72_KP_MKIN1 | GPIO_ALT_FN_1_IN)
+#define GPIO_NR_PALMZ72_KP_MKIN2_MD (GPIO_NR_PALMZ72_KP_MKIN2 | GPIO_ALT_FN_1_IN)
+#define GPIO_NR_PALMZ72_KP_MKIN3_MD (GPIO_NR_PALMZ72_KP_MKIN3 | GPIO_ALT_FN_3_IN)
-#define GPIO_NR_PALMZ72_KP_MKOUT0_MD (GPIO_NR_PALMZ72_KP_MKOUT0 | GPIO_ALT_FN_2_OUT)
-#define GPIO_NR_PALMZ72_KP_MKOUT1_MD (GPIO_NR_PALMZ72_KP_MKOUT1 | GPIO_ALT_FN_2_OUT)
-#define GPIO_NR_PALMZ72_KP_MKOUT2_MD (GPIO_NR_PALMZ72_KP_MKOUT2 | GPIO_ALT_FN_2_OUT)
+#define GPIO_NR_PALMZ72_KP_MKOUT0_MD (GPIO_NR_PALMZ72_KP_MKOUT0 | GPIO_ALT_FN_2_OUT)
+#define GPIO_NR_PALMZ72_KP_MKOUT1_MD (GPIO_NR_PALMZ72_KP_MKOUT1 | GPIO_ALT_FN_2_OUT)
+#define GPIO_NR_PALMZ72_KP_MKOUT2_MD (GPIO_NR_PALMZ72_KP_MKOUT2 | GPIO_ALT_FN_2_OUT)
/* LED */
-#define GPIO_NR_PALMZ72_LED 88
-#define GPIO_NR_PALMZ72_LED_MD (GPIO_NR_PALMZ72_LED | GPIO_ALT_FN_1_OUT)
+#define GPIO_NR_PALMZ72_LED 88
+#define GPIO_NR_PALMZ72_LED_MD (GPIO_NR_PALMZ72_LED | GPIO_ALT_FN_1_OUT)
/* IRDA */
-#define GPIO_NR_PALMZ72_IR_SD 49
+#define GPIO_NR_PALMZ72_IR_SD 49
#define GPIO_NR_PALMZ72_ICP_RXD 46
#define GPIO_NR_PALMZ72_ICP_TXD 47
-#define GPIO_NR_PALMZ72_ICP_RXD_MD (GPIO_NR_PALMZ72_ICP_RXD | GPIO_ALT_FN_1_IN)
-#define GPIO_NR_PALMZ72_ICP_TXD_MD (GPIO_NR_PALMZ72_ICP_TXD | GPIO_ALT_FN_2_OUT)
+#define GPIO_NR_PALMZ72_ICP_RXD_MD (GPIO_NR_PALMZ72_ICP_RXD | GPIO_ALT_FN_1_IN)
+#define GPIO_NR_PALMZ72_ICP_TXD_MD (GPIO_NR_PALMZ72_ICP_TXD | GPIO_ALT_FN_2_OUT)
/* Bluetooth */
-#define GPIO_NR_PALMZ72_BT_RXD 42
-#define GPIO_NR_PALMZ72_BT_TXD 43
-#define GPIO_NR_PALMZ72_BT_CTS 44
-#define GPIO_NR_PALMZ72_BT_RTS 45
-#define GPIO_NR_PALMZ72_BT_RESET 83
-#define GPIO_NR_PALMZ72_BT_POWER 17
+#define GPIO_NR_PALMZ72_BT_RXD 42
+#define GPIO_NR_PALMZ72_BT_TXD 43
+#define GPIO_NR_PALMZ72_BT_CTS 44
+#define GPIO_NR_PALMZ72_BT_RTS 45
+#define GPIO_NR_PALMZ72_BT_RESET 83
+#define GPIO_NR_PALMZ72_BT_POWER 17
-#define GPIO_NR_PALMZ72_BT_RXD_MD (GPIO_NR_PALMZ72_BT_RXD | GPIO_ALT_FN_1_IN)
-#define GPIO_NR_PALMZ72_BT_TXD_MD (GPIO_NR_PALMZ72_BT_TXD | GPIO_ALT_FN_2_OUT)
-#define GPIO_NR_PALMZ72_BT_UART_CTS_MD (GPIO_NR_PALMZ72_BT_CTS | GPIO_ALT_FN_1_IN)
-#define GPIO_NR_PALMZ72_BT_UART_RTS_MD (GPIO_NR_PALMZ72_BT_RTS | GPIO_ALT_FN_2_OUT)
+#define GPIO_NR_PALMZ72_BT_RXD_MD (GPIO_NR_PALMZ72_BT_RXD | GPIO_ALT_FN_1_IN)
+#define GPIO_NR_PALMZ72_BT_TXD_MD (GPIO_NR_PALMZ72_BT_TXD | GPIO_ALT_FN_2_OUT)
+#define GPIO_NR_PALMZ72_BT_UART_CTS_MD (GPIO_NR_PALMZ72_BT_CTS | GPIO_ALT_FN_1_IN)
+#define GPIO_NR_PALMZ72_BT_UART_RTS_MD (GPIO_NR_PALMZ72_BT_RTS | GPIO_ALT_FN_2_OUT)
/* Wolfson WM9712 */
@@ -70,14 +70,14 @@
/* USB */
-#define GPIO_NR_PALMZ72_USB_DETECT 15
-#define GPIO_NR_PALMZ72_USB_POWER 95
-#define GPIO_NR_PALMZ72_USB_PULLUP 12
-#define IRQ_GPIO_PALMZ72_USB_DETECT IRQ_GPIO(GPIO_NR_PALMZ72_USB_DETECT)
+#define GPIO_NR_PALMZ72_USB_DETECT 15
+#define GPIO_NR_PALMZ72_USB_POWER 95
+#define GPIO_NR_PALMZ72_USB_PULLUP 12
+#define IRQ_GPIO_PALMZ72_USB_DETECT IRQ_GPIO(GPIO_NR_PALMZ72_USB_DETECT)
/* Power */
-#define GPIO_NR_PALMZ72_POWER_DETECT 0 //battery low level indicator??
+#define GPIO_NR_PALMZ72_POWER_DETECT 0 /* battery low level indicator?? */
#define GPIO_NR_PALMZ72_LCD_POWER 96
/* SD/MMC */
@@ -94,7 +94,7 @@
#define GPIO_NR_PALMZ72_GPIO_RESET 1
#define IRQ_GPIO_PALMZ72_GPIO_RESET IRQ_GPIO(GPIO_NR_PALMZ72_GPIO_RESET)
-#define GPIO_NR_PALMZ72_SCREEN 19 //screen on when this GPIO is 1
+#define GPIO_NR_PALMZ72_SCREEN 19 /* screen on when this GPIO is 1 */
/* Utility macros */
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
