Menu
▾
▴
[Hackndev-commit] SF.net SVN: hackndev: [1318] linux4palm/linux/branches/ cleanup-branch-never-commit
|
From: <hap...@us...> - 2007-09-14 14:31:50
|
Revision: 1318
http://hackndev.svn.sourceforge.net/hackndev/?rev=1318&view=rev
Author: happy-slapin
Date: 2007-09-14 07:31:39 -0700 (Fri, 14 Sep 2007)
Log Message:
-----------
cleanup: Devices
Modified Paths:
--------------
linux4palm/linux/branches/cleanup-branch-never-commit/arch/arm/mach-pxa/Kconfig
linux4palm/linux/branches/cleanup-branch-never-commit/arch/arm/mach-pxa/Makefile
linux4palm/linux/branches/cleanup-branch-never-commit/arch/arm/mach-pxa/magician/magician.c
linux4palm/linux/branches/cleanup-branch-never-commit/arch/arm/mach-pxa/pxa27x.c
linux4palm/linux/branches/cleanup-branch-never-commit/fs/Kconfig
linux4palm/linux/branches/cleanup-branch-never-commit/include/asm-arm/arch-pxa/gpio.h
linux4palm/linux/branches/cleanup-branch-never-commit/include/asm-arm/arch-pxa/h5400-gpio.h
linux4palm/linux/branches/cleanup-branch-never-commit/include/asm-arm/arch-pxa/htcapache-gpio.h
linux4palm/linux/branches/cleanup-branch-never-commit/include/asm-m32r/errno.h
linux4palm/linux/branches/cleanup-branch-never-commit/include/asm-m32r/ioctls.h
linux4palm/linux/branches/cleanup-branch-never-commit/include/asm-m32r/rtc.h
linux4palm/linux/branches/cleanup-branch-never-commit/include/asm-m32r/syscall.h
linux4palm/linux/branches/cleanup-branch-never-commit/include/asm-m32r/timex.h
linux4palm/linux/branches/cleanup-branch-never-commit/include/asm-m32r/unaligned.h
linux4palm/linux/branches/cleanup-branch-never-commit/include/linux/magic.h
linux4palm/linux/branches/cleanup-branch-never-commit/include/linux/namei.h
linux4palm/linux/branches/cleanup-branch-never-commit/sound/arm/htcapache_audio.c
linux4palm/linux/branches/cleanup-branch-never-commit/sound/soc/pxa/h5000.c
Modified: linux4palm/linux/branches/cleanup-branch-never-commit/arch/arm/mach-pxa/Kconfig
===================================================================
--- linux4palm/linux/branches/cleanup-branch-never-commit/arch/arm/mach-pxa/Kconfig 2007-09-14 13:15:44 UTC (rev 1317)
+++ linux4palm/linux/branches/cleanup-branch-never-commit/arch/arm/mach-pxa/Kconfig 2007-09-14 14:31:39 UTC (rev 1318)
@@ -54,6 +54,7 @@
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/plat-recon/Kconfig"
config MACH_GHI270HG
bool "Grayhill Duramax HG"
Modified: linux4palm/linux/branches/cleanup-branch-never-commit/arch/arm/mach-pxa/Makefile
===================================================================
--- linux4palm/linux/branches/cleanup-branch-never-commit/arch/arm/mach-pxa/Makefile 2007-09-14 13:15:44 UTC (rev 1317)
+++ linux4palm/linux/branches/cleanup-branch-never-commit/arch/arm/mach-pxa/Makefile 2007-09-14 14:31:39 UTC (rev 1318)
@@ -58,6 +58,8 @@
obj-$(CONFIG_MACH_XSCALE_PALMTREO650) += palmt650/
obj-$(CONFIG_MACH_XSCALE_TREO680) += palmt680/
obj-$(CONFIG_MACH_T700WX) += palmt700wx/
+obj-$(CONFIG_MACH_RECON) += plat-recon/
+obj-$(CONFIG_MACH_LOOXC550) += looxc550/
# Support for blinky lights
led-y := leds.o
Modified: linux4palm/linux/branches/cleanup-branch-never-commit/arch/arm/mach-pxa/magician/magician.c
===================================================================
--- linux4palm/linux/branches/cleanup-branch-never-commit/arch/arm/mach-pxa/magician/magician.c 2007-09-14 13:15:44 UTC (rev 1317)
+++ linux4palm/linux/branches/cleanup-branch-never-commit/arch/arm/mach-pxa/magician/magician.c 2007-09-14 14:31:39 UTC (rev 1318)
@@ -186,20 +186,21 @@
struct htc_egpio_pinInfo egpio_pins[] = {
/* Output pins that default on */
{
- .pin_nr = EGPIO_MAGICIAN_GSM_RESET - MAGICIAN_EGPIO_BASE,
+ .gpio = EGPIO_MAGICIAN_GSM_RESET,
.type = HTC_EGPIO_TYPE_OUTPUT,
.output_initial = 1,
},
{
- .pin_nr = EGPIO_MAGICIAN_IN_SEL1 - MAGICIAN_EGPIO_BASE,
+ .gpio = EGPIO_MAGICIAN_IN_SEL1,
.type = HTC_EGPIO_TYPE_OUTPUT,
.output_initial = 1,
},
/* Input pins with associated IRQ */
{
- .pin_nr = EGPIO_MAGICIAN_EP_INSERT - MAGICIAN_EGPIO_BASE,
+ .gpio = EGPIO_MAGICIAN_EP_INSERT,
.type = HTC_EGPIO_TYPE_INPUT,
- .input_irq = 1 /* IRQ_MAGICIAN_EP_IRQ - IRQ_BOARD_START */,
+ .input_irq = MAGICIAN_EGPIO(3, 1),
+ /* 'pin' corresponding to IRQ_MAGICIAN_EP_IRQ */
},
};
Modified: linux4palm/linux/branches/cleanup-branch-never-commit/arch/arm/mach-pxa/pxa27x.c
===================================================================
--- linux4palm/linux/branches/cleanup-branch-never-commit/arch/arm/mach-pxa/pxa27x.c 2007-09-14 13:15:44 UTC (rev 1317)
+++ linux4palm/linux/branches/cleanup-branch-never-commit/arch/arm/mach-pxa/pxa27x.c 2007-09-14 14:31:39 UTC (rev 1318)
@@ -205,7 +205,6 @@
static struct platform_device *devices[] __initdata = {
&ohci_device,
- &pxacamera_device,
};
static int __init pxa27x_init(void)
Modified: linux4palm/linux/branches/cleanup-branch-never-commit/fs/Kconfig
===================================================================
--- linux4palm/linux/branches/cleanup-branch-never-commit/fs/Kconfig 2007-09-14 13:15:44 UTC (rev 1317)
+++ linux4palm/linux/branches/cleanup-branch-never-commit/fs/Kconfig 2007-09-14 14:31:39 UTC (rev 1318)
@@ -1371,70 +1371,6 @@
If unsure, say N.
-config SQUASHFS
- tristate "SquashFS 3.2 - Squashed file system support"
- select ZLIB_INFLATE
- help
- Saying Y here includes support for SquashFS 3.2 (a Compressed Read-Only File
- System). Squashfs is a highly compressed read-only filesystem for Linux.
- It uses zlib compression to compress both files, inodes and directories.
- Inodes in the system are very small and all blocks are packed to minimise
- data overhead. Block sizes greater than 4K are supported up to a maximum of 64K.
- SquashFS 3.1 supports 64 bit filesystems and files (larger than 4GB), full
- uid/gid information, hard links and timestamps.
-
- Squashfs is intended for general read-only filesystem use, for archival
- use (i.e. in cases where a .tar.gz file may be used), and in embedded
- systems where low overhead is needed. Further information and filesystem tools
- are available from http://squashfs.sourceforge.net.
-
- If you want to compile this as a module ( = code which can be
- inserted in and removed from the running kernel whenever you want),
- say M here and read <file:Documentation/modules.txt>. The module
- will be called squashfs. Note that the root file system (the one
- containing the directory /) cannot be compiled as a module.
-
- If unsure, say N.
-
-config SQUASHFS_EMBEDDED
- bool "Additional options for memory-constrained systems"
- depends on SQUASHFS
- default n
- help
- Saying Y here allows you to specify cache sizes and how Squashfs
- allocates memory. This is only intended for memory constrained
- systems.
-
- If unsure, say N.
-
-config SQUASHFS_FRAGMENT_CACHE_SIZE
- int "Number of fragments cached" if SQUASHFS_EMBEDDED
- depends on SQUASHFS
- default "3"
- help
- By default SquashFS caches the last 3 fragments read from
- the filesystem. Increasing this amount may mean SquashFS
- has to re-read fragments less often from disk, at the expense
- of extra system memory. Decreasing this amount will mean
- SquashFS uses less memory at the expense of extra reads from disk.
-
- Note there must be at least one cached fragment. Anything
- much more than three will probably not make much difference.
-
-config SQUASHFS_VMALLOC
- bool "Use Vmalloc rather than Kmalloc" if SQUASHFS_EMBEDDED
- depends on SQUASHFS
- default n
- help
- By default SquashFS uses kmalloc to obtain fragment cache memory.
- Kmalloc memory is the standard kernel allocator, but it can fail
- on memory constrained systems. Because of the way Vmalloc works,
- Vmalloc can succeed when kmalloc fails. Specifying this option
- will make SquashFS always use Vmalloc to allocate the
- fragment cache memory.
-
- If unsure, say N.
-
config VXFS_FS
tristate "FreeVxFS file system support (VERITAS VxFS(TM) compatible)"
depends on BLOCK
@@ -1585,25 +1521,6 @@
Y here. This will result in _many_ additional debugging messages to be
written to the system log.
-config UNION_FS
- tristate "Union file system (EXPERIMENTAL)"
- depends on EXPERIMENTAL
- help
- Unionfs is a stackable unification file system, which appears to
- merge the contents of several directories (branches), while keeping
- their physical content separate.
-
- See <http://unionfs.filesystems.org/> for details
-
-config UNION_FS_XATTR
- bool "Unionfs extended attributes"
- depends on UNION_FS
- help
- Extended attributes are name:value pairs associated with inodes by
- the kernel or by users (see the attr(5) manual page).
-
- If unsure, say N.
-
endmenu
menu "Network File Systems"
@@ -2139,3 +2056,4 @@
source "fs/dlm/Kconfig"
endmenu
+
Modified: linux4palm/linux/branches/cleanup-branch-never-commit/include/asm-arm/arch-pxa/gpio.h
===================================================================
--- linux4palm/linux/branches/cleanup-branch-never-commit/include/asm-arm/arch-pxa/gpio.h 2007-09-14 13:15:44 UTC (rev 1317)
+++ linux4palm/linux/branches/cleanup-branch-never-commit/include/asm-arm/arch-pxa/gpio.h 2007-09-14 14:31:39 UTC (rev 1318)
@@ -39,16 +39,9 @@
return;
}
-static inline int gpio_direction_input(unsigned gpio)
-{
- return pxa_gpio_mode(gpio | GPIO_IN);
-}
+int gpio_direction_input(unsigned gpio);
+int gpio_direction_output(unsigned gpio);
-static inline int gpio_direction_output(unsigned gpio)
-{
- return pxa_gpio_mode(gpio | GPIO_OUT);
-}
-
static inline int __gpio_get_value(unsigned gpio)
{
return GPLR(gpio) & GPIO_bit(gpio);
Modified: linux4palm/linux/branches/cleanup-branch-never-commit/include/asm-arm/arch-pxa/h5400-gpio.h
===================================================================
--- linux4palm/linux/branches/cleanup-branch-never-commit/include/asm-arm/arch-pxa/h5400-gpio.h 2007-09-14 13:15:44 UTC (rev 1317)
+++ linux4palm/linux/branches/cleanup-branch-never-commit/include/asm-arm/arch-pxa/h5400-gpio.h 2007-09-14 14:31:39 UTC (rev 1318)
@@ -88,7 +88,7 @@
#define GPIO_NR_H5400_IRDA_SD 58 /* to hsdl3002 sd */
/* 59 not connected */
#define GPIO_NR_H5400_POWER_SD_N 60 /* controls power to SD */
-#define GPIO_NR_H5400_POWER_RS232_N 61 /* inverted FORCEON to rs232 transceiver */
+#define GPIO_NR_H5400_POWER_RS232_N_OR_FS 61 /* inverted FORCEON to rs232 transceiver or FCD*/
#define GPIO_NR_H5400_POWER_ACCEL_N 62 /* controls power to accel */
/* 63 is not connected */
#define GPIO_NR_H5400_OPT_NVRAM 64 /* controls power to expansion pack */
Modified: linux4palm/linux/branches/cleanup-branch-never-commit/include/asm-arm/arch-pxa/htcapache-gpio.h
===================================================================
--- linux4palm/linux/branches/cleanup-branch-never-commit/include/asm-arm/arch-pxa/htcapache-gpio.h 2007-09-14 13:15:44 UTC (rev 1317)
+++ linux4palm/linux/branches/cleanup-branch-never-commit/include/asm-arm/arch-pxa/htcapache-gpio.h 2007-09-14 14:31:39 UTC (rev 1318)
@@ -7,41 +7,39 @@
* Micro-controller interface
****************************************************************/
-u32 htcapache_read_mc_reg(u32 reg);
-void htcapache_write_mc_reg(u32 reg, u32 data);
#define GPIO_NR_HTCAPACHE_MC_SDA 56
#define GPIO_NR_HTCAPACHE_MC_SCL 57
+#define GPIO_NR_HTCAPACHE_MC_IRQ 14
/****************************************************************
* EGPIO
****************************************************************/
-int htcapache_egpio_get(int bit);
-void htcapache_egpio_set(int bit, int value);
-int htcapache_egpio_to_irq(int bit);
#define GPIO_NR_HTCAPACHE_EGPIO_IRQ 15
+#define HTCAPACHE_EGPIO_BASE 0x100 /* GPIO_BASE_INCREMENT */
+#define HTCAPACHE_EGPIO(reg,bit) (HTCAPACHE_EGPIO_BASE + 16*(reg) + (bit))
/****************************************************************
* Power
****************************************************************/
-#define EGPIO_NR_HTCAPACHE_PWR_IN_PWR 0
-#define EGPIO_NR_HTCAPACHE_PWR_IN_HIGHPWR 7
-#define EGPIO_NR_HTCAPACHE_PWR_CHARGE 40
-#define EGPIO_NR_HTCAPACHE_PWR_HIGHCHARGE 39
+#define EGPIO_NR_HTCAPACHE_PWR_IN_PWR HTCAPACHE_EGPIO(0, 0)
+#define EGPIO_NR_HTCAPACHE_PWR_IN_HIGHPWR HTCAPACHE_EGPIO(0, 7)
+#define EGPIO_NR_HTCAPACHE_PWR_CHARGE HTCAPACHE_EGPIO(2, 8)
+#define EGPIO_NR_HTCAPACHE_PWR_HIGHCHARGE HTCAPACHE_EGPIO(2, 7)
/****************************************************************
* Sound
****************************************************************/
-#define EGPIO_NR_HTCAPACHE_SND_POWER 21 // XXX - not sure
-#define EGPIO_NR_HTCAPACHE_SND_RESET 24 // XXX - not sure
-#define EGPIO_NR_HTCAPACHE_SND_PWRJACK 23
-#define EGPIO_NR_HTCAPACHE_SND_PWRSPKR 22
-#define EGPIO_NR_HTCAPACHE_SND_IN_JACK 2
+#define EGPIO_NR_HTCAPACHE_SND_POWER HTCAPACHE_EGPIO(1, 5) // XXX - not sure
+#define EGPIO_NR_HTCAPACHE_SND_RESET HTCAPACHE_EGPIO(1, 8) // XXX - not sure
+#define EGPIO_NR_HTCAPACHE_SND_PWRJACK HTCAPACHE_EGPIO(1, 7)
+#define EGPIO_NR_HTCAPACHE_SND_PWRSPKR HTCAPACHE_EGPIO(1, 6)
+#define EGPIO_NR_HTCAPACHE_SND_IN_JACK HTCAPACHE_EGPIO(0, 2)
/****************************************************************
@@ -58,36 +56,27 @@
****************************************************************/
#define GPIO_NR_HTCAPACHE_LED_FLASHLIGHT 87
-#define EGPIO_NR_HTCAPACHE_LED_VIBRA 35
-#define EGPIO_NR_HTCAPACHE_LED_KBD_BACKLIGHT 34
+#define EGPIO_NR_HTCAPACHE_LED_VIBRA HTCAPACHE_EGPIO(2, 3)
+#define EGPIO_NR_HTCAPACHE_LED_KBD_BACKLIGHT HTCAPACHE_EGPIO(2, 2)
/****************************************************************
- * LEDS
- ****************************************************************/
-
-#define GPIO_NR_HTCAPACHE_LED_FLASHLIGHT 87
-#define EGPIO_NR_HTCAPACHE_LED_VIBRA 35
-#define EGPIO_NR_HTCAPACHE_LED_KBD_BACKLIGHT 34
-
-
-/****************************************************************
* BlueTooth
****************************************************************/
-#define EGPIO_NR_HTCAPACHE_BT_POWER 27
-#define EGPIO_NR_HTCAPACHE_BT_RESET 26
+#define EGPIO_NR_HTCAPACHE_BT_POWER HTCAPACHE_EGPIO(1, 11)
+#define EGPIO_NR_HTCAPACHE_BT_RESET HTCAPACHE_EGPIO(1, 10)
/****************************************************************
* Wifi
****************************************************************/
-#define EGPIO_NR_HTCAPACHE_WIFI_POWER1 20
-#define EGPIO_NR_HTCAPACHE_WIFI_POWER2 17
-#define EGPIO_NR_HTCAPACHE_WIFI_POWER3 16
-#define EGPIO_NR_HTCAPACHE_WIFI_RESET 19
-#define EGPIO_NR_HTCAPACHE_WIFI_IN_IRQ 5
+#define EGPIO_NR_HTCAPACHE_WIFI_POWER1 HTCAPACHE_EGPIO(1, 4)
+#define EGPIO_NR_HTCAPACHE_WIFI_POWER2 HTCAPACHE_EGPIO(1, 1)
+#define EGPIO_NR_HTCAPACHE_WIFI_POWER3 HTCAPACHE_EGPIO(1, 0)
+#define EGPIO_NR_HTCAPACHE_WIFI_RESET HTCAPACHE_EGPIO(1, 3)
+#define EGPIO_NR_HTCAPACHE_WIFI_IN_IRQ HTCAPACHE_EGPIO(0, 5)
/****************************************************************
@@ -103,24 +92,10 @@
****************************************************************/
#define GPIO_NR_HTCAPACHE_USB_PUEN 99
-#define EGPIO_NR_HTCAPACHE_USB_PWR 37
+#define EGPIO_NR_HTCAPACHE_USB_PWR HTCAPACHE_EGPIO(2, 5)
/****************************************************************
- * Front buttons
- ****************************************************************/
-
-#define GPIO_NR_HTCAPACHE_FKEY_IRQ 14
-
-
-/****************************************************************
- * Front buttons
- ****************************************************************/
-
-#define GPIO_NR_HTCAPACHE_FKEY_IRQ 14
-
-
-/****************************************************************
* Buttons on side
****************************************************************/
Modified: linux4palm/linux/branches/cleanup-branch-never-commit/include/asm-m32r/errno.h
===================================================================
--- linux4palm/linux/branches/cleanup-branch-never-commit/include/asm-m32r/errno.h 2007-09-14 13:15:44 UTC (rev 1317)
+++ linux4palm/linux/branches/cleanup-branch-never-commit/include/asm-m32r/errno.h 2007-09-14 14:31:39 UTC (rev 1318)
@@ -4,4 +4,3 @@
#include <asm-generic/errno.h>
#endif /* _ASM_M32R_ERRNO_H */
-
Modified: linux4palm/linux/branches/cleanup-branch-never-commit/include/asm-m32r/ioctls.h
===================================================================
--- linux4palm/linux/branches/cleanup-branch-never-commit/include/asm-m32r/ioctls.h 2007-09-14 13:15:44 UTC (rev 1317)
+++ linux4palm/linux/branches/cleanup-branch-never-commit/include/asm-m32r/ioctls.h 2007-09-14 14:31:39 UTC (rev 1318)
@@ -81,4 +81,3 @@
#define TIOCSER_TEMT 0x01 /* Transmitter physically empty */
#endif /* __ARCH_M32R_IOCTLS_H__ */
-
Modified: linux4palm/linux/branches/cleanup-branch-never-commit/include/asm-m32r/rtc.h
===================================================================
--- linux4palm/linux/branches/cleanup-branch-never-commit/include/asm-m32r/rtc.h 2007-09-14 13:15:44 UTC (rev 1317)
+++ linux4palm/linux/branches/cleanup-branch-never-commit/include/asm-m32r/rtc.h 2007-09-14 14:31:39 UTC (rev 1318)
@@ -1,8 +1,6 @@
#ifndef __RTC_H__
#define __RTC_H__
-
-
/* Dallas DS1302 clock/calendar register numbers. */
# define RTC_SECONDS 0
# define RTC_MINUTES 1
Modified: linux4palm/linux/branches/cleanup-branch-never-commit/include/asm-m32r/syscall.h
===================================================================
--- linux4palm/linux/branches/cleanup-branch-never-commit/include/asm-m32r/syscall.h 2007-09-14 13:15:44 UTC (rev 1317)
+++ linux4palm/linux/branches/cleanup-branch-never-commit/include/asm-m32r/syscall.h 2007-09-14 14:31:39 UTC (rev 1318)
@@ -6,4 +6,3 @@
#define SYSCALL_VECTOR_ADDRESS "0xa0"
#endif /* _ASM_M32R_SYSCALL_H */
-
Modified: linux4palm/linux/branches/cleanup-branch-never-commit/include/asm-m32r/timex.h
===================================================================
--- linux4palm/linux/branches/cleanup-branch-never-commit/include/asm-m32r/timex.h 2007-09-14 13:15:44 UTC (rev 1317)
+++ linux4palm/linux/branches/cleanup-branch-never-commit/include/asm-m32r/timex.h 2007-09-14 14:31:39 UTC (rev 1318)
@@ -7,7 +7,6 @@
* m32r architecture timex specifications
*/
-
#define CLOCK_TICK_RATE (CONFIG_BUS_CLOCK / CONFIG_TIMER_DIVIDE)
#define CLOCK_TICK_FACTOR 20 /* Factor of both 1000000 and CLOCK_TICK_RATE */
Modified: linux4palm/linux/branches/cleanup-branch-never-commit/include/asm-m32r/unaligned.h
===================================================================
--- linux4palm/linux/branches/cleanup-branch-never-commit/include/asm-m32r/unaligned.h 2007-09-14 13:15:44 UTC (rev 1317)
+++ linux4palm/linux/branches/cleanup-branch-never-commit/include/asm-m32r/unaligned.h 2007-09-14 14:31:39 UTC (rev 1318)
@@ -8,7 +8,6 @@
#include <asm/string.h>
-
#define get_unaligned(ptr) \
({ __typeof__(*(ptr)) __tmp; memmove(&__tmp, (ptr), sizeof(*(ptr))); __tmp; })
@@ -17,5 +16,4 @@
memmove((ptr), &__tmp, sizeof(*(ptr))); \
(void)0; })
-
#endif /* _ASM_M32R_UNALIGNED_H */
Modified: linux4palm/linux/branches/cleanup-branch-never-commit/include/linux/magic.h
===================================================================
--- linux4palm/linux/branches/cleanup-branch-never-commit/include/linux/magic.h 2007-09-14 13:15:44 UTC (rev 1317)
+++ linux4palm/linux/branches/cleanup-branch-never-commit/include/linux/magic.h 2007-09-14 14:31:39 UTC (rev 1318)
@@ -35,8 +35,6 @@
#define REISER2FS_SUPER_MAGIC_STRING "ReIsEr2Fs"
#define REISER2FS_JR_SUPER_MAGIC_STRING "ReIsEr3Fs"
-#define UNIONFS_SUPER_MAGIC 0xf15f083d
-
#define SMB_SUPER_MAGIC 0x517B
#define USBDEVICE_SUPER_MAGIC 0x9fa2
Modified: linux4palm/linux/branches/cleanup-branch-never-commit/include/linux/namei.h
===================================================================
--- linux4palm/linux/branches/cleanup-branch-never-commit/include/linux/namei.h 2007-09-14 13:15:44 UTC (rev 1317)
+++ linux4palm/linux/branches/cleanup-branch-never-commit/include/linux/namei.h 2007-09-14 14:31:39 UTC (rev 1318)
@@ -81,16 +81,8 @@
extern struct file *nameidata_to_filp(struct nameidata *nd, int flags);
extern void release_open_intent(struct nameidata *);
-extern struct dentry *lookup_one_len_nd(const char *,
- struct dentry *, int, struct nameidata *);
+extern struct dentry * lookup_one_len(const char *, struct dentry *, int);
-/* SMP-safe */
-static inline struct dentry *lookup_one_len(const char *name,
- struct dentry *dir, int len)
-{
- return lookup_one_len_nd(name, dir, len, NULL);
-}
-
extern int follow_down(struct vfsmount **, struct dentry **);
extern int follow_up(struct vfsmount **, struct dentry **);
Modified: linux4palm/linux/branches/cleanup-branch-never-commit/sound/arm/htcapache_audio.c
===================================================================
--- linux4palm/linux/branches/cleanup-branch-never-commit/sound/arm/htcapache_audio.c 2007-09-14 13:15:44 UTC (rev 1317)
+++ linux4palm/linux/branches/cleanup-branch-never-commit/sound/arm/htcapache_audio.c 2007-09-14 14:31:39 UTC (rev 1318)
@@ -34,6 +34,7 @@
#include <asm/mach/irq.h>
#include <asm/arch/pxa-regs.h>
#include <asm/arch/htcapache-gpio.h>
+#include <asm/arch/gpio.h> /* gpio_set_value */
#include "pxa2xx-i2sound.h"
#include <sound/ak4641.h>
@@ -42,27 +43,27 @@
static void audio_set_codec_power(int mode)
{
- htcapache_egpio_set(EGPIO_NR_HTCAPACHE_SND_POWER, mode);
+ gpio_set_value(EGPIO_NR_HTCAPACHE_SND_POWER, mode);
}
static void audio_set_codec_reset(int mode)
{
- htcapache_egpio_set(EGPIO_NR_HTCAPACHE_SND_RESET, !mode);
+ gpio_set_value(EGPIO_NR_HTCAPACHE_SND_RESET, !mode);
}
static void audio_set_headphone_power(int mode)
{
- htcapache_egpio_set(EGPIO_NR_HTCAPACHE_SND_PWRJACK, mode);
+ gpio_set_value(EGPIO_NR_HTCAPACHE_SND_PWRJACK, mode);
}
static void audio_set_speaker_power(int mode)
{
- htcapache_egpio_set(EGPIO_NR_HTCAPACHE_SND_PWRSPKR, mode);
+ gpio_set_value(EGPIO_NR_HTCAPACHE_SND_PWRSPKR, mode);
}
static inline int audio_hp_detect(void)
{
- return !htcapache_egpio_get(EGPIO_NR_HTCAPACHE_SND_IN_JACK);
+ return !gpio_get_value(EGPIO_NR_HTCAPACHE_SND_IN_JACK);
}
static irqreturn_t audio_hp_isr(int isr, void *data)
@@ -76,7 +77,7 @@
unsigned long flags;
int irq;
- irq = htcapache_egpio_to_irq(EGPIO_NR_HTCAPACHE_SND_IN_JACK);
+ irq = gpio_to_irq(EGPIO_NR_HTCAPACHE_SND_IN_JACK);
if (request_irq(irq, audio_hp_isr, SA_INTERRUPT | SA_SAMPLE_RANDOM,
"Headphone Jack", NULL) != 0)
return;
@@ -89,7 +90,7 @@
static void audio_hp_detection_off(void)
{
- free_irq(htcapache_egpio_to_irq(EGPIO_NR_HTCAPACHE_SND_IN_JACK), NULL);
+ free_irq(gpio_to_irq(EGPIO_NR_HTCAPACHE_SND_IN_JACK), NULL);
}
static struct snd_ak4641 ak = {
Modified: linux4palm/linux/branches/cleanup-branch-never-commit/sound/soc/pxa/h5000.c
===================================================================
--- linux4palm/linux/branches/cleanup-branch-never-commit/sound/soc/pxa/h5000.c 2007-09-14 13:15:44 UTC (rev 1317)
+++ linux4palm/linux/branches/cleanup-branch-never-commit/sound/soc/pxa/h5000.c 2007-09-14 14:31:39 UTC (rev 1318)
@@ -26,7 +26,7 @@
#include <asm-arm/arch/gpio.h>
#include <asm/arch-pxa/h5400-asic.h>
#include <asm/arch-pxa/h5400-gpio.h>
-#include <asm/hardware/samcop_base.h>
+#include <linux/mfd/samcop_base.h>
#include "pxa2xx-i2s.h"
#include "pxa2xx-pcm.h"
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
