Menu
▾
▴
hackndev-commit
|
From: <hap...@us...> - 2007-09-13 17:27:43
|
Revision: 1309
http://hackndev.svn.sourceforge.net/hackndev/?rev=1309&view=rev
Author: happy-slapin
Date: 2007-09-13 10:27:38 -0700 (Thu, 13 Sep 2007)
Log Message:
-----------
Cleanup before hh.org merge
Modified Paths:
--------------
linux4palm/linux/branches/cleanup-branch-never-commit/Documentation/filesystems/00-INDEX
linux4palm/linux/branches/cleanup-branch-never-commit/MAINTAINERS
linux4palm/linux/branches/cleanup-branch-never-commit/arch/arm/Kconfig
linux4palm/linux/branches/cleanup-branch-never-commit/arch/arm/Makefile
linux4palm/linux/branches/cleanup-branch-never-commit/arch/arm/configs/asus620_static_defconfig
linux4palm/linux/branches/cleanup-branch-never-commit/arch/arm/configs/asus730_static_defconfig
linux4palm/linux/branches/cleanup-branch-never-commit/arch/arm/configs/aximx50_static_defconfig
linux4palm/linux/branches/cleanup-branch-never-commit/drivers/media/video/Kconfig
linux4palm/linux/branches/cleanup-branch-never-commit/drivers/media/video/Makefile
linux4palm/linux/branches/cleanup-branch-never-commit/fs/Kconfig
linux4palm/linux/branches/cleanup-branch-never-commit/fs/Makefile
Removed Paths:
-------------
linux4palm/linux/branches/cleanup-branch-never-commit/arch/arm/armboot/
linux4palm/linux/branches/cleanup-branch-never-commit/drivers/media/video/ov96xx.c
linux4palm/linux/branches/cleanup-branch-never-commit/drivers/media/video/ov96xx_hw.h
linux4palm/linux/branches/cleanup-branch-never-commit/fs/squashfs/
linux4palm/linux/branches/cleanup-branch-never-commit/fs/squashfs_lzma/
linux4palm/linux/branches/cleanup-branch-never-commit/fs/unionfs/
linux4palm/linux/branches/cleanup-branch-never-commit/include/media/ov96xx.h
Modified: linux4palm/linux/branches/cleanup-branch-never-commit/Documentation/filesystems/00-INDEX
===================================================================
--- linux4palm/linux/branches/cleanup-branch-never-commit/Documentation/filesystems/00-INDEX 2007-09-12 16:47:07 UTC (rev 1308)
+++ linux4palm/linux/branches/cleanup-branch-never-commit/Documentation/filesystems/00-INDEX 2007-09-13 17:27:38 UTC (rev 1309)
@@ -84,8 +84,6 @@
- info and mount options for the UDF filesystem.
ufs.txt
- info on the ufs filesystem.
-unionfs/
- - info on the unionfs filesystem
vfat.txt
- info on using the VFAT filesystem used in Windows NT and Windows 95
vfs.txt
Modified: linux4palm/linux/branches/cleanup-branch-never-commit/MAINTAINERS
===================================================================
--- linux4palm/linux/branches/cleanup-branch-never-commit/MAINTAINERS 2007-09-12 16:47:07 UTC (rev 1308)
+++ linux4palm/linux/branches/cleanup-branch-never-commit/MAINTAINERS 2007-09-13 17:27:38 UTC (rev 1309)
@@ -3375,13 +3375,6 @@
W: http://www.kernel.dk
S: Maintained
-UNIONFS
-P: Josef "Jeff" Sipek
-M: js...@cs...
-L: un...@fi...
-W: http://unionfs.filesystems.org/
-S: Maintained
-
USB ACM DRIVER
P: Oliver Neukum
M: ol...@ne...
Modified: linux4palm/linux/branches/cleanup-branch-never-commit/arch/arm/Kconfig
===================================================================
--- linux4palm/linux/branches/cleanup-branch-never-commit/arch/arm/Kconfig 2007-09-12 16:47:07 UTC (rev 1308)
+++ linux4palm/linux/branches/cleanup-branch-never-commit/arch/arm/Kconfig 2007-09-13 17:27:38 UTC (rev 1309)
@@ -460,8 +460,6 @@
Enable support for iWMMXt context switching at run time if
running on a CPU that supports it.
-source arch/arm/armboot/Kconfig
-
# bool 'Use XScale PMU as timer source' CONFIG_XSCALE_PMU_TIMER
config XSCALE_PMU
bool
Modified: linux4palm/linux/branches/cleanup-branch-never-commit/arch/arm/Makefile
===================================================================
--- linux4palm/linux/branches/cleanup-branch-never-commit/arch/arm/Makefile 2007-09-12 16:47:07 UTC (rev 1308)
+++ linux4palm/linux/branches/cleanup-branch-never-commit/arch/arm/Makefile 2007-09-13 17:27:38 UTC (rev 1309)
@@ -166,7 +166,7 @@
endif
# If we have a machine-specific directory, then include it in the build.
-core-y += arch/arm/kernel/ arch/arm/mm/ arch/arm/common/ arch/arm/armboot/
+core-y += arch/arm/kernel/ arch/arm/mm/ arch/arm/common/
core-y += $(MACHINE)
core-$(CONFIG_ARCH_S3C2410) += arch/arm/mach-s3c2400/
core-$(CONFIG_ARCH_S3C2410) += arch/arm/mach-s3c2412/
Modified: linux4palm/linux/branches/cleanup-branch-never-commit/arch/arm/configs/asus620_static_defconfig
===================================================================
--- linux4palm/linux/branches/cleanup-branch-never-commit/arch/arm/configs/asus620_static_defconfig 2007-09-12 16:47:07 UTC (rev 1308)
+++ linux4palm/linux/branches/cleanup-branch-never-commit/arch/arm/configs/asus620_static_defconfig 2007-09-13 17:27:38 UTC (rev 1309)
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
-# Linux kernel version: 2.6.21-hh12
-# Tue Jul 17 20:51:06 2007
+# Linux kernel version: 2.6.21-hh15
+# Mon Sep 10 20:36:40 2007
#
CONFIG_ARM=y
CONFIG_SYS_SUPPORTS_APM_EMULATION=y
@@ -171,8 +171,7 @@
# 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
@@ -402,58 +401,16 @@
#
# CONFIG_NET_PKTGEN is not set
# CONFIG_HAMRADIO is not set
-CONFIG_IRDA=y
-
-#
-# IrDA protocols
-#
-CONFIG_IRLAN=y
-CONFIG_IRCOMM=y
-CONFIG_IRDA_ULTRA=y
-
-#
-# IrDA options
-#
-CONFIG_IRDA_CACHE_LAST_LSAP=y
-CONFIG_IRDA_FAST_RR=y
-CONFIG_IRDA_DEBUG=y
-
-#
-# Infrared-port device drivers
-#
-
-#
-# SIR device drivers
-#
-CONFIG_IRTTY_SIR=y
-
-#
-# Dongle support
-#
-# CONFIG_DONGLE is not set
-
-#
-# Old SIR device drivers
-#
-# CONFIG_IRPORT_SIR is not set
-
-#
-# Old Serial dongle support
-#
-
-#
-# FIR device drivers
-#
-CONFIG_PXA_FICP=y
+# CONFIG_IRDA is not set
CONFIG_BT=y
-CONFIG_BT_L2CAP=m
-CONFIG_BT_SCO=m
-CONFIG_BT_RFCOMM=m
+CONFIG_BT_L2CAP=y
+CONFIG_BT_SCO=y
+CONFIG_BT_RFCOMM=y
CONFIG_BT_RFCOMM_TTY=y
-CONFIG_BT_BNEP=m
+CONFIG_BT_BNEP=y
CONFIG_BT_BNEP_MC_FILTER=y
CONFIG_BT_BNEP_PROTO_FILTER=y
-CONFIG_BT_HIDP=m
+CONFIG_BT_HIDP=y
#
# Bluetooth device drivers
@@ -486,21 +443,19 @@
#
# Memory Technology Devices (MTD)
#
-CONFIG_MTD=y
+CONFIG_MTD=m
CONFIG_MTD_DEBUG=y
CONFIG_MTD_DEBUG_VERBOSE=0
-CONFIG_MTD_CONCAT=y
-CONFIG_MTD_PARTITIONS=y
-# CONFIG_MTD_REDBOOT_PARTS is not set
-# CONFIG_MTD_CMDLINE_PARTS is not set
-# CONFIG_MTD_AFS_PARTS is not set
+# CONFIG_MTD_CONCAT is not set
+# CONFIG_MTD_PARTITIONS is not set
#
# User Modules And Translation Layers
#
-CONFIG_MTD_CHAR=y
-CONFIG_MTD_BLKDEVS=y
-CONFIG_MTD_BLOCK=y
+CONFIG_MTD_CHAR=m
+# CONFIG_MTD_BLKDEVS is not set
+# CONFIG_MTD_BLOCK is not set
+# CONFIG_MTD_BLOCK_RO is not set
# CONFIG_FTL is not set
# CONFIG_NFTL is not set
# CONFIG_INFTL is not set
@@ -554,17 +509,15 @@
#
# NAND Flash Device Drivers
#
-CONFIG_MTD_NAND=y
+CONFIG_MTD_NAND=m
# CONFIG_MTD_NAND_VERIFY_WRITE is not set
# CONFIG_MTD_NAND_ECC_SMC is not set
-# CONFIG_MTD_NAND_H1900 is not set
-CONFIG_MTD_NAND_IDS=y
-CONFIG_MTD_NAND_DISKONCHIP=y
+CONFIG_MTD_NAND_IDS=m
+CONFIG_MTD_NAND_DISKONCHIP=m
# CONFIG_MTD_NAND_DISKONCHIP_PROBE_ADVANCED is not set
CONFIG_MTD_NAND_DISKONCHIP_PROBE_ADDRESS=0
# CONFIG_MTD_NAND_DISKONCHIP_BBTWRITE is not set
# CONFIG_MTD_NAND_SHARPSL is not set
-# CONFIG_MTD_NAND_NANDSIM is not set
#
# OneNAND Flash Device Drivers
@@ -585,7 +538,8 @@
# Block devices
#
# CONFIG_BLK_DEV_COW_COMMON is not set
-# CONFIG_BLK_DEV_LOOP is not set
+CONFIG_BLK_DEV_LOOP=m
+# CONFIG_BLK_DEV_CRYPTOLOOP is not set
# CONFIG_BLK_DEV_NBD is not set
CONFIG_BLK_DEV_RAM=y
CONFIG_BLK_DEV_RAM_COUNT=4
@@ -668,6 +622,7 @@
# CONFIG_KEYBOARD_NEWTON is not set
# CONFIG_KEYBOARD_STOWAWAY is not set
# CONFIG_GPIODEV_KEYS is not set
+# CONFIG_GPIODEV_KEYS2 is not set
# CONFIG_GPIODEV_DIAGONAL is not set
CONFIG_KEYBOARD_GPIO=y
CONFIG_INPUT_MOUSE=y
@@ -782,12 +737,24 @@
# CONFIG_ADC_AD7877 is not set
#
+# Compaq/iPAQ Drivers
+#
+
+#
+# Compaq/HP iPAQ Drivers
+#
+# CONFIG_IPAQ_SLEEVE is not set
+# CONFIG_SLEEVE_DEBUG is not set
+
+#
# Multifunction device drivers
#
# CONFIG_MFD_SM501 is not set
# CONFIG_HTC_ASIC2 is not set
# CONFIG_HTC_ASIC3 is not set
+# CONFIG_HTC_PASIC3 is not set
# CONFIG_HTC_EGPIO is not set
+# CONFIG_HTC_BBKEYS is not set
# CONFIG_HTC_ASIC3_DS1WM is not set
# CONFIG_SOC_SAMCOP is not set
# CONFIG_SOC_HAMCOP is not set
@@ -807,6 +774,7 @@
#
# LED drivers
#
+# CONFIG_LEDS_GPIO is not set
#
# LED Triggers
@@ -814,6 +782,7 @@
CONFIG_LEDS_TRIGGERS=y
CONFIG_LEDS_TRIGGER_TIMER=y
# CONFIG_LEDS_TRIGGER_HWTIMER is not set
+# CONFIG_LEDS_TRIGGER_BACKLIGHT is not set
# CONFIG_LEDS_TRIGGER_HEARTBEAT is not set
CONFIG_LEDS_TRIGGER_SHARED=y
@@ -899,7 +868,7 @@
#
# HID Devices
#
-CONFIG_HID=m
+CONFIG_HID=y
# CONFIG_HID_DEBUG is not set
#
@@ -1106,8 +1075,8 @@
# CONFIG_NLS_CODEPAGE_949 is not set
# CONFIG_NLS_CODEPAGE_874 is not set
# CONFIG_NLS_ISO8859_8 is not set
-CONFIG_NLS_CODEPAGE_1250=y
-CONFIG_NLS_CODEPAGE_1251=y
+# CONFIG_NLS_CODEPAGE_1250 is not set
+CONFIG_NLS_CODEPAGE_1251=m
# CONFIG_NLS_ASCII is not set
CONFIG_NLS_ISO8859_1=y
# CONFIG_NLS_ISO8859_2 is not set
@@ -1190,7 +1159,7 @@
# CONFIG_CRC16 is not set
CONFIG_CRC32=y
# CONFIG_LIBCRC32C is not set
-CONFIG_REED_SOLOMON=y
+CONFIG_REED_SOLOMON=m
CONFIG_REED_SOLOMON_DEC16=y
CONFIG_PLIST=y
CONFIG_HAS_IOMEM=y
Modified: linux4palm/linux/branches/cleanup-branch-never-commit/arch/arm/configs/asus730_static_defconfig
===================================================================
--- linux4palm/linux/branches/cleanup-branch-never-commit/arch/arm/configs/asus730_static_defconfig 2007-09-12 16:47:07 UTC (rev 1308)
+++ linux4palm/linux/branches/cleanup-branch-never-commit/arch/arm/configs/asus730_static_defconfig 2007-09-13 17:27:38 UTC (rev 1309)
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
-# Linux kernel version: 2.6.21-hh12
-# Tue Jul 17 20:51:07 2007
+# Linux kernel version: 2.6.21-hh15
+# Tue Sep 11 04:54:55 2007
#
CONFIG_ARM=y
CONFIG_SYS_SUPPORTS_APM_EMULATION=y
@@ -167,6 +167,10 @@
# CONFIG_MACH_MAGICIAN is not set
# CONFIG_MACH_HTCAPACHE is not set
# CONFIG_MACH_BLUEANGEL is not set
+
+#
+# HTC_HW6X00
+#
# CONFIG_MACH_HTCBEETLES is not set
# CONFIG_MACH_HW6900 is not set
# CONFIG_MACH_HTCATHENA is not set
@@ -408,68 +412,8 @@
#
# CONFIG_NET_PKTGEN is not set
# CONFIG_HAMRADIO is not set
-CONFIG_IRDA=y
-
-#
-# IrDA protocols
-#
-CONFIG_IRLAN=y
-CONFIG_IRCOMM=y
-CONFIG_IRDA_ULTRA=y
-
-#
-# IrDA options
-#
-CONFIG_IRDA_CACHE_LAST_LSAP=y
-CONFIG_IRDA_FAST_RR=y
-CONFIG_IRDA_DEBUG=y
-
-#
-# Infrared-port device drivers
-#
-
-#
-# SIR device drivers
-#
-CONFIG_IRTTY_SIR=y
-
-#
-# Dongle support
-#
-# CONFIG_DONGLE is not set
-
-#
-# Old SIR device drivers
-#
-# CONFIG_IRPORT_SIR is not set
-
-#
-# Old Serial dongle support
-#
-
-#
-# FIR device drivers
-#
-CONFIG_PXA_FICP=y
-CONFIG_BT=y
-CONFIG_BT_L2CAP=m
-CONFIG_BT_SCO=m
-CONFIG_BT_RFCOMM=m
-CONFIG_BT_RFCOMM_TTY=y
-CONFIG_BT_BNEP=m
-CONFIG_BT_BNEP_MC_FILTER=y
-CONFIG_BT_BNEP_PROTO_FILTER=y
-CONFIG_BT_HIDP=m
-
-#
-# Bluetooth device drivers
-#
-# CONFIG_BT_HCIUART is not set
-# CONFIG_BT_HCIDTL1 is not set
-# CONFIG_BT_HCIBT3C is not set
-# CONFIG_BT_HCIBLUECARD is not set
-# CONFIG_BT_HCIBTUART is not set
-# CONFIG_BT_HCIVHCI is not set
+# CONFIG_IRDA is not set
+# CONFIG_BT is not set
# CONFIG_IEEE80211 is not set
#
@@ -518,8 +462,14 @@
#
# RAM/ROM/Flash chip drivers
#
-# CONFIG_MTD_CFI is not set
+CONFIG_MTD_CFI=y
# CONFIG_MTD_JEDECPROBE is not set
+CONFIG_MTD_GEN_PROBE=y
+CONFIG_MTD_CFI_ADV_OPTIONS=y
+CONFIG_MTD_CFI_NOSWAP=y
+# CONFIG_MTD_CFI_BE_BYTE_SWAP is not set
+# CONFIG_MTD_CFI_LE_BYTE_SWAP is not set
+CONFIG_MTD_CFI_GEOMETRY=y
CONFIG_MTD_MAP_BANK_WIDTH_1=y
CONFIG_MTD_MAP_BANK_WIDTH_2=y
CONFIG_MTD_MAP_BANK_WIDTH_4=y
@@ -530,15 +480,24 @@
CONFIG_MTD_CFI_I2=y
# CONFIG_MTD_CFI_I4 is not set
# CONFIG_MTD_CFI_I8 is not set
+# CONFIG_MTD_OTP is not set
+CONFIG_MTD_CFI_INTELEXT=y
+# CONFIG_MTD_CFI_AMDSTD is not set
+# CONFIG_MTD_CFI_STAA is not set
+CONFIG_MTD_CFI_UTIL=y
# CONFIG_MTD_RAM is not set
# CONFIG_MTD_ROM is not set
# CONFIG_MTD_ABSENT is not set
# CONFIG_MTD_OBSOLETE_CHIPS is not set
+# CONFIG_MTD_XIP is not set
#
# Mapping drivers for chip access
#
# CONFIG_MTD_COMPLEX_MAPPINGS is not set
+# CONFIG_MTD_PHYSMAP is not set
+# CONFIG_MTD_ARM_INTEGRATOR is not set
+# CONFIG_MTD_IPAQ is not set
# CONFIG_MTD_SHARP_SL is not set
# CONFIG_MTD_PLATRAM is not set
@@ -562,14 +521,7 @@
#
# NAND Flash Device Drivers
#
-CONFIG_MTD_NAND=y
-# CONFIG_MTD_NAND_VERIFY_WRITE is not set
-# CONFIG_MTD_NAND_ECC_SMC is not set
-# CONFIG_MTD_NAND_H1900 is not set
-CONFIG_MTD_NAND_IDS=y
-# CONFIG_MTD_NAND_DISKONCHIP is not set
-# CONFIG_MTD_NAND_SHARPSL is not set
-# CONFIG_MTD_NAND_NANDSIM is not set
+# CONFIG_MTD_NAND is not set
#
# OneNAND Flash Device Drivers
@@ -590,7 +542,8 @@
# Block devices
#
# CONFIG_BLK_DEV_COW_COMMON is not set
-# CONFIG_BLK_DEV_LOOP is not set
+CONFIG_BLK_DEV_LOOP=m
+# CONFIG_BLK_DEV_CRYPTOLOOP is not set
# CONFIG_BLK_DEV_NBD is not set
CONFIG_BLK_DEV_RAM=y
CONFIG_BLK_DEV_RAM_COUNT=4
@@ -695,6 +648,7 @@
# CONFIG_KEYBOARD_NEWTON is not set
# CONFIG_KEYBOARD_STOWAWAY is not set
# CONFIG_GPIODEV_KEYS is not set
+# CONFIG_GPIODEV_KEYS2 is not set
# CONFIG_GPIODEV_DIAGONAL is not set
# CONFIG_KEYBOARD_PXA27x is not set
# CONFIG_KEYBOARD_GPIO is not set
@@ -847,12 +801,24 @@
# CONFIG_ADC_AD7877 is not set
#
+# Compaq/iPAQ Drivers
+#
+
+#
+# Compaq/HP iPAQ Drivers
+#
+# CONFIG_IPAQ_SLEEVE is not set
+# CONFIG_SLEEVE_DEBUG is not set
+
+#
# Multifunction device drivers
#
# CONFIG_MFD_SM501 is not set
# CONFIG_HTC_ASIC2 is not set
# CONFIG_HTC_ASIC3 is not set
+# CONFIG_HTC_PASIC3 is not set
# CONFIG_HTC_EGPIO is not set
+# CONFIG_HTC_BBKEYS is not set
# CONFIG_HTC_ASIC3_DS1WM is not set
# CONFIG_SOC_SAMCOP is not set
# CONFIG_SOC_HAMCOP is not set
@@ -872,6 +838,7 @@
#
# LED drivers
#
+# CONFIG_LEDS_GPIO is not set
#
# LED Triggers
@@ -880,6 +847,7 @@
CONFIG_LEDS_TRIGGER_TIMER=y
# CONFIG_LEDS_TRIGGER_HWTIMER is not set
# CONFIG_LEDS_TRIGGER_IDE_DISK is not set
+# CONFIG_LEDS_TRIGGER_BACKLIGHT is not set
# CONFIG_LEDS_TRIGGER_HEARTBEAT is not set
CONFIG_LEDS_TRIGGER_SHARED=y
@@ -1005,8 +973,7 @@
#
# HID Devices
#
-CONFIG_HID=m
-# CONFIG_HID_DEBUG is not set
+# CONFIG_HID is not set
#
# USB support
@@ -1155,7 +1122,18 @@
# CONFIG_BEFS_FS is not set
# CONFIG_BFS_FS is not set
# CONFIG_EFS_FS is not set
-# CONFIG_JFFS2_FS is not set
+CONFIG_JFFS2_FS=y
+CONFIG_JFFS2_FS_DEBUG=0
+CONFIG_JFFS2_FS_WRITEBUFFER=y
+# CONFIG_JFFS2_SUMMARY is not set
+# CONFIG_JFFS2_FS_XATTR is not set
+CONFIG_JFFS2_COMPRESSION_OPTIONS=y
+CONFIG_JFFS2_ZLIB=y
+CONFIG_JFFS2_RTIME=y
+# CONFIG_JFFS2_RUBIN is not set
+# CONFIG_JFFS2_CMODE_NONE is not set
+CONFIG_JFFS2_CMODE_PRIORITY=y
+# CONFIG_JFFS2_CMODE_SIZE is not set
# CONFIG_CRAMFS is not set
# CONFIG_VXFS_FS is not set
# CONFIG_HPFS_FS is not set
@@ -1218,8 +1196,8 @@
# CONFIG_NLS_CODEPAGE_949 is not set
# CONFIG_NLS_CODEPAGE_874 is not set
# CONFIG_NLS_ISO8859_8 is not set
-CONFIG_NLS_CODEPAGE_1250=y
-CONFIG_NLS_CODEPAGE_1251=y
+# CONFIG_NLS_CODEPAGE_1250 is not set
+CONFIG_NLS_CODEPAGE_1251=m
# CONFIG_NLS_ASCII is not set
CONFIG_NLS_ISO8859_1=y
# CONFIG_NLS_ISO8859_2 is not set
@@ -1302,6 +1280,8 @@
# CONFIG_CRC16 is not set
CONFIG_CRC32=y
# CONFIG_LIBCRC32C is not set
+CONFIG_ZLIB_INFLATE=y
+CONFIG_ZLIB_DEFLATE=y
CONFIG_PLIST=y
CONFIG_HAS_IOMEM=y
CONFIG_HAS_IOPORT=y
Modified: linux4palm/linux/branches/cleanup-branch-never-commit/arch/arm/configs/aximx50_static_defconfig
===================================================================
--- linux4palm/linux/branches/cleanup-branch-never-commit/arch/arm/configs/aximx50_static_defconfig 2007-09-12 16:47:07 UTC (rev 1308)
+++ linux4palm/linux/branches/cleanup-branch-never-commit/arch/arm/configs/aximx50_static_defconfig 2007-09-13 17:27:38 UTC (rev 1309)
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
-# Linux kernel version: 2.6.21-hh12
-# Tue Jul 17 20:51:07 2007
+# Linux kernel version: 2.6.21-hh15
+# Mon Sep 10 20:36:41 2007
#
CONFIG_ARM=y
CONFIG_SYS_SUPPORTS_APM_EMULATION=y
@@ -166,8 +166,7 @@
# 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
@@ -402,64 +401,8 @@
#
# CONFIG_NET_PKTGEN is not set
# CONFIG_HAMRADIO is not set
-CONFIG_IRDA=y
-
-#
-# IrDA protocols
-#
-CONFIG_IRLAN=y
-CONFIG_IRCOMM=y
-CONFIG_IRDA_ULTRA=y
-
-#
-# IrDA options
-#
-CONFIG_IRDA_CACHE_LAST_LSAP=y
-CONFIG_IRDA_FAST_RR=y
-CONFIG_IRDA_DEBUG=y
-
-#
-# Infrared-port device drivers
-#
-
-#
-# SIR device drivers
-#
-CONFIG_IRTTY_SIR=y
-
-#
-# Dongle support
-#
-# CONFIG_DONGLE is not set
-
-#
-# Old SIR device drivers
-#
-# CONFIG_IRPORT_SIR is not set
-
-#
-# Old Serial dongle support
-#
-
-#
-# FIR device drivers
-#
-CONFIG_PXA_FICP=y
-CONFIG_BT=y
-CONFIG_BT_L2CAP=m
-CONFIG_BT_SCO=m
-CONFIG_BT_RFCOMM=m
-CONFIG_BT_RFCOMM_TTY=y
-CONFIG_BT_BNEP=m
-CONFIG_BT_BNEP_MC_FILTER=y
-CONFIG_BT_BNEP_PROTO_FILTER=y
-CONFIG_BT_HIDP=m
-
-#
-# Bluetooth device drivers
-#
-# CONFIG_BT_HCIUART is not set
-# CONFIG_BT_HCIVHCI is not set
+# CONFIG_IRDA is not set
+# CONFIG_BT is not set
# CONFIG_IEEE80211 is not set
#
@@ -484,21 +427,19 @@
#
# Memory Technology Devices (MTD)
#
-CONFIG_MTD=y
+CONFIG_MTD=m
CONFIG_MTD_DEBUG=y
CONFIG_MTD_DEBUG_VERBOSE=0
-CONFIG_MTD_CONCAT=y
-CONFIG_MTD_PARTITIONS=y
-# CONFIG_MTD_REDBOOT_PARTS is not set
-# CONFIG_MTD_CMDLINE_PARTS is not set
-# CONFIG_MTD_AFS_PARTS is not set
+# CONFIG_MTD_CONCAT is not set
+# CONFIG_MTD_PARTITIONS is not set
#
# User Modules And Translation Layers
#
-CONFIG_MTD_CHAR=y
-CONFIG_MTD_BLKDEVS=y
-CONFIG_MTD_BLOCK=y
+CONFIG_MTD_CHAR=m
+# CONFIG_MTD_BLKDEVS is not set
+# CONFIG_MTD_BLOCK is not set
+# CONFIG_MTD_BLOCK_RO is not set
# CONFIG_FTL is not set
# CONFIG_NFTL is not set
# CONFIG_INFTL is not set
@@ -573,7 +514,8 @@
# Block devices
#
# CONFIG_BLK_DEV_COW_COMMON is not set
-# CONFIG_BLK_DEV_LOOP is not set
+CONFIG_BLK_DEV_LOOP=m
+# CONFIG_BLK_DEV_CRYPTOLOOP is not set
# CONFIG_BLK_DEV_NBD is not set
CONFIG_BLK_DEV_RAM=y
CONFIG_BLK_DEV_RAM_COUNT=4
@@ -656,6 +598,7 @@
# CONFIG_KEYBOARD_NEWTON is not set
# CONFIG_KEYBOARD_STOWAWAY is not set
# CONFIG_GPIODEV_KEYS is not set
+# CONFIG_GPIODEV_KEYS2 is not set
# CONFIG_GPIODEV_DIAGONAL is not set
CONFIG_KEYBOARD_PXA27x=y
CONFIG_KEYBOARD_GPIO=y
@@ -780,12 +723,24 @@
# CONFIG_ADC_AD7877 is not set
#
+# Compaq/iPAQ Drivers
+#
+
+#
+# Compaq/HP iPAQ Drivers
+#
+# CONFIG_IPAQ_SLEEVE is not set
+# CONFIG_SLEEVE_DEBUG is not set
+
+#
# Multifunction device drivers
#
# CONFIG_MFD_SM501 is not set
# CONFIG_HTC_ASIC2 is not set
# CONFIG_HTC_ASIC3 is not set
+# CONFIG_HTC_PASIC3 is not set
# CONFIG_HTC_EGPIO is not set
+# CONFIG_HTC_BBKEYS is not set
# CONFIG_HTC_ASIC3_DS1WM is not set
# CONFIG_SOC_SAMCOP is not set
# CONFIG_SOC_HAMCOP is not set
@@ -805,6 +760,7 @@
#
# LED drivers
#
+# CONFIG_LEDS_GPIO is not set
#
# LED Triggers
@@ -812,6 +768,7 @@
CONFIG_LEDS_TRIGGERS=y
CONFIG_LEDS_TRIGGER_TIMER=y
CONFIG_LEDS_TRIGGER_HWTIMER=y
+# CONFIG_LEDS_TRIGGER_BACKLIGHT is not set
# CONFIG_LEDS_TRIGGER_HEARTBEAT is not set
CONFIG_LEDS_TRIGGER_SHARED=y
@@ -897,8 +854,7 @@
#
# HID Devices
#
-CONFIG_HID=m
-# CONFIG_HID_DEBUG is not set
+# CONFIG_HID is not set
#
# USB support
@@ -1104,8 +1060,8 @@
# CONFIG_NLS_CODEPAGE_949 is not set
# CONFIG_NLS_CODEPAGE_874 is not set
# CONFIG_NLS_ISO8859_8 is not set
-CONFIG_NLS_CODEPAGE_1250=y
-CONFIG_NLS_CODEPAGE_1251=y
+# CONFIG_NLS_CODEPAGE_1250 is not set
+CONFIG_NLS_CODEPAGE_1251=m
# CONFIG_NLS_ASCII is not set
CONFIG_NLS_ISO8859_1=y
# CONFIG_NLS_ISO8859_2 is not set
Modified: linux4palm/linux/branches/cleanup-branch-never-commit/drivers/media/video/Kconfig
===================================================================
--- linux4palm/linux/branches/cleanup-branch-never-commit/drivers/media/video/Kconfig 2007-09-12 16:47:07 UTC (rev 1308)
+++ linux4palm/linux/branches/cleanup-branch-never-commit/drivers/media/video/Kconfig 2007-09-13 17:27:38 UTC (rev 1309)
@@ -763,8 +763,4 @@
endmenu # V4L USB devices
-config PXACI
- depends on VIDEO_DEV
- tristate "Camera Interface for PXA27x"
-
endmenu
Modified: linux4palm/linux/branches/cleanup-branch-never-commit/drivers/media/video/Makefile
===================================================================
--- linux4palm/linux/branches/cleanup-branch-never-commit/drivers/media/video/Makefile 2007-09-12 16:47:07 UTC (rev 1308)
+++ linux4palm/linux/branches/cleanup-branch-never-commit/drivers/media/video/Makefile 2007-09-13 17:27:38 UTC (rev 1309)
@@ -111,7 +111,5 @@
obj-$(CONFIG_USB_QUICKCAM_MESSENGER) += usbvideo/
obj-$(CONFIG_VIDEO_VIVI) += vivi.o
-# obj-$(CONFIG_PXACI) += pxa_camera.o pxa_ci.o pxa_camera_ioctl.o
-obj-$(CONFIG_PXACI) += ov96xx.o
EXTRA_CFLAGS += -Idrivers/media/dvb/dvb-core
Deleted: linux4palm/linux/branches/cleanup-branch-never-commit/drivers/media/video/ov96xx.c
===================================================================
--- linux4palm/linux/branches/cleanup-branch-never-commit/drivers/media/video/ov96xx.c 2007-09-12 16:47:07 UTC (rev 1308)
+++ linux4palm/linux/branches/cleanup-branch-never-commit/drivers/media/video/ov96xx.c 2007-09-13 17:27:38 UTC (rev 1309)
@@ -1,268 +0,0 @@
-/*
- * ov96xx.c - Omnivision 9640, 9650 CMOS sensor driver
- *
- * Copyright (C) 2003 Intel Corporation
- * Copyright (C) 2004 Motorola Inc.
- * Copyright (C) 2007 Philipp Zabel <phi...@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; if not, write to the Free Software
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- *
- */
-
-#include <linux/clk.h>
-#include <linux/delay.h>
-#include <linux/module.h>
-#include <linux/platform_device.h>
-
-#include <media/ov96xx.h> /* ov96xx_platform_data */
-#include <media/v4l2-dev.h>
-
-#include <asm/arch/gpio.h>
-
-#include <asm/ioctl.h>
-#include <asm/irq.h>
-#include <asm/hardware.h>
-#include <asm/uaccess.h>
-
-#include "pxa_ci_types.h"
-#include "ov96xx_hw.h"
-
-extern int i2c_ov96xx_init(void);
-extern int i2c_ov96xx_cleanup(void);
-extern int i2c_ov96xx_read(u8 addr, u8 *pvalue);
-extern int i2c_ov96xx_write(u8 addr, u8 value);
-
-#define DEBUG 1
-#define DPRINTK(fmt,args...) \
- do { if (DEBUG) printk("in function %s "fmt,__FUNCTION__,##args);} while(0)
-
-struct ov96xx_data {
- int version;
- struct clk *clk;
-};
-
-void ov96xx_soft_reset(struct platform_device *pdev)
-{
- struct ov96xx_data *ov96xx = platform_get_drvdata(pdev);
-
- i2c_ov96xx_write(OV96xx_COM7, 0x80); /* COM7 = 0x12 */
- mdelay(10);
-
- /* enable digital BLC */
- switch (ov96xx->version) {
- case REV_OV9640:
- case REV_OV9640_v3:
- break;
- case REV_OV9650_0:
- i2c_ov96xx_write(OV96xx_TSLB, 0x0c); /* TSLB = 0x3a */
- i2c_ov96xx_write(OV96xx_COM6, 0x4a); /* COM6 = 0x0f */
- break;
- case REV_OV9650:
- i2c_ov96xx_write(OV96xx_TSLB, 0x0d); /* TSLB = 0x3a */
- i2c_ov96xx_write(OV96xx_COM6, 0x42); /* COM6 = 0x0f */
- break;
- }
-
- dbg_print("end initial register");
-}
-
-int ov96xx_check_revision(struct platform_device *pdev)
-{
- struct ov96xx_data *ov96xx = platform_get_drvdata(pdev);
- u8 val;
-
- i2c_ov96xx_read(OV96xx_PID, &val);
- DPRINTK("PID = %x\n", val);
-
- if (val != PID_OV96xx)
- return -ENODEV;
-
- mdelay(2000);
- i2c_ov96xx_read(OV96xx_REV, &val);
- DPRINTK("REV = %x\n", val);
-
- switch (val) {
- case REV_OV9640:
- printk("detected OV9640\n");
- break;
- case REV_OV9640_v3:
- printk("detected OV9640 v3\n");
- break;
- case REV_OV9650_0:
- printk("detected OV9650-0\n");
- break;
- case REV_OV9650:
- printk("detected OV9650\n");
- break;
- default:
- printk("couldn't detect OV96xx\n");
- return -ENODEV;
- }
- ov96xx->version = val;
- return val;
-}
-
-void ov96xx_power(struct platform_device *pdev, int powerup)
-{
- struct ov96xx_platform_data *pdata = pdev->dev.platform_data;
-
- if (powerup) {
- gpio_set_value(pdata->power_gpio, pdata->power_gpio_active_high);
- if (pdata->reset_gpio) {
- gpio_set_value(pdata->reset_gpio, 1);
- mdelay(20);
- gpio_set_value(pdata->reset_gpio, 0);
- }
- } else {
- gpio_set_value(pdata->power_gpio, !pdata->power_gpio_active_high);
- }
- mdelay(100);
-}
-
-static int ov96xx_probe(struct platform_device *pdev)
-{
- struct ov96xx_data *ov96xx;
- struct ov96xx_platform_data *pdata;
- int ret;
- int rate, i;
- u8 val;
-
- if (!pdev)
- return -ENODEV;
-
- pdata = pdev->dev.platform_data;
- if (!pdata->power_gpio)
- return -EINVAL;
-
- ov96xx = kzalloc(sizeof (struct ov96xx_data), GFP_KERNEL);
- if (!ov96xx)
- return -ENOMEM;
-
- platform_set_drvdata(pdev, ov96xx);
-
- ov96xx->clk = clk_get(&pdev->dev, "CI_MCLK");
- if (IS_ERR(ov96xx->clk)) {
- DPRINTK("couldn't get CI master clock\n");
- ret = -ENOENT;
- goto err;
- }
-
- rate = clk_get_rate(ov96xx->clk);
- printk("clock rate = %d\n", rate);
-
- /* enable clock, camera */
- clk_enable(ov96xx->clk);
- ov96xx_power(pdev, 1);
-
- /* enable i2c */
- i2c_ov96xx_init();
-
- /* check revision */
- //mdelay(2000);
- mdelay(100);
- ov96xx_check_revision(pdev);
-
- /* dump all registers */
- for (i=0; i<0xff; i++) {
- if ((i%16) == 0) {
- printk("\n%02x: ", i);
- }
- i2c_ov96xx_read(i, &val);
- printk("%02x ", val);
- }
- printk("\n");
-
- ov96xx_power(pdev, 0);
-
- /* disable clock */
- clk_disable(ov96xx->clk);
-
- /* disable i2c */
- i2c_ov96xx_cleanup();
-
- return 0;
-err:
- kfree(ov96xx);
- return ret;
-}
-
-#ifdef CONFIG_PM
-static int ov96xx_suspend(struct platform_device *pdev, pm_message_t state)
-{
- /*
- * stopping DMA transfers and disabling interrupts / clocks
- * is the business of the capture interface driver
- */
-
- return 0;
-}
-
-static int ov96xx_resume(struct platform_device *pdev)
-{
-/* struct ov96xx_data *ov96xx = platform_get_drvdata(pdev); */
-
- /*
- * enabling interrupts / clocks and resuming DMA transfers
- * is the business of the capture interface driver
- */
-#if 0
- camera_init(ov96xx->cam_ctx);
- //ov96xx_restore_property(cam_ctx, 0);
- if (resume_dma == 1) {
- camera_start_video_capture(cam_ctx, 0);
- resume_dma = 0;
- }
-#endif
- return 0;
-}
-#else
-#define ov96xx_suspend NULL
-#define ov96xx_resume NULL
-#endif
-
-static int ov96xx_remove(struct platform_device *pdev)
-{
- struct ov96xx_data *ov96xx = platform_get_drvdata(pdev);
-
- kfree(ov96xx);
- return 0;
-}
-
-static struct platform_driver ov96xx_driver = {
- .driver = {
- .name = "ov96xx",
- },
- .probe = ov96xx_probe,
- .remove = ov96xx_remove,
- .suspend = ov96xx_suspend,
- .resume = ov96xx_resume
-};
-
-static int __init ov96xx_init(void)
-{
- return platform_driver_register(&ov96xx_driver);
-}
-
-static void __exit ov96xx_exit(void)
-{
- platform_driver_unregister(&ov96xx_driver);
-}
-
-module_init(ov96xx_init);
-module_exit(ov96xx_exit);
-
-MODULE_DESCRIPTION("OV96xx CMOS sensor driver");
-MODULE_LICENSE("GPL");
-
Deleted: linux4palm/linux/branches/cleanup-branch-never-commit/drivers/media/video/ov96xx_hw.h
===================================================================
--- linux4palm/linux/branches/cleanup-branch-never-commit/drivers/media/video/ov96xx_hw.h 2007-09-12 16:47:07 UTC (rev 1308)
+++ linux4palm/linux/branches/cleanup-branch-never-commit/drivers/media/video/ov96xx_hw.h 2007-09-13 17:27:38 UTC (rev 1309)
@@ -1,237 +0,0 @@
-/*
- * ov96xx_hw.h - Omnivision 9640, 9650 CMOS sensor driver
- *
- * Copyright (C) 2003, Intel Corporation
- * Copyright (C) 2004 Motorola Inc.
- *
- * 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; if not, write to the Free Software
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- *
- * Merge of OV9640,OV9650 (C) 2007 Philipp Zabel
- *
- */
-
-#ifndef __OV_96xx_HW_H__
-#define __OV_96xx_HW_H__
-
-/* Revision constants */
-#define PID_OV96xx 0x96
-#define REV_OV9640 0x48
-#define REV_OV9640_v3 0x49
-#define REV_OV9650_0 0x51
-#define REV_OV9650 0x52
-
-/* Return codes */
-#define OV_ERR_NONE 0x00
-#define OV_ERR_TIMEOUT -1
-#define OV_ERR_PARAMETER -2
-#define OV_COMM_ERR -3
-
-/* Output Size & Format */
-/*
-#define OV_SIZE_NONE 0
-#define OV_SIZE_QQVGA 0x01
-#define OV_SIZE_QVGA ( OV_SIZE_QQVGA << 1 )
-#define OV_SIZE_VGA ( OV_SIZE_QQVGA << 2 )
-#define OV_SIZE_SXGA ( OV_SIZE_QQVGA << 3 )
-#define OV_SIZE_QQCIF 0x10
-#define OV_SIZE_QCIF ( OV_SIZE_QQCIF << 1 )
-#define OV_SIZE_CIF ( OV_SIZE_QQCIF << 2 )
-#define OV_FORMAT_NONE 0
-#define OV_FORMAT_YUV_422 1
-#define OV_FORMAT_RGB_565 2
-*/
-enum OV_SIZE {
- OV_SIZE_NONE=0 ,
- OV_SIZE_QQVGA ,
- OV_SIZE_QVGA ,
- OV_SIZE_VGA ,
- OV_SIZE_SXGA ,
- OV_SIZE_QQCIF ,
- OV_SIZE_QCIF ,
- OV_SIZE_CIF
-};
-enum OV_FORMAT {
- OV_FORMAT_NONE=0 ,
- OV_FORMAT_YUV_422,
- OV_FORMAT_RGB_565,
-};
-
-/* Camera Mode */
-#define VIEWFINDER_MODE 0x10
-#define STILLFRAME_MODE 0x20
-
-/* Others */
-#define OV96xx_TIMEOUT 1000 // ms to timeout.
-
-/* OV96xx Register Definitions */
-#define OV96xx_GAIN 0x00
-#define OV96xx_BLUE 0x01
-#define OV96xx_RED 0x02
-#define OV96xx_VREF 0x03
-#define OV96xx_COM1 0x04
-#define OV96xx_BAVE 0x05 // U/B Average Level
-#define OV96xx_GEAVE 0x06 // Y/Ge Average Level
-#define OV96xx_GOAVE 0x07 // Y/Go Average Level
-#define OV96xx_RAVE 0x08 // V/R Average level
-#define OV96xx_COM2 0x09 // Common control 2
-#define OV96xx_PID 0x0A // Product ID
-#define OV96xx_REV 0x0B // Revision
-#define OV96xx_COM3 0x0C
-#define OV96xx_COM4 0x0D
-#define OV96xx_COM5 0x0E
-#define OV96xx_COM6 0x0F
-#define OV96xx_AECH 0x10
-#define OV96xx_CLKRC 0x11
-#define OV96xx_COM7 0x12
-#define OV96xx_COM8 0x13
-#define OV96xx_COM9 0x14
-#define OV96xx_COM10 0x15
-#define OV96xx_WS 0x16
-#define OV96xx_HSTART 0x17
-#define OV96xx_HSTOP 0x18
-#define OV96xx_VSTRT 0x19
-#define OV96xx_VSTOP 0x1A
-#define OV96xx_PSHFT 0x1B
-#define OV96xx_MIDH 0x1C
-#define OV96xx_MIDL 0x1D
-#define OV9640_DLY 0x1E
-#define OV9650_MVLP 0x1E
-#define OV96xx_LAEC 0x1F
-#define OV96xx_BOS 0x20
-#define OV96xx_GBOS 0x21
-#define OV96xx_GROS 0x22
-#define OV96xx_ROS 0x23
-#define OV96xx_AEW 0x24
-#define OV96xx_AEB 0x25
-#define OV96xx_VPT 0x26
-#define OV96xx_BBIAS 0x27
-#define OV96xx_GbBIAS 0x28
-#define OV9640_GrBIAS 0x29
-#define OV9650_GrCOM 0x29
-#define OV96xx_EXHCH 0x2A
-#define OV96xx_EXHCL 0x2B
-#define OV96xx_RBIAS 0x2C
-#define OV96xx_ADVFL 0x2D
-#define OV96xx_ADVFH 0x2E
-#define OV96xx_YAVE 0x2F
-#define OV96xx_HSYST 0x30
-#define OV96xx_HSYEN 0x31
-#define OV96xx_HREF 0x32
-#define OV96xx_CHLF 0x33
-#define OV96xx_ARBLM 0x34
-#define OV96xx_VRHL 0x35
-#define OV96xx_VIDO 0x36
-#define OV96xx_ADC 0x37
-#define OV96xx_ACOM 0x38
-#define OV96xx_OFON 0x39
-#define OV96xx_TSLB 0x3A
-#define OV96xx_COM11 0x3B
-#define OV96xx_COM12 0x3C
-#define OV96xx_COM13 0x3D
-#define OV96xx_COM14 0x3E
-#define OV96xx_EDGE 0x3F
-#define OV96xx_COM15 0x40
-#define OV96xx_COM16 0x41
-#define OV96xx_COM17 0x42
-#define OV96xx_AWBTH1 0x43
-#define OV96xx_AWBTH2 0x44
-#define OV96xx_AWBTH3 0x45
-#define OV96xx_AWBTH4 0x46
-#define OV96xx_AWBTH5 0x47
-#define OV96xx_AWBTH6 0x48
-#define OV96xx_MTX1 0x4F
-#define OV96xx_MTX2 0x50
-#define OV96xx_MTX3 0x51
-#define OV96xx_MTX4 0x52
-#define OV96xx_MTX5 0x53
-#define OV96xx_MTX6 0x54
-#define OV96xx_MTX7 0x55
-#define OV96xx_MTX8 0x56
-#define OV96xx_MTX9 0x57
-#define OV96xx_MTXS 0x58
-#define OV96xx_AWBC1 0x59
-#define OV96xx_AWBC2 0x5A
-#define OV96xx_AWBC3 0x5B
-#define OV96xx_AWBC4 0x5C
-#define OV96xx_AWBC5 0x5D
-#define OV96xx_AWBC6 0x5E
-#define OV96xx_AWBC7 0x5F
-#define OV96xx_AWBC8 0x60
-#define OV96xx_AWBC9 0x61
-#define OV96xx_LCC1 0x62
-#define OV96xx_LCC2 0x63
-#define OV96xx_LCC3 0x64
-#define OV96xx_LCC4 0x65
-#define OV96xx_LCC5 0x66
-#define OV96xx_MANU 0x67
-#define OV96xx_MANV 0x68
-#define OV96xx_HV 0x69
-#define OV96xx_MBD 0x6A
-#define OV96xx_DBLV 0x6B
-#define OV96xx_GSP0 0x6C
-#define OV96xx_GSP1 0x6D
-#define OV96xx_GSP2 0x6E
-#define OV96xx_GSP3 0x6F
-#define OV96xx_GSP4 0x70
-#define OV96xx_GSP5 0x71
-#define OV96xx_GSP6 0x72
-#define OV96xx_GSP7 0x73
-#define OV96xx_GSP8 0x74
-#define OV96xx_GSP9 0x75
-#define OV96xx_GSP10 0x76
-#define OV96xx_GSP11 0x77
-#define OV96xx_GSP12 0x78
-#define OV96xx_GSP13 0x79
-#define OV96xx_GSP14 0x7A
-#define OV96xx_GSP15 0x7B
-#define OV96xx_GST0 0x7C
-#define OV96xx_GST1 0x7D
-#define OV96xx_GST2 0x7E
-#define OV96xx_GST3 0x7F
-#define OV96xx_GST4 0x80
-#define OV96xx_GST5 0x81
-#define OV96xx_GST6 0x82
-#define OV96xx_GST7 0x83
-#define OV96xx_GST8 0x84
-#define OV96xx_GST9 0x85
-#define OV96xx_GST10 0x86
-#define OV96xx_GST11 0x87
-#define OV96xx_GST12 0x88
-#define OV96xx_GST13 0x89
-#define OV96xx_GST14 0x8A
-
-/* End of OV9640 register */
-#define OV9640_REGEND ( OV96xx_GST14 + 1 )
-
-/* OV9650 Register Definitions */
-#define OV9650_COM21 0x8B
-#define OV9650_COM22 0x8C
-#define OV9650_COM23 0x8D
-#define OV9650_COM24 0x8E
-#define OV9650_DBLC1 0x8F
-#define OV9650_DBLCB 0x90
-#define OV9650_DBLCR 0x91
-#define OV9650_DMLNL 0x92
-#define OV9650_DMLNH 0x93
-
-#define OV9650_AECHM 0xA1
-
-/* End of OV9650 register */
-#define OV9650_LASTREG 0xAA
-
-/* End flag of register */
-#define OV9650_REGEND ( 0xff )
-
-#endif
Modified: linux4palm/linux/branches/cleanup-branch-never-commit/fs/Kconfig
===================================================================
--- linux4palm/linux/branches/cleanup-branch-never-commit/fs/Kconfig 2007-09-12 16:47:07 UTC (rev 1308)
+++ linux4palm/linux/branches/cleanup-branch-never-commit/fs/Kconfig 2007-09-13 17:27:38 UTC (rev 1309)
@@ -1086,8 +1086,6 @@
To compile this file system support as a module, choose M here: the
module will be called affs. If unsure, say N.
-source "fs/aufs/Kconfig"
-
config ECRYPT_FS
tristate "eCrypt filesystem layer support (EXPERIMENTAL)"
depends on EXPERIMENTAL && KEYS && CRYPTO && NET
@@ -1437,8 +1435,6 @@
If unsure, say N.
-source "fs/squashfs_lzma/Kconfig"
-
config VXFS_FS
tristate "FreeVxFS file system support (VERITAS VxFS(TM) compatible)"
depends on BLOCK
Modified: linux4palm/linux/branches/cleanup-branch-never-commit/fs/Makefile
===================================================================
--- linux4palm/linux/branches/cleanup-branch-never-commit/fs/Makefile 2007-09-12 16:47:07 UTC (rev 1308)
+++ linux4palm/linux/branches/cleanup-branch-never-commit/fs/Makefile 2007-09-13 17:27:38 UTC (rev 1309)
@@ -68,8 +68,6 @@
obj-$(CONFIG_JBD2) += jbd2/
obj-$(CONFIG_EXT2_FS) += ext2/
obj-$(CONFIG_CRAMFS) += cramfs/
-obj-$(CONFIG_SQUASHFS) += squashfs/
-obj-$(CONFIG_SQUASHFS_LZMA) += squashfs_lzma/
obj-$(CONFIG_RAMFS) += ramfs/
obj-$(CONFIG_HUGETLBFS) += hugetlbfs/
obj-$(CONFIG_CODA_FS) += coda/
@@ -115,6 +113,4 @@
obj-$(CONFIG_HPPFS) += hppfs/
obj-$(CONFIG_DEBUG_FS) += debugfs/
obj-$(CONFIG_OCFS2_FS) += ocfs2/
-obj-$(CONFIG_AUFS) += aufs/
-obj-$(CONFIG_UNION_FS) += unionfs/
obj-$(CONFIG_GFS2_FS) += gfs2/
Deleted: linux4palm/linux/branches/cleanup-branch-never-commit/include/media/ov96xx.h
===================================================================
--- linux4palm/linux/branches/cleanup-branch-never-commit/include/media/ov96xx.h 2007-09-12 16:47:07 UTC (rev 1308)
+++ linux4palm/linux/branches/cleanup-branch-never-commit/include/media/ov96xx.h 2007-09-13 17:27:38 UTC (rev 1309)
@@ -1,5 +0,0 @@
-struct ov96xx_platform_data {
- int power_gpio;
- int power_gpio_active_high;
- int reset_gpio;
-};
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <hap...@us...> - 2007-09-13 18:26:19
|
Revision: 1313
http://hackndev.svn.sourceforge.net/hackndev/?rev=1313&view=rev
Author: happy-slapin
Date: 2007-09-13 11:25:09 -0700 (Thu, 13 Sep 2007)
Log Message:
-----------
Cleanup
Modified Paths:
--------------
linux4palm/linux/branches/cleanup-branch-never-commit/arch/arm/mach-pxa/pxa27x.c
linux4palm/linux/branches/cleanup-branch-never-commit/arch/sh/kernel/process.c
linux4palm/linux/branches/cleanup-branch-never-commit/init/do_mounts_rd.c
linux4palm/linux/branches/cleanup-branch-never-commit/init/main.c
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-13 18:21:07 UTC (rev 1312)
+++ linux4palm/linux/branches/cleanup-branch-never-commit/arch/arm/mach-pxa/pxa27x.c 2007-09-13 18:25:09 UTC (rev 1313)
@@ -198,32 +198,6 @@
.resource = pxa27x_ohci_resources,
};
-static struct resource pxacamera_resources[] = {
- [0] = {
- .start = 0x50000000,
- .end = 0x50000fff,
- .flags = IORESOURCE_MEM,
- },
- [1] = {
- .start = IRQ_CAMERA,
- .end = IRQ_CAMERA,
- .flags = IORESOURCE_IRQ,
- },
-};
-
-static u64 pxa_camera_dmamask = 0xffffffffUL;
-
-static struct platform_device pxacamera_device = {
- .name = "pxa-camera",
- .id = -1, //check this
- .dev = {
- .dma_mask = &pxa_camera_dmamask,
- .coherent_dma_mask = 0xffffffff,
- },
- .num_resources = ARRAY_SIZE(pxacamera_resources),
- .resource = pxacamera_resources,
-};
-
void __init pxa_set_ohci_info(struct pxaohci_platform_data *info)
{
ohci_device.dev.platform_data = info;
Modified: linux4palm/linux/branches/cleanup-branch-never-commit/arch/sh/kernel/process.c
===================================================================
--- linux4palm/linux/branches/cleanup-branch-never-commit/arch/sh/kernel/process.c 2007-09-13 18:21:07 UTC (rev 1312)
+++ linux4palm/linux/branches/cleanup-branch-never-commit/arch/sh/kernel/process.c 2007-09-13 18:25:09 UTC (rev 1313)
@@ -9,26 +9,22 @@
* Copyright (C) 2006 Lineo Solutions Inc. support SH4A UBC
* Copyright (C) 2002 - 2006 Paul Mundt
*/
-
#include <linux/module.h>
#include <linux/mm.h>
#include <linux/elfcore.h>
#include <linux/pm.h>
#include <linux/kallsyms.h>
#include <linux/kexec.h>
-
#include <asm/uaccess.h>
#include <asm/mmu_context.h>
#include <asm/ubc.h>
static int hlt_counter;
-
int ubc_usercnt = 0;
#define HARD_IDLE_TIMEOUT (HZ / 3)
void (*pm_idle)(void);
-
void (*pm_power_off)(void);
EXPORT_SYMBOL(pm_power_off);
Modified: linux4palm/linux/branches/cleanup-branch-never-commit/init/do_mounts_rd.c
===================================================================
--- linux4palm/linux/branches/cleanup-branch-never-commit/init/do_mounts_rd.c 2007-09-13 18:21:07 UTC (rev 1312)
+++ linux4palm/linux/branches/cleanup-branch-never-commit/init/do_mounts_rd.c 2007-09-13 18:25:09 UTC (rev 1313)
@@ -5,14 +5,6 @@
#include <linux/ext2_fs.h>
#include <linux/romfs_fs.h>
#include <linux/cramfs_fs.h>
-
-#ifdef CONFIG_SQUASHFS_LZMA
- #include <linux/squashfslzma_fs.h>
- #include <../fs/squashfs_lzma/sqmagic.h>
-#else
- #include <linux/squashfs_fs.h>
-#endif
-
#include <linux/initrd.h>
#include <linux/string.h>
@@ -47,8 +39,6 @@
* numbers could not be found.
*
* We currently check for the following magic numbers:
- * squashfs
- * squashfs-lzma
* minix
* ext2
* romfs
@@ -63,11 +53,6 @@
struct ext2_super_block *ext2sb;
struct romfs_super_block *romfsb;
struct cramfs_super *cramfsb;
- struct squashfs_super_block *squashfsb;
-#ifdef CONFIG_SQUASHFS_LZMA
- struct squashfs_super_block *squashfslzmab;
-#endif
-
int nblocks = -1;
unsigned char *buf;
@@ -79,10 +64,6 @@
ext2sb = (struct ext2_super_block *) buf;
romfsb = (struct romfs_super_block *) buf;
cramfsb = (struct cramfs_super *) buf;
- squashfsb = (struct squashfs_super_block *) buf;
-#ifdef CONFIG_SQUASHFS_LZMA
- squashfslzmab = (struct squashfs_super_block *) buf;
-#endif
memset(buf, 0xe5, size);
/*
@@ -120,32 +101,6 @@
goto done;
}
- /* squashfs is at block zero too */
- if (squashfsb->s_magic == SQUASHFS_MAGIC) {
- printk(KERN_NOTICE
- "RAMDISK: squashfs filesystem found at block %d\n",
- start_block);
- if (squashfsb->s_major < 3)
- nblocks = (squashfsb->bytes_used_2+BLOCK_SIZE-1)>>BLOCK_SIZE_BITS;
- else
- nblocks = (squashfsb->bytes_used+BLOCK_SIZE-1)>>BLOCK_SIZE_BITS;
- goto done;
- }
-
-#ifdef CONFIG_SQUASHFS_LZMA
- /* squashfslzma is at block zero too */
- if (squashfslzmab->s_magic == SQUASHFS_MAGIC_LZMA) {
- printk(KERN_NOTICE
- "RAMDISK: SquashFS-LZMA filesystem found at block %d\n",
- start_block);
- if (squashfslzmab->s_major < 3)
- nblocks = (squashfslzmab->bytes_used_2+BLOCK_SIZE-1)>>BLOCK_SIZE_BITS;
- else
- nblocks = (squashfslzmab->bytes_used+BLOCK_SIZE-1)>>BLOCK_SIZE_BITS;
- goto done;
- }
-#endif
-
/*
* Read block 1 to test for minix and ext2 superblock
*/
Modified: linux4palm/linux/branches/cleanup-branch-never-commit/init/main.c
===================================================================
--- linux4palm/linux/branches/cleanup-branch-never-commit/init/main.c 2007-09-13 18:21:07 UTC (rev 1312)
+++ linux4palm/linux/branches/cleanup-branch-never-commit/init/main.c 2007-09-13 18:25:09 UTC (rev 1313)
@@ -728,13 +728,11 @@
spawn_softlockup_task();
}
-#if !defined(CONFIG_LAB)
static void run_init_process(char *init_filename)
{
argv_init[0] = init_filename;
kernel_execve(init_filename, argv_init, envp_init);
}
-#endif
/* This is a non __init function. Force it to be noinline otherwise gcc
* makes it inline to init() and it becomes part of init.text section
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
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.
|
|
From: <hap...@us...> - 2007-09-14 15:29:27
|
Revision: 1319
http://hackndev.svn.sourceforge.net/hackndev/?rev=1319&view=rev
Author: happy-slapin
Date: 2007-09-14 08:29:25 -0700 (Fri, 14 Sep 2007)
Log Message:
-----------
cleanup: Device cleanup
Modified Paths:
--------------
linux4palm/linux/branches/cleanup-branch-never-commit/drivers/leds/led-palmz72.c
Removed Paths:
-------------
linux4palm/linux/branches/cleanup-branch-never-commit/include/asm-arm/arch-pxa/pxa-ci.h
linux4palm/linux/branches/cleanup-branch-never-commit/include/asm-arm/arch-pxa/pxa_camera.h
linux4palm/linux/branches/cleanup-branch-never-commit/include/linux/aufs_type.h
Modified: linux4palm/linux/branches/cleanup-branch-never-commit/drivers/leds/led-palmz72.c
===================================================================
--- linux4palm/linux/branches/cleanup-branch-never-commit/drivers/leds/led-palmz72.c 2007-09-14 14:31:39 UTC (rev 1318)
+++ linux4palm/linux/branches/cleanup-branch-never-commit/drivers/leds/led-palmz72.c 2007-09-14 15:29:25 UTC (rev 1319)
@@ -21,13 +21,10 @@
#include <asm/arch/pxa-regs.h>
#include <asm/hardware/scoop.h>
-
-static void palmz72led_green_set(struct led_classdev *led_cdev, enum led_brightness value)
+static void palmz72led_green_set(struct led_classdev *led_cdev,
+ enum led_brightness value)
{
- if (value)
- SET_PALMZ72_GPIO(LED,1);
- else
- SET_PALMZ72_GPIO(LED,0);
+ SET_PALMZ72_GPIO(LED, value ? 1 : 0);
}
static struct led_classdev palmz72_green_led = {
Deleted: linux4palm/linux/branches/cleanup-branch-never-commit/include/asm-arm/arch-pxa/pxa-ci.h
===================================================================
--- linux4palm/linux/branches/cleanup-branch-never-commit/include/asm-arm/arch-pxa/pxa-ci.h 2007-09-14 14:31:39 UTC (rev 1318)
+++ linux4palm/linux/branches/cleanup-branch-never-commit/include/asm-arm/arch-pxa/pxa-ci.h 2007-09-14 15:29:25 UTC (rev 1319)
@@ -1,299 +0,0 @@
-/*
- ci - header file for pxa capture interface
-
- Copyright (C) 2003, Intel Corporation
-
- 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; if not, write to the Free Software
- Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-*/
-
-#ifndef _CI_H_
-#define _CI_H_
-
-//---------------------------------------------------------------------------
-// Register definitions
-//---------------------------------------------------------------------------
-
-enum CI_REGBITS_CICR0 {
- CI_CICR0_FOM = 0x00000001,
- CI_CICR0_EOFM = 0x00000002,
- CI_CICR0_SOFM = 0x00000004,
- CI_CICR0_CDM = 0x00000008,
- CI_CICR0_QDM = 0x00000010,
- CI_CICR0_PERRM = 0x00000020,
- CI_CICR0_EOLM = 0x00000040,
- CI_CICR0_FEM = 0x00000080,
- CI_CICR0_RDAVM = 0x00000100,
- CI_CICR0_TOM = 0x00000200,
- CI_CICR0_RESERVED = 0x03FFFC00,
- CI_CICR0_SIM_SHIFT = 24,
- CI_CICR0_SIM_SMASK = 0x7,
- CI_CICR0_DIS = 0x08000000,
- CI_CICR0_ENB = 0x10000000,
- CI_CICR0_SL_CAP_EN = 0x20000000,
- CI_CICR0_PAR_EN = 0x40000000,
- CI_CICR0_DMA_EN = 0x80000000,
- CI_CICR0_INTERRUPT_MASK = 0x3FF
-};
-
-enum CI_REGBITS_CICR1 {
- CI_CICR1_DW_SHIFT = 0,
- CI_CICR1_DW_SMASK = 0x7,
- CI_CICR1_COLOR_SP_SHIFT = 3,
- CI_CICR1_COLOR_SP_SMASK = 0x3,
- CI_CICR1_RAW_BPP_SHIFT = 5,
- CI_CICR1_RAW_BPP_SMASK = 0x3,
- CI_CICR1_RGB_BPP_SHIFT = 7,
- CI_CICR1_RGB_BPP_SMASK = 0x7,
- CI_CICR1_YCBCR_F = 0x00000400,
- CI_CICR1_RBG_F = 0x00000800,
- CI_CICR1_RGB_CONV_SHIFT = 12,
- CI_CICR1_RGB_CONV_SMASK = 0x7,
- CI_CICR1_PPL_SHIFT = 15,
- CI_CICR1_PPL_SMASK = 0x7FF,
- CI_CICR1_RESERVED = 0x1C000000,
- CI_CICR1_RGBT_CONV_SHIFT= 29,
- CI_CICR1_RGBT_CONV_SMASK= 0x3,
- CI_CICR1_TBIT = 0x80000000
-};
-
-enum CI_REGBITS_CICR2 {
- CI_CICR2_FSW_SHIFT = 0,
- CI_CICR2_FSW_SMASK = 0x3,
- CI_CICR2_BFPW_SHIFT= 3,
- CI_CICR2_BFPW_SMASK= 0x3F,
- CI_CICR2_RESERVED = 0x00000200,
- CI_CICR2_HSW_SHIFT = 10,
- CI_CICR2_HSW_SMASK = 0x3F,
- CI_CICR2_ELW_SHIFT = 16,
- CI_CICR2_ELW_SMASK = 0xFF,
- CI_CICR2_BLW_SHIFT = 24,
- CI_CICR2_BLW_SMASK = 0xFF
-};
-
-enum CI_REGBITS_CICR3 {
- CI_CICR3_LPF_SHIFT = 0,
- CI_CICR3_LPF_SMASK = 0x7FF,
- CI_CICR3_VSW_SHIFT = 11,
- CI_CICR3_VSW_SMASK = 0x1F,
- CI_CICR3_EFW_SHIFT = 16,
- CI_CICR3_EFW_SMASK = 0xFF,
- CI_CICR3_BFW_SHIFT = 24,
- CI_CICR3_BFW_SMASK = 0xFF
-};
-
-enum CI_REGBITS_CICR4 {
- CI_CICR4_DIV_SHIFT = 0,
- CI_CICR4_DIV_SMASK = 0xFF,
- CI_CICR4_FR_RATE_SHIFT = 8,
- CI_CICR4_FR_RATE_SMASK = 0x7,
- CI_CICR4_RESERVED1 = 0x0007F800,
- CI_CICR4_MCLK_EN = 0x00080000,
- CI_CICR4_VSP = 0x00100000,
- CI_CICR4_HSP = 0x00200000,
- CI_CICR4_PCP = 0x00400000,
- CI_CICR4_PCLK_EN = 0x00800000,
- CI_CICR4_RESERVED2 = 0xFF000000,
- CI_CICR4_RESERVED = CI_CICR4_RESERVED1 | CI_CICR4_RESERVED2
-};
-
-enum CI_REGBITS_CISR {
- CI_CISR_IFO_0 = 0x00000001,
- CI_CISR_IFO_1 = 0x00000002,
- CI_CISR_IFO_2 = 0x00000004,
- CI_CISR_EOF = 0x00000008,
- CI_CISR_SOF = 0x00000010,
- CI_CISR_CDD = 0x00000020,
- CI_CISR_CQD = 0x00000040,
- CI_CISR_PAR_ERR = 0x00000080,
- CI_CISR_EOL = 0x00000100,
- CI_CISR_FEMPTY_0 = 0x00000200,
- CI_CISR_FEMPTY_1 = 0x00000400,
- CI_CISR_FEMPTY_2 = 0x00000800,
- CI_CISR_RDAV_0 = 0x00001000,
- CI_CISR_RDAV_1 = 0x00002000,
- CI_CISR_RDAV_2 = 0x00004000,
- CI_CISR_FTO = 0x00008000,
- CI_CISR_RESERVED = 0xFFFF0000
-};
-
-enum CI_REGBITS_CIFR {
- CI_CIFR_FEN0 = 0x00000001,
- CI_CIFR_FEN1 = 0x00000002,
- CI_CIFR_FEN2 = 0x00000004,
- CI_CIFR_RESETF = 0x00000008,
- CI_CIFR_THL_0_SHIFT= 4,
- CI_CIFR_THL_0_SMASK= 0x3,
- CI_CIFR_RESERVED1 = 0x000000C0,
- CI_CIFR_FLVL0_SHIFT= 8,
- CI_CIFR_FLVL0_SMASK= 0xFF,
- CI_CIFR_FLVL1_SHIFT= 16,
- CI_CIFR_FLVL1_SMASK= 0x7F,
- CI_CIFR_FLVL2_SHIFT= 23,
- CI_CIFR_FLVL2_SMASK= 0x7F,
- CI_CIFR_RESERVED2 = 0xC0000000,
- CI_CIFR_RESERVED = CI_CIFR_RESERVED1 | CI_CIFR_RESERVED2
-};
-
-//---------------------------------------------------------------------------
-// Parameter Type definitions
-//---------------------------------------------------------------------------
-typedef enum {
- CI_RAW8 = 0, //RAW
- CI_RAW9,
- CI_RAW10,
- CI_YCBCR422, //YCBCR
- CI_YCBCR422_PLANAR, //YCBCR Planaried
- CI_RGB444, //RGB
- CI_RGB555,
- CI_RGB565,
- CI_RGB666,
- CI_RGB888,
- CI_RGBT555_0, //RGB+Transparent bit 0
- CI_RGBT888_0,
- CI_RGBT555_1, //RGB+Transparent bit 1
- CI_RGBT888_1,
- CI_RGB666_PACKED, //RGB Packed
- CI_RGB888_PACKED,
- CI_INVALID_FORMAT = 0xFF
-} CI_IMAGE_FORMAT;
-
-typedef enum {
- CI_INTSTATUS_IFO_0 = 0x00000001,
- CI_INTSTATUS_IFO_1 = 0x00000002,
- CI_INTSTATUS_IFO_2 = 0x00000004,
- CI_INTSTATUS_EOF = 0x00000008,
- CI_INTSTATUS_SOF = 0x00000010,
- CI_INTSTATUS_CDD = 0x00000020,
- CI_INTSTATUS_CQD = 0x00000040,
- CI_INTSTATUS_PAR_ERR = 0x00000080,
- CI_INTSTATUS_EOL = 0x00000100,
- CI_INTSTATUS_FEMPTY_0 = 0x00000200,
- CI_INTSTATUS_FEMPTY_1 = 0x00000400,
- CI_INTSTATUS_FEMPTY_2 = 0x00000800,
- CI_INTSTATUS_RDAV_0 = 0x00001000,
- CI_INTSTATUS_RDAV_1 = 0x00002000,
- CI_INTSTATUS_RDAV_2 = 0x00004000,
- CI_INTSTATUS_FTO = 0x00008000,
- CI_INTSTATUS_ALL = 0x0000FFFF
-} CI_INTERRUPT_STATUS;
-
-typedef enum {
- CI_INT_IFO = 0x00000001,
- CI_INT_EOF = 0x00000002,
- CI_INT_SOF = 0x00000004,
- CI_INT_CDD = 0x00000008,
- CI_INT_CQD = 0x00000010,
- CI_INT_PAR_ERR = 0x00000020,
- CI_INT_EOL = 0x00000040,
- CI_INT_FEMPTY = 0x00000080,
- CI_INT_RDAV = 0x00000100,
- CI_INT_FTO = 0x00000200,
- CI_INT_ALL = 0x000003FF
-} CI_INTERRUPT_MASK;
-#define CI_INT_MAX 10
-
-typedef enum CI_MODE {
- CI_MODE_MP, // Master-Parallel
- CI_MODE_SP, // Slave-Parallel
- CI_MODE_MS, // Master-Serial
- CI_MODE_EP, // Embedded-Parallel
- CI_MODE_ES // Embedded-Serial
-} CI_MODE;
-
-
-typedef enum {
- CI_FR_ALL = 0, // Capture all incoming frames
- CI_FR_1_2, // Capture 1 out of every 2 frames
- CI_FR_1_3, // Capture 1 out of every 3 frames
- CI_FR_1_4,
- CI_FR_1_5,
- CI_FR_1_6,
- CI_FR_1_7,
- CI_FR_1_8
-} CI_FRAME_CAPTURE_RATE;
-
-
-typedef enum {
- CI_FIFO_THL_32 = 0,
- CI_FIFO_THL_64,
- CI_FIFO_THL_96
-} CI_FIFO_THRESHOLD;
-
-typedef struct {
- unsigned int BFW;
- unsigned int BLW;
-} CI_MP_TIMING, CI_MS_TIMING;
-
-typedef struct {
- unsigned int BLW;
- unsigned int ELW;
- unsigned int HSW;
- unsigned int BFPW;
- unsigned int FSW;
- unsigned int BFW;
- unsigned int EFW;
- unsigned int VSW;
-} CI_SP_TIMING;
-
-typedef enum {
- CI_DATA_WIDTH4 = 0x0,
- CI_DATA_WIDTH5 = 0x1,
- CI_DATA_WIDTH8 = 0x2,
- CI_DATA_WIDTH9 = 0x3,
- CI_DATA_WIDTH10= 0x4
-} CI_DATA_WIDTH;
-
-//-------------------------------------------------------------------------------------------------------
-// Configuration APIs
-//-------------------------------------------------------------------------------------------------------
-
-void ci_set_frame_rate(CI_FRAME_CAPTURE_RATE frate);
-CI_FRAME_CAPTURE_RATE ci_get_frame_rate(void);
-void ci_set_image_format(CI_IMAGE_FORMAT input_format, CI_IMAGE_FORMAT output_format);
-void ci_set_mode(CI_MODE mode, CI_DATA_WIDTH data_width);
-void ci_configure_mp(unsigned int PPL, unsigned int LPF, CI_MP_TIMING* timing);
-void ci_configure_sp(unsigned int PPL, unsigned int LPF, CI_SP_TIMING* timing);
-void ci_configure_ms(unsigned int PPL, unsigned int LPF, CI_MS_TIMING* timing);
-void ci_configure_ep(int parity_check);
-void ci_configure_es(int parity_check);
-void ci_set_clock(unsigned int clk_regs_base, int pclk_enable, int mclk_enable, unsigned int mclk_khz);
-void ci_set_polarity(int pclk_sample_falling, int hsync_active_low, int vsync_active_low);
-void ci_set_fifo( unsigned int timeout, CI_FIFO_THRESHOLD threshold, int fifo1_enable,
- int fifo2_enable);
-void ci_set_int_mask( unsigned int mask);
-void ci_clear_int_status( unsigned int status);
-void ci_set_reg_value( unsigned int reg_offset, unsigned int value);
-int ci_get_reg_value(unsigned int reg_offset);
-
-void ci_reset_fifo(void);
-unsigned int ci_get_int_mask(void);
-unsigned int ci_get_int_status(void);
-void ci_slave_capture_enable(void);
-void ci_slave_capture_disable(void);
-
-//-------------------------------------------------------------------------------------------------------
-// Control APIs
-//-------------------------------------------------------------------------------------------------------
-int ci_init(void);
-void ci_deinit(void);
-void ci_enable( int dma_en);
-int ci_disable(int quick);
-
-//debug
-void ci_dump(void);
-// IRQ
-irqreturn_t pxa_camera_irq(int irq, void *dev_id, struct pt_regs *regs);
-
-#endif
Deleted: linux4palm/linux/branches/cleanup-branch-never-commit/include/asm-arm/arch-pxa/pxa_camera.h
===================================================================
--- linux4palm/linux/branches/cleanup-branch-never-commit/include/asm-arm/arch-pxa/pxa_camera.h 2007-09-14 14:31:39 UTC (rev 1318)
+++ linux4palm/linux/branches/cleanup-branch-never-commit/include/asm-arm/arch-pxa/pxa_camera.h 2007-09-14 15:29:25 UTC (rev 1319)
@@ -1,74 +0,0 @@
-/*
- pxa_camera - PXA camera driver header file
-
- Copyright (C) 2003, Intel Corporation
-
- 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; if not, write to the Free Software
- Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-*/
-
-#ifndef __LINUX_PXA_CAMERA_H_
-#define __LINUX_PXA_CAMERA_H_
-
-#define WCAM_VIDIOCSCAMREG _IOW('v', 211, int)
-#define WCAM_VIDIOCGCAMREG _IOR('v', 212, int)
-#define WCAM_VIDIOCSCIREG _IOW('v', 213, int)
-#define WCAM_VIDIOCGCIREG _IOR('v', 214, int)
-#define WCAM_VIDIOCSINFOR _IOW('v', 215, int)
-#define WCAM_VIDIOCGINFOR _IOR('v', 216, int)
-
-/*
-Image format definition
-*/
-#define CAMERA_IMAGE_FORMAT_RAW8 0
-#define CAMERA_IMAGE_FORMAT_RAW9 1
-#define CAMERA_IMAGE_FORMAT_RAW10 2
-
-#define CAMERA_IMAGE_FORMAT_RGB444 3
-#define CAMERA_IMAGE_FORMAT_RGB555 4
-#define CAMERA_IMAGE_FORMAT_RGB565 5
-#define CAMERA_IMAGE_FORMAT_RGB666_PACKED 6
-#define CAMERA_IMAGE_FORMAT_RGB666_PLANAR 7
-#define CAMERA_IMAGE_FORMAT_RGB888_PACKED 8
-#define CAMERA_IMAGE_FORMAT_RGB888_PLANAR 9
-#define CAMERA_IMAGE_FORMAT_RGBT555_0 10 //RGB+Transparent bit 0
-#define CAMERA_IMAGE_FORMAT_RGBT888_0 11
-#define CAMERA_IMAGE_FORMAT_RGBT555_1 12 //RGB+Transparent bit 1
-#define CAMERA_IMAGE_FORMAT_RGBT888_1 13
-
-#define CAMERA_IMAGE_FORMAT_YCBCR400 14
-#define CAMERA_IMAGE_FORMAT_YCBCR422_PACKED 15
-#define CAMERA_IMAGE_FORMAT_YCBCR422_PLANAR 16
-#define CAMERA_IMAGE_FORMAT_YCBCR444_PACKED 17
-#define CAMERA_IMAGE_FORMAT_YCBCR444_PLANAR 18
-
-/*
-Bpp definition
-*/
-
-#define YUV422_BPP 16
-#define RGB565_BPP 16
-#define RGB666_UNPACKED_BPP 32
-#define RGB666_PACKED_BPP 24
-
-/*
-VIDIOCCAPTURE Arguments
-*/
-#define STILL_IMAGE 1
-#define VIDEO_START 0
-#define VIDEO_STOP -1
-
-
-#endif /* __LINUX_PXA_CAMERA_H_ */
-
Deleted: linux4palm/linux/branches/cleanup-branch-never-commit/include/linux/aufs_type.h
===================================================================
--- linux4palm/linux/branches/cleanup-branch-never-commit/include/linux/aufs_type.h 2007-09-14 14:31:39 UTC (rev 1318)
+++ linux4palm/linux/branches/cleanup-branch-never-commit/include/linux/aufs_type.h 2007-09-14 15:29:25 UTC (rev 1319)
@@ -1,100 +0,0 @@
-/*
- * Copyright (C) 2005, 2006, 2007 Junjiro Okajima
- *
- * This program, aufs 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; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
-/* $Id: aufs_type.h,v 1.59 2007/06/11 01:42:40 sfjro Exp $ */
-
-#include <linux/ioctl.h>
-
-#ifndef __AUFS_TYPE_H__
-#define __AUFS_TYPE_H__
-
-#define AUFS_VERSION "20070611"
-
-/* ---------------------------------------------------------------------- */
-
-typedef short aufs_bindex_t;
-#ifdef CONFIG_AUFS_BRANCH_MAX_127
-#define AUFS_BRANCH_MAX 127
-#elif CONFIG_AUFS_BRANCH_MAX_511
-#define AUFS_BRANCH_MAX 511
-#elif defined(CONFIG_AUFS_BRANCH_MAX_1023)
-#define AUFS_BRANCH_MAX 1023
-#elif defined(CONFIG_AUFS_BRANCH_MAX_32767)
-#define AUFS_BRANCH_MAX 32767
-#else
-#error unknown CONFIG_AUFS_BRANCH_MAX value
-#endif
-
-#define AUFS_NAME "aufs"
-#define AUFS_FSTYPE AUFS_NAME
-
-#define AUFS_ROOT_INO 2
-#define AUFS_FIRST_INO 11
-
-#define AUFS_WH_PFX ".wh."
-#define AUFS_WH_PFX_LEN ((int)sizeof(AUFS_WH_PFX) - 1)
-#define AUFS_XINO_FNAME "." AUFS_NAME ".xino"
-#define AUFS_XINO_DEFPATH "/tmp/" AUFS_XINO_FNAME
-#define AUFS_DIRWH_DEF 3
-#define AUFS_RDCACHE_DEF 10 /* seconds */
-#define AUFS_WKQ_NAME AUFS_NAME "d"
-#ifdef CONFIG_AUFS_NWKQ_DEF
-#define AUFS_NWKQ_DEF CONFIG_AUFS_NWKQ_DEF
-#else
-#define AUFS_NWKQ_DEF 4
-#endif
-
-#ifdef CONFIG_AUFS_COMPAT
-#define AUFS_DIROPQ_NAME "__dir_opaque"
-#else
-#define AUFS_DIROPQ_NAME AUFS_WH_PFX ".opq" /* whiteouted doubly */
-#endif
-#define AUFS_WH_DIROPQ AUFS_WH_PFX AUFS_DIROPQ_NAME
-
-/* will be whiteouted doubly */
-#define AUFS_WH_BASENAME AUFS_WH_PFX AUFS_NAME
-#define AUFS_WH_PLINKDIR AUFS_WH_PFX "plink"
-
-/* ---------------------------------------------------------------------- */
-
-/* ioctl */
-enum {AuCtlErr, AuCtlErr_Last};
-enum {
- AuCtl_REFRESH, //AuCtl_REFRESHV,
- //AuCtl_FLUSH_PLINK,
- //AuCtl_CPUP,
- AuCtl_CPDOWN, AuCtl_MVDOWN,
- //AuCtl_DIROPQ
-};
-
-struct aufs_ctl_cp {
- int bsrc, bdst;
- int err;
-};
-
-#define Type 'A'
-#define AUFS_CTL_REFRESH _IO(Type, AuCtl_REFRESH)
-//#define AUFS_CTL_REFRESHV _IO(Type, AuCtl_REFRESHV)
-//#define AUFS_CTL_FLUSH_PLINK _IOR(Type, AuCtl_FLUSH_PLINK)
-//#define AUFS_CTL_CPUP _IOWR(Type, AuCtl_CPUP, struct aufs_ctl_cp)
-#define AUFS_CTL_CPDOWN _IOWR(Type, AuCtl_CPDOWN, struct aufs_ctl_cp)
-#define AUFS_CTL_MVDOWN _IOWR(Type, AuCtl_MVDOWN, struct aufs_ctl_cp)
-//#define AUFS_CTL_DIROPQ _IO(Type, AuCtl_DIROPQ)
-#undef Type
-
-#endif /* __AUFS_TYPE_H__ */
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <hap...@us...> - 2007-09-17 13:00:32
|
Revision: 1323
http://hackndev.svn.sourceforge.net/hackndev/?rev=1323&view=rev
Author: happy-slapin
Date: 2007-09-17 06:00:29 -0700 (Mon, 17 Sep 2007)
Log Message:
-----------
cleanup: removed unrelated junk
Modified Paths:
--------------
linux4palm/linux/branches/cleanup-branch-never-commit/drivers/i2c/algos/Kconfig
linux4palm/linux/branches/cleanup-branch-never-commit/drivers/i2c/algos/Makefile
linux4palm/linux/branches/cleanup-branch-never-commit/drivers/i2c/chips/Kconfig
linux4palm/linux/branches/cleanup-branch-never-commit/drivers/i2c/chips/Makefile
linux4palm/linux/branches/cleanup-branch-never-commit/drivers/i2c/i2c-core.c
linux4palm/linux/branches/cleanup-branch-never-commit/include/asm-arm/arch-pxa/htcsable-asic.h
linux4palm/linux/branches/cleanup-branch-never-commit/include/asm-arm/arch-pxa/htcsable-gpio.h
linux4palm/linux/branches/cleanup-branch-never-commit/include/linux/mfd/htc-egpio.h
Modified: linux4palm/linux/branches/cleanup-branch-never-commit/drivers/i2c/algos/Kconfig
===================================================================
--- linux4palm/linux/branches/cleanup-branch-never-commit/drivers/i2c/algos/Kconfig 2007-09-17 12:14:36 UTC (rev 1322)
+++ linux4palm/linux/branches/cleanup-branch-never-commit/drivers/i2c/algos/Kconfig 2007-09-17 13:00:29 UTC (rev 1323)
@@ -42,17 +42,6 @@
tristate "MPC8xx CPM I2C interface"
depends on 8xx && I2C
-config I2C_ALGOPXA
- tristate "PXA I2C Algorithm"
- depends on ARCH_PXA && I2C
- help
- This supports the use of the PXA I2C interface found on XScale
- processors. Say Y if you have one of these. You should also say Y
- for the PXA I2C peripheral driver support below.
-
- This support is also available as a module. If so, the module
- will be called i2c-algo-pxa.
-
config I2C_ALGO_SGI
tristate "I2C SGI interfaces"
depends on I2C && (SGI_IP22 || SGI_IP32 || X86_VISWS)
Modified: linux4palm/linux/branches/cleanup-branch-never-commit/drivers/i2c/algos/Makefile
===================================================================
--- linux4palm/linux/branches/cleanup-branch-never-commit/drivers/i2c/algos/Makefile 2007-09-17 12:14:36 UTC (rev 1322)
+++ linux4palm/linux/branches/cleanup-branch-never-commit/drivers/i2c/algos/Makefile 2007-09-17 13:00:29 UTC (rev 1323)
@@ -6,7 +6,6 @@
obj-$(CONFIG_I2C_ALGOPCF) += i2c-algo-pcf.o
obj-$(CONFIG_I2C_ALGOPCA) += i2c-algo-pca.o
obj-$(CONFIG_I2C_ALGO_SGI) += i2c-algo-sgi.o
-obj-$(CONFIG_I2C_PXA) += i2c-algo-pxa.o
ifeq ($(CONFIG_I2C_DEBUG_ALGO),y)
EXTRA_CFLAGS += -DDEBUG
Modified: linux4palm/linux/branches/cleanup-branch-never-commit/drivers/i2c/chips/Kconfig
===================================================================
--- linux4palm/linux/branches/cleanup-branch-never-commit/drivers/i2c/chips/Kconfig 2007-09-17 12:14:36 UTC (rev 1322)
+++ linux4palm/linux/branches/cleanup-branch-never-commit/drivers/i2c/chips/Kconfig 2007-09-17 13:00:29 UTC (rev 1323)
@@ -36,12 +36,6 @@
This driver can also be built as a module. If so, the module
will be called eeprom.
-config I2C_ADCM2650
- tristate "ADCM2650 device"
- depends on I2C && EXPERIMENTAL
- help
- If you say yes here you get support for the ADCM 2650 chip.
-
config SENSORS_PCF8574
tristate "Philips PCF8574 and PCF8574A"
depends on I2C && EXPERIMENTAL
@@ -115,7 +109,7 @@
# and having mostly OMAP-specific board support
config TPS65010
tristate "TPS6501x Power Management chips"
- depends on I2C && (ARCH_OMAP || MACH_T3XSCALE)
+ depends on I2C && ARCH_OMAP
default y if MACH_OMAP_H2 || MACH_OMAP_H3 || MACH_OMAP_OSK
help
If you say yes here you get support for the TPS6501x series of
@@ -158,17 +152,4 @@
This driver can also be built as a module. If so, the module
will be called max6875.
-config I2C_OV9640
- tristate "Support for OmniVision 9640 camera sensor"
- depends on I2C
- help
- Say yes here to enable OV9640 sensor which is found in some
- handhelds and phones
-
-config I2C_OV96XX
- tristate "Support for OmniVision 96XX camera sensor"
- depends on I2C
- help
- Say yes here to enable OV96XX sensor which is found in some
- handhelds and phones
endmenu
Modified: linux4palm/linux/branches/cleanup-branch-never-commit/drivers/i2c/chips/Makefile
===================================================================
--- linux4palm/linux/branches/cleanup-branch-never-commit/drivers/i2c/chips/Makefile 2007-09-17 12:14:36 UTC (rev 1322)
+++ linux4palm/linux/branches/cleanup-branch-never-commit/drivers/i2c/chips/Makefile 2007-09-17 13:00:29 UTC (rev 1323)
@@ -15,12 +15,6 @@
obj-$(CONFIG_ISP1301_OMAP) += isp1301_omap.o
obj-$(CONFIG_TPS65010) += tps65010.o
-obj-$(CONFIG_I2C_ADCM2650) += adcm2650-i2c.o
-
-obj-$(CONFIG_I2C_OV9640) += i2c-ov9640.o
-
-obj-$(CONFIG_I2C_OV96XX) += i2c-ov96xx.o
-
ifeq ($(CONFIG_I2C_DEBUG_CHIP),y)
EXTRA_CFLAGS += -DDEBUG
endif
Modified: linux4palm/linux/branches/cleanup-branch-never-commit/drivers/i2c/i2c-core.c
===================================================================
--- linux4palm/linux/branches/cleanup-branch-never-commit/drivers/i2c/i2c-core.c 2007-09-17 12:14:36 UTC (rev 1322)
+++ linux4palm/linux/branches/cleanup-branch-never-commit/drivers/i2c/i2c-core.c 2007-09-17 13:00:29 UTC (rev 1323)
@@ -34,8 +34,8 @@
#include <linux/mutex.h>
#include <linux/completion.h>
#include <asm/uaccess.h>
-#include <linux/delay.h>
+
static LIST_HEAD(adapters);
static LIST_HEAD(drivers);
static DEFINE_MUTEX(core_lists);
@@ -663,7 +663,7 @@
msg.addr = client->addr;
msg.flags = client->flags & I2C_M_TEN;
msg.len = count;
- msg.buf = (char *) buf;
+ msg.buf = (char *)buf;
ret = i2c_transfer(adap, &msg, 1);
Modified: linux4palm/linux/branches/cleanup-branch-never-commit/include/asm-arm/arch-pxa/htcsable-asic.h
===================================================================
--- linux4palm/linux/branches/cleanup-branch-never-commit/include/asm-arm/arch-pxa/htcsable-asic.h 2007-09-17 12:14:36 UTC (rev 1322)
+++ linux4palm/linux/branches/cleanup-branch-never-commit/include/asm-arm/arch-pxa/htcsable-asic.h 2007-09-17 13:00:29 UTC (rev 1323)
@@ -24,44 +24,45 @@
/* 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_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 */
+#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 */
/* ASIC3 GPIO D bank */
-#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 */
+#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 */
extern struct platform_device htcsable_asic3;
#endif /* _HTCSABLE_ASIC_H_ */
+
Modified: linux4palm/linux/branches/cleanup-branch-never-commit/include/asm-arm/arch-pxa/htcsable-gpio.h
===================================================================
--- linux4palm/linux/branches/cleanup-branch-never-commit/include/asm-arm/arch-pxa/htcsable-gpio.h 2007-09-17 12:14:36 UTC (rev 1322)
+++ linux4palm/linux/branches/cleanup-branch-never-commit/include/asm-arm/arch-pxa/htcsable-gpio.h 2007-09-17 13:00:29 UTC (rev 1323)
@@ -11,69 +11,93 @@
#include <asm/arch/pxa-regs.h>
-/* Misc defines */
-#define GPIO_NR_HTCSABLE_KEY_ON_N 0
-#define GPIO_NR_HTCSABLE_GP_RST_N 1
+#define GET_HTCSABLE_GPIO(gpio) \
+ (GPLR(GPIO_NR_HTCSABLE_ ## gpio) & GPIO_bit(GPIO_NR_HTCSABLE_ ## gpio))
-#define GPIO_NR_HTCSABLE_ASIC3_EXT_INT 9
-#define GPIO_NR_HTCSABLE_ASIC3_SDIO_INT_N 13
+#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 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 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 GPIO_NR_HTCSABLE_ACX 111
-#define GPIO_NR_HTCSABLE_PWM1OUT_MD (115 | GPIO_ALT_FN_3_OUT)
+#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
-/* 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_3 11 /* phone-related output */
-/* 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_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
#define GPIO_NR_HTCSABLE_TOUCHPANEL_IRQ_N 115
-/* 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
+#define EGPIO6_BT_3V3_ON (1<<6) /* Bluetooth 3.3V enable */
-#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)
+/* TODO: should be checked */
-/* 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_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)
-/* 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_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 */
#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 */
-/* Bluetooth */
-#define GPIO_NR_HTCSABLE_BT_RXD_MD (34 | GPIO_ALT_FN_1_IN) /* FFUART */
+#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 */
-/* 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_STD_RXD_MD (46 | GPIO_ALT_FN_2_IN)
+#define GPIO_NR_HTCSABLE_STD_TXD_MD (47 | GPIO_ALT_FN_1_OUT)
-/* Keyboard */
+#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
+ ****************************************************************/
+
#define GPIO_NR_HTCSABLE_KP_MKIN0 100
#define GPIO_NR_HTCSABLE_KP_MKIN1 101
#define GPIO_NR_HTCSABLE_KP_MKIN2 102
@@ -92,45 +116,21 @@
#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)
-
-/* 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)
-
+#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)
#endif /* _HTCSABLE_GPIO_H */
Modified: linux4palm/linux/branches/cleanup-branch-never-commit/include/linux/mfd/htc-egpio.h
===================================================================
--- linux4palm/linux/branches/cleanup-branch-never-commit/include/linux/mfd/htc-egpio.h 2007-09-17 12:14:36 UTC (rev 1322)
+++ linux4palm/linux/branches/cleanup-branch-never-commit/include/linux/mfd/htc-egpio.h 2007-09-17 13:00:29 UTC (rev 1323)
@@ -5,8 +5,6 @@
#ifndef __HTC_EGPIO_H__
#define __HTC_EGPIO_H__
-#include <linux/gpiodev.h> /* struct gpiodev_ops */
-
enum {
/* Maximum number of 16 bit registers a chip may have. */
MAX_EGPIO_REGS = 8,
@@ -18,18 +16,15 @@
enum {
/* This pin corresponds to an input gpio */
HTC_EGPIO_TYPE_INPUT,
- /* This pin corresponds to an irq that does not have an
- * associated input gpio */
- HTC_EGPIO_TYPE_IRQ,
/* This pin corresponds to an output gpio */
HTC_EGPIO_TYPE_OUTPUT,
};
/* Information on each pin on the chip. */
struct htc_egpio_pinInfo {
- /* The bit offset of the pin (eg, 18 is the third bit of the
- * second register). */
- int pin_nr;
+ /* The gpio id of the pin (eg, gpio_base+18 is the third bit
+ * of the second register). */
+ int gpio;
/* The type - input, irq, output */
int type;
/* For output pins - the poweron default */
@@ -40,8 +35,6 @@
/* Platform data description provided by the arch */
struct htc_egpio_platform_data {
- /* This is 'gpiodev' capable */
- struct gpiodev_ops ops;
/* Beginning of available irqs (eg, IRQ_BOARD_START) */
int irq_base;
/* Beginning of available gpios (eg, GPIO_BASE_INCREMENT) */
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <hap...@us...> - 2007-09-17 15:42:09
|
Revision: 1328
http://hackndev.svn.sourceforge.net/hackndev/?rev=1328&view=rev
Author: happy-slapin
Date: 2007-09-17 08:37:25 -0700 (Mon, 17 Sep 2007)
Log Message:
-----------
cleanup: update from hh.org
Added Paths:
-----------
linux4palm/linux/branches/cleanup-branch-never-commit/drivers/input/keyboard/gpiodev_keys2.c
linux4palm/linux/branches/cleanup-branch-never-commit/include/linux/gpiodev_keys2.h
linux4palm/linux/branches/cleanup-branch-never-commit/include/linux/mfd/htc-bbkeys.h
Removed Paths:
-------------
linux4palm/linux/branches/cleanup-branch-never-commit/include/asm-arm/arch-pxa/i2c-pxa.h
Added: linux4palm/linux/branches/cleanup-branch-never-commit/drivers/input/keyboard/gpiodev_keys2.c
===================================================================
--- linux4palm/linux/branches/cleanup-branch-never-commit/drivers/input/keyboard/gpiodev_keys2.c (rev 0)
+++ linux4palm/linux/branches/cleanup-branch-never-commit/drivers/input/keyboard/gpiodev_keys2.c 2007-09-17 15:37:25 UTC (rev 1328)
@@ -0,0 +1,336 @@
+/*
+ * Driver for diagonal joypads on GPIO lines capable of generating interrupts.
+ *
+ * Copyright 2007 Milan Plzik, based on gpio-keys.c (c) Phil Blundell 2005
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
+ */
+
+#include <linux/module.h>
+#include <linux/version.h>
+
+#include <linux/init.h>
+#include <linux/fs.h>
+#include <linux/interrupt.h>
+#include <linux/irq.h>
+#include <linux/sched.h>
+#include <linux/pm.h>
+#include <linux/delay.h>
+#include <linux/platform_device.h>
+#include <linux/input.h>
+#include <linux/irq.h>
+#include <linux/sort.h>
+#include <linux/gpiodev.h>
+#include <linux/gpiodev_keys2.h>
+
+struct gpiodev_keys2_drvdata {
+ struct input_dev *input;
+ struct timer_list debounce_timer;
+ struct gpiodev_keys2_gpio ***button_gpios;
+ int *gpio_delays;
+ struct gpiodev_keys2_button **buttons_by_prio;
+ int *gpio_used_prio;
+};
+
+
+static struct gpiodev_keys2_gpio *lookup_gpio (struct gpiodev_keys2_platform_data *pdata,
+ const char *name)
+{
+ int i;
+
+ for (i = 0; i < pdata->ngpios; i++) {
+ if (!strcmp (name, pdata->gpios[i].name))
+ return &pdata->gpios[i];
+ }
+
+ return NULL;
+}
+
+static int count_gpios (struct gpiodev_keys2_button *btn)
+{
+ int i = 0;
+ const char **gpio = btn->gpio_names;
+
+ while (gpio[i]) i++;
+
+ return i;
+}
+
+
+static irqreturn_t gpiodev_keys2_isr(int irq, void *data)
+{
+ int i;
+ struct platform_device *pdev = data;
+ struct gpiodev_keys2_platform_data *pdata = pdev->dev.platform_data;
+ struct gpiodev_keys2_drvdata *drvdata = platform_get_drvdata(pdev);
+
+ /* Find out which GPIO has been asserted and the corresponding delay for
+ * debouncing. */
+ for (i = 0; i < pdata->ngpios; i++)
+ if (irq == gpiodev_to_irq(&pdata->gpios[i].gpio)) {
+ break;
+ };
+
+ /* Prepare delayed call of debounce handler */
+ if (time_before(drvdata->debounce_timer.expires, jiffies +
+ msecs_to_jiffies(drvdata->gpio_delays[i])) ||
+ !timer_pending(&drvdata->debounce_timer))
+ mod_timer(&drvdata->debounce_timer,
+ jiffies + msecs_to_jiffies(drvdata->gpio_delays[i]));
+
+ return IRQ_HANDLED;
+}
+
+static void debounce_handler(unsigned long data)
+{
+ struct platform_device *pdev = (void*)data;
+ struct gpiodev_keys2_platform_data *pdata = pdev->dev.platform_data;
+ struct gpiodev_keys2_drvdata *drvdata = platform_get_drvdata(pdev);
+ struct gpiodev_keys2_button *button;
+ struct gpiodev_keys2_gpio **gpio;
+ int i;
+
+ memset(drvdata->gpio_used_prio, 0, sizeof(drvdata->gpio_used_prio[0])*pdata->ngpios);
+
+ /* Clear reported buttons */
+ for (i = 0; i < pdata->nbuttons; i++)
+ input_report_key(drvdata->input, pdata->buttons[i].keycode, 0);
+
+ for (i = 0; i < pdata->nbuttons; i++) {
+ int button_idx = drvdata->buttons_by_prio[i] - &pdata->buttons[0];
+ button = drvdata->buttons_by_prio[i];
+ gpio = drvdata->button_gpios[button_idx];
+
+ /* are all required GPIOs asserted? */
+ do {
+ int gpio_idx = gpio[0] - pdata->gpios; /* index in pdata->gpios */
+ if (((gpiodev_get_value(&gpio[0]->gpio) ? 1 : 0) ^ (gpio[0]->active_low)) &&
+ /* this is only true when gpio prio is 0,
+ * because the buttons are ordered descending by
+ * priority */
+ drvdata->gpio_used_prio[gpio_idx]<=button->priority)
+ continue;
+ else
+ break;
+ } while ((++gpio)[0] != NULL);
+
+ if (gpio[0] == NULL) {
+ /* all gpios are asserted and unused otherwise, so key
+ * can be pressed and GPIOs will be marked as used. */
+ gpio = drvdata->button_gpios[button_idx];
+ do {
+ int gpio_idx = gpio[0] - pdata->gpios;
+ drvdata->gpio_used_prio[gpio_idx] = button->priority;
+ } while (((++gpio)[0]) != NULL);
+ if (button->keycode != -1)
+ input_report_key(drvdata->input, button->keycode, 1);
+ }
+ };
+ input_sync(drvdata->input);
+}
+
+
+static int btnprio_cmp (const void *a, const void *b)
+{
+ const struct gpiodev_keys2_button *b1, *b2;
+
+ b1 = *((const struct gpiodev_keys2_button**)a);
+ b2 = *((const struct gpiodev_keys2_button**)b);
+
+ return b2->priority - b1->priority;
+}
+
+/* Builds array, which on i-th position contains pointers to all GPIOs used by
+ * i-th button in pdata->buttons, and also finds maximal debounce time for each
+ * gpio.
+ */
+
+static int gpiodev_keys2_init_drvdata(struct platform_device *pdev)
+{
+ struct gpiodev_keys2_platform_data *pdata = pdev->dev.platform_data;
+ struct gpiodev_keys2_drvdata *drvdata = platform_get_drvdata(pdev);
+ struct gpiodev_keys2_gpio *gpio;
+ int i, j;
+ int button_gpios;
+
+ if (drvdata->button_gpios) {
+ printk (KERN_ERR "gpiodev-keys2: Attempting to re-create drvdata\n");
+ return -EBUSY;
+ };
+
+ drvdata->button_gpios = kzalloc(
+ pdata->nbuttons*sizeof(*drvdata->button_gpios),
+ GFP_KERNEL);
+ drvdata->gpio_delays = kzalloc(pdata->ngpios*sizeof(*drvdata->gpio_delays), GFP_KERNEL);
+ drvdata->buttons_by_prio = kzalloc(pdata->nbuttons*sizeof(*drvdata->buttons_by_prio), GFP_KERNEL);
+ drvdata->gpio_used_prio = kzalloc(pdata->ngpios*sizeof(*drvdata->gpio_used_prio), GFP_KERNEL);
+
+ for (i = 0; i < pdata->nbuttons; i++) {
+ button_gpios = count_gpios(&pdata->buttons[i]);
+ drvdata->button_gpios[i] = kzalloc((button_gpios+1)*sizeof(drvdata->button_gpios[i]), GFP_KERNEL);
+
+ /* Put all GPIOs used by i-th button into button_gpios[i] */
+ for (j = 0; j < button_gpios; j++) {
+ gpio = lookup_gpio(pdata, pdata->buttons[i].gpio_names[j]);
+ if (!gpio) {
+ printk(KERN_WARNING "gpiodev-keys2: Unknown gpio '%s'\n", pdata->buttons[i].gpio_names[j]);
+ continue;
+ };
+
+ /* See whether actual button has delay, which is bigger
+ * than delay GPIO. If so, update GPIOs delay.
+ */
+ drvdata->gpio_delays[gpio - pdata->gpios] = max(
+ drvdata->gpio_delays[gpio - pdata->gpios],
+ pdata->buttons[i].debounce_ms);
+
+ drvdata->button_gpios[i][j] = gpio;
+ };
+
+
+ };
+
+ /* Create list of buttons sorted descending by priority */
+ for (i = 0; i < pdata->nbuttons; i++)
+ drvdata->buttons_by_prio[i] = &pdata->buttons[i];
+
+ sort(drvdata->buttons_by_prio, pdata->nbuttons, sizeof(drvdata->buttons_by_prio[0]), btnprio_cmp, NULL);
+ for (i = 0; i <pdata->nbuttons; i++)
+ printk (KERN_INFO "- button '%s', prio %d\n", drvdata->buttons_by_prio[i]->gpio_names[0], drvdata->buttons_by_prio[i]->priority);
+
+ return 0;
+}
+
+static void gpiodev_keys2_free_mapping(struct platform_device *pdev)
+{
+ struct gpiodev_keys2_platform_data *pdata = pdev->dev.platform_data;
+ struct gpiodev_keys2_drvdata *drvdata = platform_get_drvdata(pdev);
+ int i;
+
+ if (!drvdata)
+ return;
+
+ for (i = 0; i < pdata->nbuttons; i++)
+ kfree(drvdata->button_gpios[i]);
+
+ kfree(drvdata->button_gpios);
+ kfree(drvdata->gpio_delays);
+ kfree(drvdata->buttons_by_prio);
+ kfree(drvdata->gpio_used_prio);
+}
+
+
+static int __devinit gpiodev_keys2_probe(struct platform_device *pdev)
+{
+ struct gpiodev_keys2_drvdata *drvdata;
+ struct gpiodev_keys2_platform_data *pdata = pdev->dev.platform_data;
+ struct input_dev *input;
+ int i, error;
+
+ input = input_allocate_device();
+ if (!input)
+ return -ENOMEM;
+
+ input->evbit[0] = BIT(EV_KEY) | BIT(EV_REP);
+ input->name = pdev->name;
+ input->phys = "gpiodev-keys2/input0";
+ input->cdev.dev = &pdev->dev;
+ // input->private // do we need this?
+ input->id.bustype = BUS_HOST;
+ input->id.vendor = 0x0001;
+ input->id.product = 0x0001;
+ input->id.version = 0x0100;
+
+ drvdata = kzalloc(sizeof(struct gpiodev_keys2_drvdata), GFP_KERNEL);
+ drvdata->input = input;
+ platform_set_drvdata(pdev, drvdata);
+
+ setup_timer(&drvdata->debounce_timer, debounce_handler, (unsigned long) pdev);
+
+ for (i = 0; i < pdata->nbuttons; i++)
+ set_bit(pdata->buttons[i].keycode, input->keybit);
+
+ error = input_register_device(input);
+ if (error) {
+ printk(KERN_ERR "Unable to register gpiodev-keys2 input device\n");
+ goto fail;
+ }
+
+ gpiodev_keys2_init_drvdata(pdev);
+
+
+ for (i = 0; i < pdata->ngpios; i++) {
+ int irq = gpiodev_to_irq(&(pdata->gpios[i].gpio));
+
+ set_irq_type(irq, IRQ_TYPE_EDGE_BOTH);
+ error = request_irq(irq, gpiodev_keys2_isr,
+ IRQF_SAMPLE_RANDOM | IRQF_SHARED,
+ pdata->gpios[i].name ?
+ pdata->gpios[i].name : "gpiodev_keys2", pdev);
+
+ if (error) {
+ printk(KERN_ERR "gpiodev-keys: unable to claim irq %d; error %d\n", irq, error);
+ goto fail;
+ }
+ }
+
+
+ return 0;
+
+fail:
+ for (i = i - 1; i >= 0; i--)
+ free_irq(gpiodev_to_irq(&pdata->gpios[i].gpio),pdev);
+
+ input_free_device(input);
+
+ del_timer_sync(&drvdata->debounce_timer);
+
+ return error;
+}
+
+static int __devexit gpiodev_keys2_remove(struct platform_device *pdev)
+{
+ struct gpiodev_keys2_drvdata *drvdata = platform_get_drvdata(pdev);
+ struct gpiodev_keys2_platform_data *pdata = pdev->dev.platform_data;
+ int i;
+
+ del_timer_sync(&drvdata->debounce_timer);
+
+ for (i = 0; i < pdata->ngpios; i++)
+ free_irq(gpiodev_to_irq(&pdata->gpios[i].gpio), pdev);
+
+ input_unregister_device(drvdata->input);
+ input_free_device(drvdata->input);
+ gpiodev_keys2_free_mapping(pdev);
+ kfree(drvdata);
+
+ return 0;
+}
+
+
+struct platform_driver gpiodev_keys2_device_driver = {
+ .probe = gpiodev_keys2_probe,
+ .remove = __devexit_p(gpiodev_keys2_remove),
+ .driver = {
+ .name = "gpiodev-keys2",
+ }
+};
+
+static int __init gpiodev_keys2_init(void)
+{
+ return platform_driver_register(&gpiodev_keys2_device_driver);
+}
+
+static void __exit gpiodev_keys2_exit(void)
+{
+ platform_driver_unregister(&gpiodev_keys2_device_driver);
+}
+
+module_init(gpiodev_keys2_init);
+module_exit(gpiodev_keys2_exit);
+
+MODULE_LICENSE("GPL");
+MODULE_AUTHOR("Milan Plzik <mil...@gm...>");
+MODULE_DESCRIPTION("Keyboard driver for GPIO");
Deleted: linux4palm/linux/branches/cleanup-branch-never-commit/include/asm-arm/arch-pxa/i2c-pxa.h
===================================================================
--- linux4palm/linux/branches/cleanup-branch-never-commit/include/asm-arm/arch-pxa/i2c-pxa.h 2007-09-17 15:12:45 UTC (rev 1327)
+++ linux4palm/linux/branches/cleanup-branch-never-commit/include/asm-arm/arch-pxa/i2c-pxa.h 2007-09-17 15:37:25 UTC (rev 1328)
@@ -1,76 +0,0 @@
-/*
- * i2c_pxa.h
- *
- * Copyright (C) 2002 Intrinsyc Software Inc.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2 as
- * published by the Free Software Foundation.
- *
- */
-#ifndef _I2C_PXA_H_
-#define _I2C_PXA_H_
-
-struct i2c_algo_pxa_data
-{
- void (*write_byte) (u8 value);
- u8 (*read_byte) (void);
- void (*start) (void);
- void (*repeat_start) (void);
- void (*stop) (void);
- void (*abort) (void);
- int (*wait_bus_not_busy) (void);
- int (*wait_for_interrupt) (int wait_type);
- void (*transfer) (int lastbyte, int receive, int midbyte);
- void (*reset) (void);
-
- int udelay;
- int timeout;
-};
-
-#define DEF_TIMEOUT 3
-#define BUS_ERROR (-EREMOTEIO)
-#define ACK_DELAY 0 /* time to delay before checking bus error */
-#define MAX_MESSAGES 65536 /* maximum number of messages to send */
-
-#define I2C_SLEEP_TIMEOUT 2 /* time to sleep for on i2c transactions */
-#define I2C_RETRY (-2000) /* an error has occurred retry transmit */
-#define I2C_TRANSMIT 1
-#define I2C_RECEIVE 0
-#define I2C_PXA_SLAVE_ADDR 0x1 /* slave pxa unit address */
-#define I2C_ICR_INIT (ICR_BEIE | ICR_IRFIE | ICR_ITEIE | ICR_GCD | ICR_SCLE) /* ICR initialization value */
-/* ICR initialize bit values
-*
-* 15. FM 0 (100 Khz operation)
-* 14. UR 0 (No unit reset)
-* 13. SADIE 0 (Disables the unit from interrupting on slave addresses
-* matching its slave address)
-* 12. ALDIE 0 (Disables the unit from interrupt when it loses arbitration
-* in master mode)
-* 11. SSDIE 0 (Disables interrupts from a slave stop detected, in slave mode)
-* 10. BEIE 1 (Enable interrupts from detected bus errors, no ACK sent)
-* 9. IRFIE 1 (Enable interrupts from full buffer received)
-* 8. ITEIE 1 (Enables the I2C unit to interrupt when transmit buffer empty)
-* 7. GCD 1 (Disables i2c unit response to general call messages as a slave)
-* 6. IUE 0 (Disable unit until we change settings)
-* 5. SCLE 1 (Enables the i2c clock output for master mode (drives SCL)
-* 4. MA 0 (Only send stop with the ICR stop bit)
-* 3. TB 0 (We are not transmitting a byte initially)
-* 2. ACKNAK 0 (Send an ACK after the unit receives a byte)
-* 1. STOP 0 (Do not send a STOP)
-* 0. START 0 (Do not send a START)
-*
-*/
-
-#define I2C_ISR_INIT 0x7FF /* status register init */
-/* I2C status register init values
- *
- * 10. BED 1 (Clear bus error detected)
- * 9. SAD 1 (Clear slave address detected)
- * 7. IRF 1 (Clear IDBR Receive Full)
- * 6. ITE 1 (Clear IDBR Transmit Empty)
- * 5. ALD 1 (Clear Arbitration Loss Detected)
- * 4. SSD 1 (Clear Slave Stop Detected)
- */
-
-#endif
Added: linux4palm/linux/branches/cleanup-branch-never-commit/include/linux/gpiodev_keys2.h
===================================================================
--- linux4palm/linux/branches/cleanup-branch-never-commit/include/linux/gpiodev_keys2.h (rev 0)
+++ linux4palm/linux/branches/cleanup-branch-never-commit/include/linux/gpiodev_keys2.h 2007-09-17 15:37:25 UTC (rev 1328)
@@ -0,0 +1,37 @@
+#ifndef __GPIODEV_KEYS2_H
+#define __GPIODEV_KEYS2_H
+
+#include <linux/gpiodev.h>
+
+#define MAX_GPIOS_PER_BUTTON 5
+
+struct gpiodev_keys2_gpio {
+ const char *name; /* GPIO identifier */
+ struct gpio gpio; /* gpiodev descriptor */
+ int active_low;
+};
+
+struct gpiodev_keys2_button {
+ int keycode; /* key code for the button */
+
+ const char *gpio_names[MAX_GPIOS_PER_BUTTON];
+ /* which GPIOs have to be asserted in order
+ * to emit keypress. This is NULL-terminated
+ * array of string GPIO identifiers */
+
+ int debounce_ms; /* Value for this button's debounce will be at
+ * least this number of milliseconds. */
+
+ int priority; /* If more buttons are likely to be pressed,
+ * only those with highest priority will
+ * generate keypress, others will be released */
+};
+
+struct gpiodev_keys2_platform_data {
+ struct gpiodev_keys2_gpio *gpios;
+ int ngpios;
+ struct gpiodev_keys2_button *buttons;
+ int nbuttons;
+};
+
+#endif
Added: linux4palm/linux/branches/cleanup-branch-never-commit/include/linux/mfd/htc-bbkeys.h
===================================================================
--- linux4palm/linux/branches/cleanup-branch-never-commit/include/linux/mfd/htc-bbkeys.h (rev 0)
+++ linux4palm/linux/branches/cleanup-branch-never-commit/include/linux/mfd/htc-bbkeys.h 2007-09-17 15:37:25 UTC (rev 1328)
@@ -0,0 +1,20 @@
+#ifndef _HTC_BBKEYS_H
+#define _HTC_BBKEYS_H
+
+/* Maximum number of keys available */
+enum { BBKEYS_MAXKEY = 16 };
+
+struct htc_bbkeys_platform_data {
+ /* Beginning of available gpios (eg, GPIO_BASE_INCREMENT) */
+ int gpio_base;
+
+ /* Main interface gpios */
+ int sda_gpio, scl_gpio;
+
+ /* Registers for working with keypad */
+ int ackreg, key1reg, key2reg;
+ /* Keycodes for buttons */
+ int buttons[BBKEYS_MAXKEY];
+};
+
+#endif
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <hap...@us...> - 2007-09-17 19:54:42
|
Revision: 1330
http://hackndev.svn.sourceforge.net/hackndev/?rev=1330&view=rev
Author: happy-slapin
Date: 2007-09-17 12:54:28 -0700 (Mon, 17 Sep 2007)
Log Message:
-----------
cleanup: getting from hh.org
Modified Paths:
--------------
linux4palm/linux/branches/cleanup-branch-never-commit/arch/arm/configs/htcuniversal_defconfig
linux4palm/linux/branches/cleanup-branch-never-commit/arch/arm/configs/magician_defconfig
linux4palm/linux/branches/cleanup-branch-never-commit/drivers/usb/gadget/zero.c
Modified: linux4palm/linux/branches/cleanup-branch-never-commit/arch/arm/configs/htcuniversal_defconfig
===================================================================
--- linux4palm/linux/branches/cleanup-branch-never-commit/arch/arm/configs/htcuniversal_defconfig 2007-09-17 19:41:58 UTC (rev 1329)
+++ linux4palm/linux/branches/cleanup-branch-never-commit/arch/arm/configs/htcuniversal_defconfig 2007-09-17 19:54:28 UTC (rev 1330)
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
-# Linux kernel version: 2.6.21-hh2
-# Wed May 16 19:58:40 2007
+# Linux kernel version: 2.6.21-hh16
+# Sun Sep 16 14:03:47 2007
#
CONFIG_ARM=y
CONFIG_SYS_SUPPORTS_APM_EMULATION=y
@@ -28,20 +28,20 @@
#
CONFIG_EXPERIMENTAL=y
CONFIG_BROKEN_ON_SMP=y
+CONFIG_LOCK_KERNEL=y
CONFIG_INIT_ENV_ARG_LIMIT=32
#
# General setup
#
CONFIG_LOCALVERSION=""
-# CONFIG_LOCALVERSION_AUTO is not set
+CONFIG_LOCALVERSION_AUTO=y
CONFIG_SWAP=y
CONFIG_SYSVIPC=y
# CONFIG_IPC_NS is not set
CONFIG_SYSVIPC_SYSCTL=y
-CONFIG_POSIX_MQUEUE=y
-CONFIG_BSD_PROCESS_ACCT=y
-CONFIG_BSD_PROCESS_ACCT_V3=y
+# CONFIG_POSIX_MQUEUE is not set
+# CONFIG_BSD_PROCESS_ACCT is not set
# CONFIG_TASKSTATS is not set
# CONFIG_UTS_NS is not set
# CONFIG_AUDIT is not set
@@ -50,10 +50,10 @@
CONFIG_SYSFS_DEPRECATED=y
# CONFIG_RELAY is not set
# CONFIG_BLK_DEV_INITRD is not set
-# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
+CONFIG_CC_OPTIMIZE_FOR_SIZE=y
CONFIG_SYSCTL=y
CONFIG_EMBEDDED=y
-CONFIG_UID16=y
+# CONFIG_UID16 is not set
CONFIG_SYSCTL_SYSCALL=y
CONFIG_KALLSYMS=y
# CONFIG_KALLSYMS_EXTRA_PASS is not set
@@ -96,12 +96,12 @@
CONFIG_IOSCHED_NOOP=y
CONFIG_IOSCHED_AS=y
CONFIG_IOSCHED_DEADLINE=y
-CONFIG_IOSCHED_CFQ=y
-# CONFIG_DEFAULT_AS is not set
+# CONFIG_IOSCHED_CFQ is not set
+CONFIG_DEFAULT_AS=y
# CONFIG_DEFAULT_DEADLINE is not set
-CONFIG_DEFAULT_CFQ=y
+# CONFIG_DEFAULT_CFQ is not set
# CONFIG_DEFAULT_NOOP is not set
-CONFIG_DEFAULT_IOSCHED="cfq"
+CONFIG_DEFAULT_IOSCHED="anticipatory"
#
# System Type
@@ -175,6 +175,10 @@
# CONFIG_MACH_MAGICIAN is not set
# CONFIG_MACH_HTCAPACHE is not set
# CONFIG_MACH_BLUEANGEL is not set
+
+#
+# HTC_HW6X00
+#
# CONFIG_MACH_HTCBEETLES is not set
# CONFIG_MACH_HW6900 is not set
# CONFIG_MACH_HTCATHENA is not set
@@ -187,9 +191,13 @@
# CONFIG_MACH_XSCALE_PALMLD is not set
# CONFIG_MACH_T3XSCALE is not set
# CONFIG_MACH_RECON is not set
+# CONFIG_MACH_GHI270HG is not set
+# CONFIG_MACH_GHI270 is not set
+# CONFIG_MACH_LOOXC550 is not set
# CONFIG_PXA_SHARPSL is not set
# CONFIG_MACH_TRIZEPS4 is not set
CONFIG_PXA27x=y
+# CONFIG_PXA27x_VOLTAGE is not set
#
# Linux As Bootloader
@@ -211,7 +219,7 @@
#
# Processor Features
#
-# CONFIG_ARM_THUMB is not set
+CONFIG_ARM_THUMB=y
# CONFIG_CPU_DCACHE_DISABLE is not set
# CONFIG_OUTER_CACHE is not set
CONFIG_IWMMXT=y
@@ -229,8 +237,8 @@
#
# Kernel Features
#
-# CONFIG_PREEMPT is not set
-# CONFIG_NO_IDLE_HZ is not set
+CONFIG_PREEMPT=y
+CONFIG_NO_IDLE_HZ=y
CONFIG_HZ=100
CONFIG_AEABI=y
CONFIG_OABI_COMPAT=y
@@ -254,12 +262,26 @@
CONFIG_ZBOOT_ROM_BSS=0x0
CONFIG_CMDLINE=""
# CONFIG_XIP_KERNEL is not set
-# CONFIG_KEXEC is not set
+CONFIG_KEXEC=y
+# CONFIG_TXTOFFSET_DELTA is not set
#
# CPU Frequency scaling
#
-# CONFIG_CPU_FREQ is not set
+CONFIG_CPU_FREQ=y
+CONFIG_CPU_FREQ_TABLE=y
+CONFIG_CPU_FREQ_DEBUG=y
+CONFIG_CPU_FREQ_STAT=y
+CONFIG_CPU_FREQ_STAT_DETAILS=y
+# CONFIG_CPU_FREQ_DEFAULT_GOV_PERFORMANCE is not set
+CONFIG_CPU_FREQ_DEFAULT_GOV_USERSPACE=y
+CONFIG_CPU_FREQ_GOV_PERFORMANCE=y
+# CONFIG_CPU_FREQ_GOV_POWERSAVE is not set
+CONFIG_CPU_FREQ_GOV_USERSPACE=y
+# CONFIG_CPU_FREQ_GOV_ONDEMAND is not set
+CONFIG_CPU_FREQ_GOV_CONSERVATIVE=y
+CONFIG_CPU_FREQ_PXA=y
+CONFIG_PXA25x_ALTERNATE_FREQS=y
#
# Floating point emulation
@@ -284,10 +306,9 @@
#
CONFIG_PM=y
# CONFIG_PM_LEGACY is not set
-CONFIG_PM_DEBUG=y
-# CONFIG_DPM_DEBUG is not set
-# CONFIG_DISABLE_CONSOLE_SUSPEND is not set
-# CONFIG_PM_SYSFS_DEPRECATED is not set
+# CONFIG_PM_DEBUG is not set
+CONFIG_DPM_DEBUG=y
+CONFIG_PM_SYSFS_DEPRECATED=y
CONFIG_APM_EMULATION=y
#
@@ -302,10 +323,6 @@
CONFIG_PACKET=y
CONFIG_PACKET_MMAP=y
CONFIG_UNIX=y
-CONFIG_XFRM=y
-# CONFIG_XFRM_USER is not set
-# CONFIG_XFRM_SUB_POLICY is not set
-# CONFIG_XFRM_MIGRATE is not set
# CONFIG_NET_KEY is not set
CONFIG_INET=y
CONFIG_IP_MULTICAST=y
@@ -325,9 +342,9 @@
# CONFIG_INET_IPCOMP is not set
# CONFIG_INET_XFRM_TUNNEL is not set
# CONFIG_INET_TUNNEL is not set
-CONFIG_INET_XFRM_MODE_TRANSPORT=y
-CONFIG_INET_XFRM_MODE_TUNNEL=y
-CONFIG_INET_XFRM_MODE_BEET=y
+# CONFIG_INET_XFRM_MODE_TRANSPORT is not set
+# CONFIG_INET_XFRM_MODE_TUNNEL is not set
+# CONFIG_INET_XFRM_MODE_BEET is not set
# CONFIG_INET_DIAG is not set
# CONFIG_TCP_CONG_ADVANCED is not set
CONFIG_TCP_CONG_CUBIC=y
@@ -467,9 +484,81 @@
#
# Memory Technology Devices (MTD)
#
-# CONFIG_MTD is not set
+CONFIG_MTD=y
+# CONFIG_MTD_DEBUG is not set
+CONFIG_MTD_CONCAT=y
+CONFIG_MTD_PARTITIONS=y
+# CONFIG_MTD_REDBOOT_PARTS is not set
+# CONFIG_MTD_CMDLINE_PARTS is not set
+# CONFIG_MTD_AFS_PARTS is not set
#
+# User Modules And Translation Layers
+#
+CONFIG_MTD_CHAR=y
+CONFIG_MTD_BLKDEVS=y
+CONFIG_MTD_BLOCK=y
+# CONFIG_FTL is not set
+# CONFIG_NFTL is not set
+# CONFIG_INFTL is not set
+# CONFIG_RFD_FTL is not set
+# CONFIG_SSFDC is not set
+
+#
+# RAM/ROM/Flash chip drivers
+#
+# CONFIG_MTD_CFI is not set
+# CONFIG_MTD_JEDECPROBE is not set
+CONFIG_MTD_MAP_BANK_WIDTH_1=y
+CONFIG_MTD_MAP_BANK_WIDTH_2=y
+CONFIG_MTD_MAP_BANK_WIDTH_4=y
+# CONFIG_MTD_MAP_BANK_WIDTH_8 is not set
+# CONFIG_MTD_MAP_BANK_WIDTH_16 is not set
+# CONFIG_MTD_MAP_BANK_WIDTH_32 is not set
+CONFIG_MTD_CFI_I1=y
+CONFIG_MTD_CFI_I2=y
+# CONFIG_MTD_CFI_I4 is not set
+# CONFIG_MTD_CFI_I8 is not set
+# CONFIG_MTD_RAM is not set
+# CONFIG_MTD_ROM is not set
+# CONFIG_MTD_ABSENT is not set
+# CONFIG_MTD_OBSOLETE_CHIPS is not set
+
+#
+# Mapping drivers for chip access
+#
+# CONFIG_MTD_COMPLEX_MAPPINGS is not set
+# CONFIG_MTD_SHARP_SL is not set
+# CONFIG_MTD_PLATRAM is not set
+
+#
+# Self-contained MTD device drivers
+#
+# CONFIG_MTD_DATAFLASH is not set
+# CONFIG_MTD_M25P80 is not set
+# CONFIG_MTD_SLRAM is not set
+# CONFIG_MTD_PHRAM is not set
+# CONFIG_MTD_MTDRAM is not set
+# CONFIG_MTD_BLOCK2MTD is not set
+
+#
+# Disk-On-Chip Device Drivers
+#
+# CONFIG_MTD_DOC2000 is not set
+# CONFIG_MTD_DOC2001 is not set
+# CONFIG_MTD_DOC2001PLUS is not set
+
+#
+# NAND Flash Device Drivers
+#
+# CONFIG_MTD_NAND is not set
+
+#
+# OneNAND Flash Device Drivers
+#
+# CONFIG_MTD_ONENAND is not set
+
+#
# Parallel port support
#
# CONFIG_PARPORT is not set
@@ -487,7 +576,10 @@
# CONFIG_BLK_DEV_CRYPTOLOOP is not set
# CONFIG_BLK_DEV_NBD is not set
# CONFIG_BLK_DEV_UB is not set
-# CONFIG_BLK_DEV_RAM is not set
+CONFIG_BLK_DEV_RAM=y
+CONFIG_BLK_DEV_RAM_COUNT=16
+CONFIG_BLK_DEV_RAM_SIZE=4096
+CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024
# CONFIG_CDROM_PKTCDVD is not set
# CONFIG_ATA_OVER_ETH is not set
@@ -500,45 +592,10 @@
# SCSI device support
#
# CONFIG_RAID_ATTRS is not set
-CONFIG_SCSI=y
-# CONFIG_SCSI_TGT is not set
+# CONFIG_SCSI is not set
# CONFIG_SCSI_NETLINK is not set
-# CONFIG_SCSI_PROC_FS is not set
#
-# SCSI support type (disk, tape, CD-ROM)
-#
-# CONFIG_BLK_DEV_SD is not set
-# CONFIG_CHR_DEV_ST is not set
-# CONFIG_CHR_DEV_OSST is not set
-# CONFIG_BLK_DEV_SR is not set
-# CONFIG_CHR_DEV_SG is not set
-# CONFIG_CHR_DEV_SCH is not set
-
-#
-# Some SCSI devices (e.g. CD jukebox) support multiple LUNs
-#
-# CONFIG_SCSI_MULTI_LUN is not set
-# CONFIG_SCSI_CONSTANTS is not set
-# CONFIG_SCSI_LOGGING is not set
-# CONFIG_SCSI_SCAN_ASYNC is not set
-
-#
-# SCSI Transports
-#
-# CONFIG_SCSI_SPI_ATTRS is not set
-# CONFIG_SCSI_FC_ATTRS is not set
-# CONFIG_SCSI_ISCSI_ATTRS is not set
-# CONFIG_SCSI_SAS_ATTRS is not set
-# CONFIG_SCSI_SAS_LIBSAS is not set
-
-#
-# SCSI low-level drivers
-#
-# CONFIG_ISCSI_TCP is not set
-# CONFIG_SCSI_DEBUG is not set
-
-#
# Serial ATA (prod) and Parallel ATA (experimental) drivers
#
# CONFIG_ATA is not set
@@ -606,6 +663,7 @@
CONFIG_ACX=m
# CONFIG_ACX_USB is not set
CONFIG_ACX_MEM=y
+# CONFIG_ACX_CS is not set
CONFIG_ACX_HTCUNIVERSAL=m
#
@@ -647,6 +705,7 @@
# CONFIG_INPUT_TSDEV is not set
CONFIG_INPUT_EVDEV=y
# CONFIG_INPUT_EVBUG is not set
+# CONFIG_INPUT_LED_TRIGGER is not set
#
# Input Device Drivers
@@ -659,6 +718,7 @@
# CONFIG_KEYBOARD_NEWTON is not set
# CONFIG_KEYBOARD_STOWAWAY is not set
# CONFIG_GPIODEV_KEYS is not set
+# CONFIG_GPIODEV_KEYS2 is not set
# CONFIG_GPIODEV_DIAGONAL is not set
CONFIG_KEYBOARD_ASIC3=y
CONFIG_KEYBOARD_PXA27x=y
@@ -666,7 +726,8 @@
# CONFIG_INPUT_MOUSE is not set
# CONFIG_INPUT_JOYSTICK is not set
# CONFIG_INPUT_TOUCHSCREEN is not set
-# CONFIG_INPUT_MISC is not set
+CONFIG_INPUT_MISC=y
+CONFIG_INPUT_UINPUT=m
#
# Hardware I/O ports
@@ -760,10 +821,10 @@
# CONFIG_SENSORS_PCF8591 is not set
# CONFIG_SENSORS_RTC8564 is not set
# CONFIG_SENSORS_MAX6875 is not set
-CONFIG_I2C_DEBUG_CORE=y
-CONFIG_I2C_DEBUG_ALGO=y
-CONFIG_I2C_DEBUG_BUS=y
-CONFIG_I2C_DEBUG_CHIP=y
+# CONFIG_I2C_DEBUG_CORE is not set
+# CONFIG_I2C_DEBUG_ALGO is not set
+# CONFIG_I2C_DEBUG_BUS is not set
+# CONFIG_I2C_DEBUG_CHIP is not set
#
# SPI support
@@ -792,7 +853,7 @@
#
# CONFIG_W1_MASTER_DS2490 is not set
# CONFIG_W1_MASTER_DS2482 is not set
-# CONFIG_W1_MASTER_DS1WM is not set
+CONFIG_W1_MASTER_DS1WM=y
#
# 1-wire Slaves
@@ -800,7 +861,7 @@
# CONFIG_W1_SLAVE_THERM is not set
# CONFIG_W1_SLAVE_SMEM is not set
# CONFIG_W1_SLAVE_DS2433 is not set
-CONFIG_W1_DS2760=y
+CONFIG_W1_SLAVE_DS2760=y
#
# Hardware Monitoring support
@@ -849,15 +910,11 @@
# CONFIG_SENSORS_W83627HF is not set
# CONFIG_SENSORS_W83627EHF is not set
# CONFIG_HWMON_DEBUG_CHIP is not set
-
-#
-# Hardware Monitoring - external power and batteries
-#
-CONFIG_EXTERNAL_POWER=y
-CONFIG_BATTERY=y
+CONFIG_POWER_SUPPLY=y
+# CONFIG_POWER_SUPPLY_DEBUG is not set
CONFIG_PDA_POWER=y
-CONFIG_DS2760_BATTERY=y
CONFIG_APM_POWER=y
+CONFIG_BATTERY_DS2760=y
#
# L3 serial bus support
@@ -865,21 +922,6 @@
# CONFIG_L3 is not set
#
-# SoC drivers
-#
-# CONFIG_SOC_MQ11XX is not set
-# CONFIG_SOC_T7L66XB is not set
-# CONFIG_SOC_TC6387XB is not set
-# CONFIG_SOC_TC6393XB is not set
-# CONFIG_SOC_SAMCOP is not set
-# CONFIG_SOC_HAMCOP is not set
-# CONFIG_HTC_ASIC2 is not set
-CONFIG_HTC_ASIC3=y
-CONFIG_HTC_ASIC3_DS1WM=y
-# CONFIG_SOC_TSC2101 is not set
-# CONFIG_SOC_TSC2200 is not set
-
-#
# Misc devices
#
@@ -889,9 +931,33 @@
# CONFIG_ADC is not set
#
+# Compaq/iPAQ Drivers
+#
+
+#
+# Compaq/HP iPAQ Drivers
+#
+# CONFIG_IPAQ_SLEEVE is not set
+# CONFIG_SLEEVE_DEBUG is not set
+
+#
# Multifunction device drivers
#
# CONFIG_MFD_SM501 is not set
+# CONFIG_HTC_ASIC2 is not set
+CONFIG_HTC_ASIC3=y
+# CONFIG_HTC_PASIC3 is not set
+# CONFIG_HTC_EGPIO is not set
+# CONFIG_HTC_BBKEYS is not set
+CONFIG_HTC_ASIC3_DS1WM=y
+# CONFIG_SOC_SAMCOP is not set
+# CONFIG_SOC_HAMCOP is not set
+# CONFIG_SOC_MQ11XX is not set
+# CONFIG_SOC_T7L66XB is not set
+# CONFIG_SOC_TC6387XB is not set
+# CONFIG_SOC_TC6393XB is not set
+# CONFIG_SOC_TSC2101 is not set
+# CONFIG_SOC_TSC2200 is not set
#
# LED devices
@@ -903,15 +969,17 @@
# LED drivers
#
CONFIG_LEDS_ASIC3=y
+# CONFIG_LEDS_GPIO is not set
#
# LED Triggers
#
CONFIG_LEDS_TRIGGERS=y
-# CONFIG_LEDS_TRIGGER_TIMER is not set
-CONFIG_LEDS_TRIGGER_HWTIMER=m
+CONFIG_LEDS_TRIGGER_TIMER=y
+CONFIG_LEDS_TRIGGER_HWTIMER=y
+CONFIG_LEDS_TRIGGER_BACKLIGHT=y
# CONFIG_LEDS_TRIGGER_HEARTBEAT is not set
-# CONFIG_LEDS_TRIGGER_SHARED is not set
+CONFIG_LEDS_TRIGGER_SHARED=y
#
# Multimedia devices
@@ -976,10 +1044,7 @@
#
# Logo configuration
#
-CONFIG_LOGO=y
-# CONFIG_LOGO_LINUX_MONO is not set
-# CONFIG_LOGO_LINUX_VGA16 is not set
-CONFIG_LOGO_LINUX_CLUT224=y
+# CONFIG_LOGO is not set
#
# Sound
@@ -1000,10 +1065,8 @@
# CONFIG_SND_DYNAMIC_MINORS is not set
CONFIG_SND_SUPPORT_OLD_API=y
CONFIG_SND_VERBOSE_PROCFS=y
-CONFIG_SND_VERBOSE_PRINTK=y
-CONFIG_SND_DEBUG=y
-CONFIG_SND_DEBUG_DETECT=y
-# CONFIG_SND_PCM_XRUN_DEBUG is not set
+# CONFIG_SND_VERBOSE_PRINTK is not set
+# CONFIG_SND_DEBUG is not set
#
# Generic devices
@@ -1082,7 +1145,6 @@
#
# may also be needed; see USB_STORAGE Help for more information
#
-# CONFIG_USB_STORAGE is not set
# CONFIG_USB_LIBUSUAL is not set
#
@@ -1113,7 +1175,6 @@
# USB Imaging devices
#
# CONFIG_USB_MDC800 is not set
-# CONFIG_USB_MICROTEK is not set
#
# USB Network Adapters
@@ -1123,16 +1184,7 @@
# CONFIG_USB_PEGASUS is not set
# CONFIG_USB_RTL8150 is not set
# CONFIG_USB_USBNET_MII is not set
-CONFIG_USB_USBNET=y
-CONFIG_USB_NET_CDCETHER=y
-# CONFIG_USB_NET_DM9601 is not set
-# CONFIG_USB_NET_GL620A is not set
-# CONFIG_USB_NET_NET1080 is not set
-# CONFIG_USB_NET_PLUSB is not set
-# CONFIG_USB_NET_MCS7830 is not set
-# CONFIG_USB_NET_RNDIS_HOST is not set
-# CONFIG_USB_NET_CDC_SUBSET is not set
-# CONFIG_USB_NET_ZAURUS is not set
+# CONFIG_USB_USBNET is not set
# CONFIG_USB_MON is not set
#
@@ -1142,7 +1194,44 @@
#
# USB Serial Converter support
#
-# CONFIG_USB_SERIAL is not set
+CONFIG_USB_SERIAL=m
+CONFIG_USB_SERIAL_GENERIC=y
+# CONFIG_USB_SERIAL_AIRCABLE is not set
+# CONFIG_USB_SERIAL_AIRPRIME is not set
+# CONFIG_USB_SERIAL_ARK3116 is not set
+# CONFIG_USB_SERIAL_BELKIN is not set
+# CONFIG_USB_SERIAL_WHITEHEAT is not set
+# CONFIG_USB_SERIAL_DIGI_ACCELEPORT is not set
+# CONFIG_USB_SERIAL_CP2101 is not set
+# CONFIG_USB_SERIAL_CYPRESS_M8 is not set
+# CONFIG_USB_SERIAL_EMPEG is not set
+# CONFIG_USB_SERIAL_FTDI_SIO is not set
+# CONFIG_USB_SERIAL_FUNSOFT is not set
+# CONFIG_USB_SERIAL_VISOR is not set
+# CONFIG_USB_SERIAL_IPAQ is not set
+# CONFIG_USB_SERIAL_IR is not set
+# CONFIG_USB_SERIAL_EDGEPORT is not set
+# CONFIG_USB_SERIAL_EDGEPORT_TI is not set
+# CONFIG_USB_SERIAL_GARMIN is not set
+# CONFIG_USB_SERIAL_IPW is not set
+# CONFIG_USB_SERIAL_KEYSPAN_PDA is not set
+# CONFIG_USB_SERIAL_KEYSPAN is not set
+# CONFIG_USB_SERIAL_KLSI is not set
+# CONFIG_USB_SERIAL_KOBIL_SCT is not set
+# CONFIG_USB_SERIAL_MCT_U232 is not set
+# CONFIG_USB_SERIAL_MOS7720 is not set
+# CONFIG_USB_SERIAL_MOS7840 is not set
+# CONFIG_USB_SERIAL_NAVMAN is not set
+# CONFIG_USB_SERIAL_PL2303 is not set
+# CONFIG_USB_SERIAL_HP4X is not set
+# CONFIG_USB_SERIAL_SAFE is not set
+# CONFIG_USB_SERIAL_SIERRAWIRELESS is not set
+# CONFIG_USB_SERIAL_TI is not set
+# CONFIG_USB_SERIAL_CYBERJACK is not set
+# CONFIG_USB_SERIAL_XIRCOM is not set
+# CONFIG_USB_SERIAL_OPTION is not set
+# CONFIG_USB_SERIAL_OMNINET is not set
+# CONFIG_USB_SERIAL_DEBUG is not set
#
# USB Miscellaneous drivers
@@ -1192,13 +1281,13 @@
# CONFIG_USB_GADGET_DUALSPEED is not set
# CONFIG_USB_ZERO is not set
CONFIG_USB_ETH=y
-# CONFIG_USB_ETH_RNDIS is not set
+CONFIG_USB_ETH_RNDIS=y
# CONFIG_USB_GADGETFS is not set
# CONFIG_USB_FILE_STORAGE is not set
# CONFIG_USB_G_SERIAL is not set
# CONFIG_USB_MIDI_GADGET is not set
# CONFIG_USB_G_CHAR is not set
-# CONFIG_USB_PXA2XX_GPIO is not set
+CONFIG_USB_PXA2XX_GPIO=y
#
# MMC/SD Card support
@@ -1215,14 +1304,17 @@
# Real Time Clock
#
CONFIG_RTC_LIB=y
-CONFIG_RTC_CLASS=m
+CONFIG_RTC_CLASS=y
+CONFIG_RTC_HCTOSYS=y
+CONFIG_RTC_HCTOSYS_DEVICE="rtc0"
+CONFIG_RTC_DEBUG=y
#
# RTC interfaces
#
-CONFIG_RTC_INTF_SYSFS=m
-CONFIG_RTC_INTF_PROC=m
-CONFIG_RTC_INTF_DEV=m
+CONFIG_RTC_INTF_SYSFS=y
+CONFIG_RTC_INTF_PROC=y
+CONFIG_RTC_INTF_DEV=y
# CONFIG_RTC_INTF_DEV_UIE_EMUL is not set
#
@@ -1235,11 +1327,11 @@
# CONFIG_RTC_DRV_ISL1208 is not set
# CONFIG_RTC_DRV_DS1672 is not set
# CONFIG_RTC_DRV_DS1742 is not set
-CONFIG_RTC_DRV_PCF8563=m
+# CONFIG_RTC_DRV_PCF8563 is not set
# CONFIG_RTC_DRV_RS5C348 is not set
# CONFIG_RTC_DRV_RS5C372 is not set
# CONFIG_RTC_DRV_M48T86 is not set
-CONFIG_RTC_DRV_SA1100=m
+CONFIG_RTC_DRV_SA1100=y
# CONFIG_RTC_DRV_TEST is not set
# CONFIG_RTC_DRV_MAX6902 is not set
# CONFIG_RTC_DRV_V3020 is not set
@@ -1262,14 +1354,14 @@
# CONFIG_GFS2_FS is not set
# CONFIG_OCFS2_FS is not set
# CONFIG_MINIX_FS is not set
-CONFIG_ROMFS_FS=y
+# CONFIG_ROMFS_FS is not set
CONFIG_INOTIFY=y
CONFIG_INOTIFY_USER=y
# CONFIG_QUOTA is not set
CONFIG_DNOTIFY=y
# CONFIG_AUTOFS_FS is not set
# CONFIG_AUTOFS4_FS is not set
-CONFIG_FUSE_FS=m
+# CONFIG_FUSE_FS is not set
#
# CD-ROM/DVD Filesystems
@@ -1309,7 +1401,19 @@
# CONFIG_BEFS_FS is not set
# CONFIG_BFS_FS is not set
# CONFIG_EFS_FS is not set
-CONFIG_CRAMFS=y
+CONFIG_JFFS2_FS=y
+CONFIG_JFFS2_FS_DEBUG=0
+CONFIG_JFFS2_FS_WRITEBUFFER=y
+# CONFIG_JFFS2_SUMMARY is not set
+# CONFIG_JFFS2_FS_XATTR is not set
+CONFIG_JFFS2_COMPRESSION_OPTIONS=y
+CONFIG_JFFS2_ZLIB=y
+CONFIG_JFFS2_RTIME=y
+# CONFIG_JFFS2_RUBIN is not set
+# CONFIG_JFFS2_CMODE_NONE is not set
+CONFIG_JFFS2_CMODE_PRIORITY=y
+# CONFIG_JFFS2_CMODE_SIZE is not set
+# CONFIG_CRAMFS is not set
# CONFIG_VXFS_FS is not set
# CONFIG_HPFS_FS is not set
# CONFIG_QNX4FS_FS is not set
@@ -1322,8 +1426,8 @@
CONFIG_NFS_FS=m
CONFIG_NFS_V3=y
CONFIG_NFS_V3_ACL=y
-CONFIG_NFS_V4=y
-CONFIG_NFS_DIRECTIO=y
+# CONFIG_NFS_V4 is not set
+# CONFIG_NFS_DIRECTIO is not set
# CONFIG_NFSD is not set
CONFIG_LOCKD=m
CONFIG_LOCKD_V4=y
@@ -1365,7 +1469,7 @@
# CONFIG_NLS_CODEPAGE_862 is not set
# CONFIG_NLS_CODEPAGE_863 is not set
# CONFIG_NLS_CODEPAGE_864 is not set
-# CONFIG_NLS_CODEPAGE_865 is not set
+CONFIG_NLS_CODEPAGE_865=y
# CONFIG_NLS_CODEPAGE_866 is not set
# CONFIG_NLS_CODEPAGE_869 is not set
# CONFIG_NLS_CODEPAGE_936 is not set
@@ -1405,7 +1509,7 @@
#
# Kernel hacking
#
-# CONFIG_PRINTK_TIME is not set
+CONFIG_PRINTK_TIME=y
CONFIG_ENABLE_MUST_CHECK=y
# CONFIG_MAGIC_SYSRQ is not set
# CONFIG_UNUSED_SYMBOLS is not set
@@ -1428,38 +1532,37 @@
#
CONFIG_CRYPTO=y
CONFIG_CRYPTO_ALGAPI=y
-CONFIG_CRYPTO_BLKCIPHER=m
-CONFIG_CRYPTO_HASH=y
+CONFIG_CRYPTO_BLKCIPHER=y
CONFIG_CRYPTO_MANAGER=y
-CONFIG_CRYPTO_HMAC=y
+# CONFIG_CRYPTO_HMAC is not set
# CONFIG_CRYPTO_XCBC is not set
# CONFIG_CRYPTO_NULL is not set
# CONFIG_CRYPTO_MD4 is not set
CONFIG_CRYPTO_MD5=y
-CONFIG_CRYPTO_SHA1=y
+# CONFIG_CRYPTO_SHA1 is not set
# CONFIG_CRYPTO_SHA256 is not set
# CONFIG_CRYPTO_SHA512 is not set
# CONFIG_CRYPTO_WP512 is not set
# CONFIG_CRYPTO_TGR192 is not set
# CONFIG_CRYPTO_GF128MUL is not set
-CONFIG_CRYPTO_ECB=m
-CONFIG_CRYPTO_CBC=m
-CONFIG_CRYPTO_PCBC=m
+CONFIG_CRYPTO_ECB=y
+CONFIG_CRYPTO_CBC=y
+# CONFIG_CRYPTO_PCBC is not set
# CONFIG_CRYPTO_LRW is not set
CONFIG_CRYPTO_DES=y
# CONFIG_CRYPTO_FCRYPT is not set
# CONFIG_CRYPTO_BLOWFISH is not set
# CONFIG_CRYPTO_TWOFISH is not set
# CONFIG_CRYPTO_SERPENT is not set
-CONFIG_CRYPTO_AES=y
+# CONFIG_CRYPTO_AES is not set
# CONFIG_CRYPTO_CAST5 is not set
# CONFIG_CRYPTO_CAST6 is not set
# CONFIG_CRYPTO_TEA is not set
-CONFIG_CRYPTO_ARC4=y
+# CONFIG_CRYPTO_ARC4 is not set
# CONFIG_CRYPTO_KHAZAD is not set
# CONFIG_CRYPTO_ANUBIS is not set
-CONFIG_CRYPTO_DEFLATE=y
-CONFIG_CRYPTO_MICHAEL_MIC=y
+# CONFIG_CRYPTO_DEFLATE is not set
+# CONFIG_CRYPTO_MICHAEL_MIC is not set
# CONFIG_CRYPTO_CRC32C is not set
# CONFIG_CRYPTO_CAMELLIA is not set
# CONFIG_CRYPTO_TEST is not set
Modified: linux4palm/linux/branches/cleanup-branch-never-commit/arch/arm/configs/magician_defconfig
===================================================================
--- linux4palm/linux/branches/cleanup-branch-never-commit/arch/arm/configs/magician_defconfig 2007-09-17 19:41:58 UTC (rev 1329)
+++ linux4palm/linux/branches/cleanup-branch-never-commit/arch/arm/configs/magician_defconfig 2007-09-17 19:54:28 UTC (rev 1330)
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
-# Linux kernel version: 2.6.21-hh8
-# Mon Jun 18 14:21:10 2007
+# Linux kernel version: 2.6.21-hh16
+# Sat Sep 15 11:20:21 2007
#
CONFIG_ARM=y
CONFIG_SYS_SUPPORTS_APM_EMULATION=y
@@ -49,7 +49,8 @@
CONFIG_IKCONFIG_PROC=y
# CONFIG_SYSFS_DEPRECATED is not set
# CONFIG_RELAY is not set
-# CONFIG_BLK_DEV_INITRD is not set
+CONFIG_BLK_DEV_INITRD=y
+CONFIG_INITRAMFS_SOURCE=""
CONFIG_CC_OPTIMIZE_FOR_SIZE=y
CONFIG_SYSCTL=y
CONFIG_EMBEDDED=y
@@ -169,6 +170,10 @@
CONFIG_MAGICIAN_PHONE=m
# CONFIG_MACH_HTCAPACHE is not set
# CONFIG_MACH_BLUEANGEL is not set
+
+#
+# HTC_HW6X00
+#
# CONFIG_MACH_HTCBEETLES is not set
# CONFIG_MACH_HW6900 is not set
# CONFIG_MACH_HTCATHENA is not set
@@ -182,6 +187,7 @@
# CONFIG_MACH_RECON is not set
# CONFIG_MACH_GHI270HG is not set
# CONFIG_MACH_GHI270 is not set
+# CONFIG_MACH_LOOXC550 is not set
# CONFIG_PXA_SHARPSL is not set
# CONFIG_MACH_TRIZEPS4 is not set
CONFIG_PXA27x=y
@@ -549,7 +555,7 @@
# CONFIG_MTD_COMPLEX_MAPPINGS is not set
CONFIG_MTD_PHYSMAP=m
CONFIG_MTD_PHYSMAP_START=0x8000000
-CONFIG_MTD_PHYSMAP_LEN=0
+CONFIG_MTD_PHYSMAP_LEN=0x0
CONFIG_MTD_PHYSMAP_BANKWIDTH=2
# CONFIG_MTD_ARM_INTEGRATOR is not set
# CONFIG_MTD_IPAQ is not set
@@ -561,7 +567,9 @@
#
# CONFIG_MTD_SLRAM is not set
# CONFIG_MTD_PHRAM is not set
-# CONFIG_MTD_MTDRAM is not set
+CONFIG_MTD_MTDRAM=m
+CONFIG_MTDRAM_TOTAL_SIZE=0
+CONFIG_MTDRAM_ERASE_SIZE=256
# CONFIG_MTD_BLOCK2MTD is not set
#
@@ -595,7 +603,8 @@
# Block devices
#
# CONFIG_BLK_DEV_COW_COMMON is not set
-# CONFIG_BLK_DEV_LOOP is not set
+CONFIG_BLK_DEV_LOOP=m
+# CONFIG_BLK_DEV_CRYPTOLOOP is not set
# CONFIG_BLK_DEV_NBD is not set
# CONFIG_BLK_DEV_UB is not set
# CONFIG_BLK_DEV_RAM is not set
@@ -723,7 +732,7 @@
# CONFIG_KEYBOARD_XTKBD is not set
# CONFIG_KEYBOARD_NEWTON is not set
# CONFIG_KEYBOARD_STOWAWAY is not set
-CONFIG_GPIODEV_KEYS=y
+# CONFIG_GPIODEV_KEYS is not set
# CONFIG_GPIODEV_DIAGONAL is not set
# CONFIG_KEYBOARD_PXA27x is not set
CONFIG_KEYBOARD_GPIO=y
@@ -892,6 +901,16 @@
# CONFIG_ADC_AD7877 is not set
#
+# Compaq/iPAQ Drivers
+#
+
+#
+# Compaq/HP iPAQ Drivers
+#
+# CONFIG_IPAQ_SLEEVE is not set
+# CONFIG_SLEEVE_DEBUG is not set
+
+#
# Multifunction device drivers
#
# CONFIG_MFD_SM501 is not set
@@ -899,6 +918,7 @@
# CONFIG_HTC_ASIC3 is not set
CONFIG_HTC_PASIC3=y
CONFIG_HTC_EGPIO=y
+# CONFIG_HTC_BBKEYS is not set
# CONFIG_HTC_ASIC3_DS1WM is not set
# CONFIG_SOC_SAMCOP is not set
# CONFIG_SOC_HAMCOP is not set
@@ -918,8 +938,8 @@
#
# LED drivers
#
-CONFIG_LEDS_MAGICIAN=y
CONFIG_LEDS_PASIC3=y
+CONFIG_LEDS_GPIO=y
#
# LED Triggers
@@ -927,6 +947,7 @@
CONFIG_LEDS_TRIGGERS=y
CONFIG_LEDS_TRIGGER_TIMER=y
CONFIG_LEDS_TRIGGER_HWTIMER=y
+CONFIG_LEDS_TRIGGER_BACKLIGHT=y
# CONFIG_LEDS_TRIGGER_HEARTBEAT is not set
CONFIG_LEDS_TRIGGER_SHARED=y
@@ -1321,9 +1342,9 @@
#
# DOS/FAT/NT Filesystems
#
-CONFIG_FAT_FS=y
-CONFIG_MSDOS_FS=y
-CONFIG_VFAT_FS=y
+CONFIG_FAT_FS=m
+CONFIG_MSDOS_FS=m
+CONFIG_VFAT_FS=m
CONFIG_FAT_DEFAULT_CODEPAGE=437
CONFIG_FAT_DEFAULT_IOCHARSET="iso8859-1"
# CONFIG_NTFS_FS is not set
@@ -1402,7 +1423,7 @@
# Native Language Support
#
CONFIG_NLS=y
-CONFIG_NLS_DEFAULT="iso8859-1"
+CONFIG_NLS_DEFAULT="utf8"
CONFIG_NLS_CODEPAGE_437=y
# CONFIG_NLS_CODEPAGE_737 is not set
# CONFIG_NLS_CODEPAGE_775 is not set
@@ -1424,8 +1445,8 @@
# CONFIG_NLS_CODEPAGE_949 is not set
# CONFIG_NLS_CODEPAGE_874 is not set
# CONFIG_NLS_ISO8859_8 is not set
-CONFIG_NLS_CODEPAGE_1250=y
-CONFIG_NLS_CODEPAGE_1251=y
+# CONFIG_NLS_CODEPAGE_1250 is not set
+CONFIG_NLS_CODEPAGE_1251=m
# CONFIG_NLS_ASCII is not set
CONFIG_NLS_ISO8859_1=y
# CONFIG_NLS_ISO8859_2 is not set
@@ -1499,16 +1520,15 @@
# Cryptographic options
#
CONFIG_CRYPTO=y
-CONFIG_CRYPTO_ALGAPI=y
+CONFIG_CRYPTO_ALGAPI=m
CONFIG_CRYPTO_BLKCIPHER=m
-CONFIG_CRYPTO_HASH=y
-CONFIG_CRYPTO_MANAGER=y
-CONFIG_CRYPTO_HMAC=y
+CONFIG_CRYPTO_MANAGER=m
+# CONFIG_CRYPTO_HMAC is not set
# CONFIG_CRYPTO_XCBC is not set
# CONFIG_CRYPTO_NULL is not set
# CONFIG_CRYPTO_MD4 is not set
-CONFIG_CRYPTO_MD5=y
-CONFIG_CRYPTO_SHA1=y
+# CONFIG_CRYPTO_MD5 is not set
+CONFIG_CRYPTO_SHA1=m
# CONFIG_CRYPTO_SHA256 is not set
# CONFIG_CRYPTO_SHA512 is not set
# CONFIG_CRYPTO_WP512 is not set
@@ -1518,7 +1538,7 @@
# CONFIG_CRYPTO_CBC is not set
CONFIG_CRYPTO_PCBC=m
# CONFIG_CRYPTO_LRW is not set
-CONFIG_CRYPTO_DES=y
+# CONFIG_CRYPTO_DES is not set
# CONFIG_CRYPTO_FCRYPT is not set
# CONFIG_CRYPTO_BLOWFISH is not set
# CONFIG_CRYPTO_TWOFISH is not set
@@ -1530,7 +1550,7 @@
CONFIG_CRYPTO_ARC4=m
# CONFIG_CRYPTO_KHAZAD is not set
# CONFIG_CRYPTO_ANUBIS is not set
-CONFIG_CRYPTO_DEFLATE=y
+# CONFIG_CRYPTO_DEFLATE is not set
# CONFIG_CRYPTO_MICHAEL_MIC is not set
# CONFIG_CRYPTO_CRC32C is not set
# CONFIG_CRYPTO_CAMELLIA is not set
@@ -1548,8 +1568,8 @@
# CONFIG_CRC16 is not set
CONFIG_CRC32=y
# CONFIG_LIBCRC32C is not set
-CONFIG_ZLIB_INFLATE=y
-CONFIG_ZLIB_DEFLATE=y
+CONFIG_ZLIB_INFLATE=m
+CONFIG_ZLIB_DEFLATE=m
CONFIG_PLIST=y
CONFIG_HAS_IOMEM=y
CONFIG_HAS_IOPORT=y
Modified: linux4palm/linux/branches/cleanup-branch-never-commit/drivers/usb/gadget/zero.c
===================================================================
--- linux4palm/linux/branches/cleanup-branch-never-commit/drivers/usb/gadget/zero.c 2007-09-17 19:41:58 UTC (rev 1329)
+++ linux4palm/linux/branches/cleanup-branch-never-commit/drivers/usb/gadget/zero.c 2007-09-17 19:54:28 UTC (rev 1330)
@@ -66,7 +66,6 @@
#include <linux/kernel.h>
#include <linux/delay.h>
#include <linux/ioport.h>
-#include <linux/sched.h>
#include <linux/slab.h>
#include <linux/smp_lock.h>
#include <linux/errno.h>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <hap...@us...> - 2007-09-17 20:13:36
|
Revision: 1331
http://hackndev.svn.sourceforge.net/hackndev/?rev=1331&view=rev
Author: happy-slapin
Date: 2007-09-17 13:13:33 -0700 (Mon, 17 Sep 2007)
Log Message:
-----------
cleanup: remove unimportant changes to hh.org-derived files
Modified Paths:
--------------
linux4palm/linux/branches/cleanup-branch-never-commit/arch/arm/tools/mach-types
Added Paths:
-----------
linux4palm/linux/branches/cleanup-branch-never-commit/drivers/mfd/htc-bbkeys.c
linux4palm/linux/branches/cleanup-branch-never-commit/usr/.gitignore
Removed Paths:
-------------
linux4palm/linux/branches/cleanup-branch-never-commit/drivers/leds/leds-magician.c
Modified: linux4palm/linux/branches/cleanup-branch-never-commit/arch/arm/tools/mach-types
===================================================================
--- linux4palm/linux/branches/cleanup-branch-never-commit/arch/arm/tools/mach-types 2007-09-17 19:54:28 UTC (rev 1330)
+++ linux4palm/linux/branches/cleanup-branch-never-commit/arch/arm/tools/mach-types 2007-09-17 20:13:33 UTC (rev 1331)
@@ -12,7 +12,7 @@
#
# http://www.arm.linux.org.uk/developer/machines/?action=new
#
-# Last update: Wed Aug 29 03:11:21 2007
+# Last update: Mon Mar 19 13:59:12 2007
#
# machine_is_xxx CONFIG_xxxx MACH_TYPE_xxx number
#
@@ -217,7 +217,8 @@
ceiva ARCH_CEIVA CEIVA 200
fret SA1100_FRET FRET 201
emailphone SA1100_EMAILPHONE EMAILPHONE 202
-h3900 ARCH_H3900 H3900 203
+#h3900 ARCH_H3900 H3900 203
+h3900 MACH_H3900 H3900 203
pxa1 ARCH_PXA1 PXA1 204
koan369 SA1100_KOAN369 KOAN369 205
cogent ARCH_COGENT COGENT 206
@@ -266,7 +267,7 @@
wismo SA1100_WISMO WISMO 249
ezlinx ARCH_EZLINX EZLINX 250
at91rm9200 ARCH_AT91RM9200 AT91RM9200 251
-adtech_orion ARCH_ADTECH_ORION ADTECH_ORION 252
+orion ARCH_ORION ORION 252
neptune ARCH_NEPTUNE NEPTUNE 253
hackkit SA1100_HACKKIT HACKKIT 254
pxa_wins30 ARCH_PXA_WINS30 PXA_WINS30 255
@@ -353,7 +354,7 @@
icarus SA1100_ICARUS ICARUS 336
h1900 ARCH_H1900 H1900 337
gemini SA1100_GEMINI GEMINI 338
-axim ARCH_AXIM AXIM 339
+aximx5 ARCH_AXIMX5 AXIMX5 339
audiotron ARCH_AUDIOTRON AUDIOTRON 340
h2200 ARCH_H2200 H2200 341
loox600 ARCH_LOOX600 LOOX600 342
@@ -1148,7 +1149,7 @@
rema MACH_REMA REMA 1135
bps1000 MACH_BPS1000 BPS1000 1136
hw90350 MACH_HW90350 HW90350 1137
-omap_3430sdp MACH_OMAP_3430SDP OMAP_3430SDP 1138
+omap_sdp3430 MACH_OMAP_SDP3430 OMAP_SDP3430 1138
bluetouch MACH_BLUETOUCH BLUETOUCH 1139
vstms MACH_VSTMS VSTMS 1140
xsbase270 MACH_XSBASE270 XSBASE270 1141
@@ -1299,7 +1300,7 @@
h4300 MACH_H4300 H4300 1291
goramo_mlr MACH_GORAMO_MLR GORAMO_MLR 1292
mxc30020evb MACH_MXC30020EVB MXC30020EVB 1293
-adsbitsyg5 MACH_ADSBITSIMX ADSBITSIMX 1294
+adsbitsimx MACH_ADSBITSIMX ADSBITSIMX 1294
adsportalplus MACH_ADSPORTALPLUS ADSPORTALPLUS 1295
mmsp2plus MACH_MMSP2PLUS MMSP2PLUS 1296
em_x270 MACH_EM_X270 EM_X270 1297
@@ -1473,3 +1474,10 @@
add_wsc2 MACH_ADD_WSC2 ADD_WSC2 1465
add_medinet MACH_ADD_MEDINET ADD_MEDINET 1466
bboard MACH_BBOARD BBOARD 1467
+cambria MACH_CAMBRIA CAMBRIA 1468
+mt7xxx MACH_MT7XXX MT7XXX 1469
+matrix512 MACH_MATRIX512 MATRIX512 1470
+matrix522 MACH_MATRIX522 MATRIX522 1471
+ipac5010 MACH_IPAC5010 IPAC5010 1472
+sakura MACH_SAKURA SAKURA 1473
+grocx MACH_GROCX GROCX 1474
Deleted: linux4palm/linux/branches/cleanup-branch-never-commit/drivers/leds/leds-magician.c
===================================================================
--- linux4palm/linux/branches/cleanup-branch-never-commit/drivers/leds/leds-magician.c 2007-09-17 19:54:28 UTC (rev 1330)
+++ linux4palm/linux/branches/cleanup-branch-never-commit/drivers/leds/leds-magician.c 2007-09-17 20:13:33 UTC (rev 1331)
@@ -1,116 +0,0 @@
-/*
- * HTC Magician GPIO LED driver
- *
- * Copyright (c) 2006 Philipp Zabel <phi...@gm...>
- *
- * This file is subject to the terms and conditions of the GNU General Public
- * License. See the file COPYING in the main directory of this archive for
- * more details.
- */
-
-#include <linux/kernel.h>
-#include <linux/init.h>
-#include <linux/platform_device.h>
-#include <linux/leds.h>
-
-#include <asm/io.h>
-#include <asm/gpio.h>
-
-#include <asm/arch/magician.h>
-
-static void magician_led_keys_set(struct led_classdev *led_cdev,
- enum led_brightness value)
-{
- gpio_set_value(GPIO103_MAGICIAN_LED_KP, value);
-}
-
-static void magician_led_vibra_set(struct led_classdev *led_cdev,
- enum led_brightness value)
-{
- gpio_set_value(GPIO22_MAGICIAN_VIBRA_EN, value);
-}
-
-static struct led_classdev magician_keys_led = {
- .name = "magician:keys",
- .default_trigger = "backlight",
- .brightness_set = magician_led_keys_set,
-};
-
-static struct led_classdev magician_vibra_led = {
- .name = "magician:vibra",
- .default_trigger = "none",
- .brightness_set = magician_led_vibra_set,
-};
-
-#ifdef CONFIG_PM
-static int magician_led_suspend(struct platform_device *dev, pm_message_t state)
-{
- led_classdev_suspend(&magician_keys_led);
- led_classdev_suspend(&magician_vibra_led);
-
- return 0;
-}
-
-static int magician_led_resume(struct platform_device *dev)
-{
- int i;
-
- led_classdev_resume(&magician_keys_led);
- led_classdev_resume(&magician_vibra_led);
-
- return 0;
-}
-#else
-#define magician_led_suspend NULL
-#define magician_led_resume NULL
-#endif
-
-static int magician_led_probe(struct platform_device *pdev)
-{
- int ret;
-
- ret = led_classdev_register(&pdev->dev, &magician_keys_led);
- if (ret < 0)
- return ret;
-
- ret = led_classdev_register(&pdev->dev, &magician_vibra_led);
- if (ret < 0)
- led_classdev_unregister(&magician_keys_led);
-
- return ret;
-}
-
-static int magician_led_remove(struct platform_device *pdev)
-{
- led_classdev_unregister(&magician_vibra_led);
- led_classdev_unregister(&magician_keys_led);
-
- return 0;
-}
-
-static struct platform_driver magician_led_driver = {
- .probe = magician_led_probe,
- .remove = magician_led_remove,
- .suspend = magician_led_suspend,
- .resume = magician_led_resume,
- .driver = {
- .name = "magician-led",
- },
-};
-
-static int __init magician_led_init (void)
-{
- return platform_driver_register(&magician_led_driver);
-}
-
-static void __exit magician_led_exit (void)
-{
- platform_driver_unregister(&magician_led_driver);
-}
-
-module_init (magician_led_init);
-module_exit (magician_led_exit);
-
-MODULE_AUTHOR("Philipp Zabel <phi...@gm...>");
-MODULE_DESCRIPTION("HTC Magician LED driver");
-MODULE_LICENSE("GPL");
Added: linux4palm/linux/branches/cleanup-branch-never-commit/drivers/mfd/htc-bbkeys.c
===================================================================
--- linux4palm/linux/branches/cleanup-branch-never-commit/drivers/mfd/htc-bbkeys.c (rev 0)
+++ linux4palm/linux/branches/cleanup-branch-never-commit/drivers/mfd/htc-bbkeys.c 2007-09-17 20:13:33 UTC (rev 1331)
@@ -0,0 +1,429 @@
+/*
+ * Support for the "mysterious" micro-controller that does "bit
+ * banging" on a pair of gpio pins. This is known to be present on
+ * HTC Apache and HTC Hermes phones. This controller controls the lcd
+ * power, the front keypad, and front LEDs.
+ *
+ * (c) Copyright 2007 Kevin O'Connor <ke...@ko...>
+ *
+ * This file may be distributed under the terms of the GNU GPL license.
+ */
+
+#include <linux/kernel.h>
+#include <linux/platform_device.h> /* struct platform_device */
+#include <linux/interrupt.h> /* irqreturn_t */
+#include <linux/input.h> /* input_report_key */
+#include <linux/spinlock.h> /* spinlock_t */
+
+#include <asm/gpio.h> /* gpio_set_value */
+#include <linux/mfd/htc-bbkeys.h>
+
+/* Some HTC phones have a device attached to gpio pins that appears to
+ * follow the i2c system with some minor deviations. It uses a 4bit
+ * register number instead of a 7 bit device-id address. */
+
+#define dprintf1(fmt, args...) printk(KERN_DEBUG fmt "\n" , ##args)
+#define dprintf(fmt, args...)
+
+struct bbkeys_info {
+ spinlock_t lock;
+ int sda_gpio, scl_gpio;
+ int irq;
+ struct input_dev *input;
+ u8 outcache[8];
+};
+
+
+/****************************************************************
+ * Chip register access
+ ****************************************************************/
+
+/* Wrappers around gpio functions */
+static inline int get_sda(struct bbkeys_info *bb)
+{
+ return gpio_get_value(bb->sda_gpio);
+}
+static inline void set_sda(struct bbkeys_info *bb, int value)
+{
+ gpio_set_value(bb->sda_gpio, value);
+}
+static inline void set_scl(struct bbkeys_info *bb, int value)
+{
+ gpio_set_value(bb->scl_gpio, value);
+}
+static inline void set_sda_input(struct bbkeys_info *bb)
+{
+ gpio_direction_input(bb->sda_gpio);
+}
+static inline void set_sda_output(struct bbkeys_info *bb)
+{
+ gpio_direction_output(bb->sda_gpio);
+}
+
+/* Read 'count' bits from SDA pin. The caller must ensure the SDA pin
+ * is set to input mode before calling. The SCL pin must be low. */
+static inline u32 read_bits(struct bbkeys_info *bb, int count)
+{
+ u32 data = 0;
+ int i = count;
+
+ for (; i>0; i--) {
+ data <<= 1;
+
+ set_scl(bb, 1);
+
+ if (get_sda(bb))
+ data |= 1;
+ dprintf(2, "Read bit of %d", data & 1);
+
+ set_scl(bb, 0);
+ }
+ dprintf(1, "Read %d bits: 0x%08x", count, data);
+ return data;
+}
+
+/* Write 'count' bits to SDA pin. The caller must ensure the SDA pin
+ * is set to output mode before calling. The SCL pin must be low. */
+static inline void write_bits(struct bbkeys_info *bb, u32 data, int count)
+{
+ u32 bit = 1<<(count-1);
+ dprintf(1, "Writing %d bits: 0x%08x", count, data);
+
+ for (; count>0; count--) {
+ set_sda(bb, data & bit);
+ dprintf(2, "Write bit of %d", !!(data & bit));
+
+ set_scl(bb, 1);
+ set_scl(bb, 0);
+
+ data <<= 1;
+ }
+}
+
+/* Init the gpio lines and send a stop followed by a start. */
+static inline void stopstart(struct bbkeys_info *bb)
+{
+ dprintf(1, "Stop Start");
+
+ /* Init lines */
+ set_sda_output(bb);
+ set_scl(bb, 0);
+ set_sda(bb, 0);
+
+ /* Send stop */
+ set_scl(bb, 1);
+ set_sda(bb, 1);
+
+ /* Send start */
+ set_sda(bb, 0);
+ set_scl(bb, 0);
+}
+
+/* Read a register from the bit-banging interface. */
+static u32 __bbkeys_read(struct bbkeys_info *bb, u32 reg)
+{
+ u32 val;
+ stopstart(bb);
+
+ /* Set read indicator as low order bit. */
+ val = reg << 1;
+ val |= 1;
+
+ /* Send register */
+ write_bits(bb, val, 5);
+
+ /* Get ack. */
+ set_sda_input(bb);
+ val = read_bits(bb, 1);
+ if (! val)
+ goto fail;
+
+ /* Read register value. */
+ val = read_bits(bb, 9);
+ if (!(val & 1))
+ goto fail;
+ val >>= 1;
+
+ return val;
+fail:
+ printk(KERN_WARNING "BBKEYS - Missing ack\n");
+ return 0;
+}
+
+static u32 bbkeys_read(struct bbkeys_info *bb, u32 reg)
+{
+ u32 ret;
+ unsigned long flag;
+ spin_lock_irqsave(&bb->lock, flag);
+ ret = __bbkeys_read(bb, reg);
+ spin_unlock_irqrestore(&bb->lock, flag);
+ return ret;
+}
+
+/* Write a register on the bit-banging interface. */
+static void __bbkeys_write(struct bbkeys_info *bb, u32 reg, u32 data)
+{
+ stopstart(bb);
+
+ /* Set write indicator as low order bit. */
+ reg <<= 1;
+
+ /* Send register */
+ write_bits(bb, reg, 5);
+
+ /* Get ack. */
+ set_sda_input(bb);
+ reg = read_bits(bb, 1);
+ if (! reg)
+ goto fail;
+ set_sda_output(bb);
+
+ /* write register value. */
+ write_bits(bb, data, 8);
+ set_sda_input(bb);
+ reg = read_bits(bb, 1);
+ if (!reg)
+ goto fail;
+ return;
+fail:
+ printk(KERN_WARNING "BBKEYS - Missing ack\n");
+}
+
+static void bbkeys_write(struct bbkeys_info *bb, u32 reg, u32 data)
+{
+ unsigned long flag;
+ spin_lock_irqsave(&bb->lock, flag);
+ __bbkeys_write(bb, reg, data);
+ spin_unlock_irqrestore(&bb->lock, flag);
+}
+
+
+/****************************************************************
+ * Keypad
+ ****************************************************************/
+
+static irqreturn_t bbkeys_isr(int irq, void *dev_id)
+{
+ int i;
+ struct platform_device *pdev = dev_id;
+ struct htc_bbkeys_platform_data *pdata = pdev->dev.platform_data;
+ struct bbkeys_info *bb = platform_get_drvdata(pdev);
+ u32 regs;
+
+ /* Ack the interrupt. */
+ bbkeys_write(bb, pdata->ackreg, 0);
+
+ /* Read the key status registers */
+ regs = ~(bbkeys_read(bb, pdata->key1reg)
+ | (bbkeys_read(bb, pdata->key2reg) << 8));
+
+ /* Register the state of the keys */
+ for (i = 0; i < BBKEYS_MAXKEY; i++) {
+ int key = pdata->buttons[i];
+ int state = !!(regs & (1<<i));
+ if (key < 0)
+ continue;
+ input_report_key(bb->input, key, state);
+ input_sync(bb->input);
+ }
+
+ return IRQ_HANDLED;
+}
+
+/* Delayed input driver data. */
+static int InputReady;
+static struct platform_device *Early_pdev;
+
+static int key_setup(struct platform_device *pdev)
+{
+ struct bbkeys_info *bb = platform_get_drvdata(pdev);
+ struct htc_bbkeys_platform_data *pdata = pdev->dev.platform_data;
+ struct input_dev *input;
+ struct resource *res;
+ int i, ret;
+
+ if (! InputReady) {
+ printk("Delaying registration of bbkeys input driver\n");
+ Early_pdev = pdev;
+ return 0;
+ }
+
+ /* Find keyboard irq */
+ res = platform_get_resource(pdev, IORESOURCE_IRQ, 0);
+ if (!res)
+ return -EINVAL;
+ bb->irq = res->start;
+
+ input = input_allocate_device();
+ if (!input)
+ return -ENOMEM;
+
+ set_bit(EV_KEY, input->evbit);
+
+ input->name = pdev->name;
+ bb->input = input;
+
+ for (i = 0; i < BBKEYS_MAXKEY; i++) {
+ int code = pdata->buttons[i];
+ if (code >= 0)
+ set_bit(code, input->keybit);
+ }
+
+ ret = input_register_device(input);
+ if (ret < 0) {
+ printk(KERN_ERR "Unable to register bbkeys input device\n");
+ goto fail;
+ }
+
+ ret = request_irq(bb->irq, bbkeys_isr
+ , IRQF_DISABLED | IRQF_TRIGGER_RISING
+ | IRQF_SAMPLE_RANDOM
+ , pdev->name, pdev);
+ if (ret)
+ goto fail;
+
+ /* Clear any queued up key events. */
+ bbkeys_write(bb, pdata->ackreg, 0);
+
+ return 0;
+
+fail:
+ input_free_device(input);
+ return ret;
+}
+
+
+/****************************************************************
+ * GPIOs
+ ****************************************************************/
+
+static inline int u8pos(unsigned gpio) {
+ return (gpio & GPIO_BASE_MASK) / 8;
+}
+static inline int u8bit(unsigned gpio) {
+ return 1<<(gpio & (8-1));
+}
+
+/* Check an input pin to see if it is active. */
+static int bbkeys_get(struct device *dev, unsigned gpio)
+{
+ struct bbkeys_info *bb = dev_get_drvdata(dev);
+ u32 readval = bbkeys_read(bb, u8pos(gpio));
+ return !!(readval & u8bit(gpio));
+}
+
+/* Set the direction of an output pin. */
+static void bbkeys_set(struct device *dev, unsigned gpio, int val)
+{
+ struct bbkeys_info *bb = dev_get_drvdata(dev);
+ int pos = u8pos(gpio);
+ unsigned long flag;
+
+ spin_lock_irqsave(&bb->lock, flag);
+ if (val)
+ bb->outcache[pos] |= u8bit(gpio);
+ else
+ bb->outcache[pos] &= ~u8bit(gpio);
+ __bbkeys_write(bb, pos, bb->outcache[pos]);
+ spin_unlock_irqrestore(&bb->lock, flag);
+}
+
+/* Dummy handler - this device doesn't support irqs. */
+static int bbkeys_to_irq(struct device *dev, unsigned gpio_no)
+{
+ return -ENODEV;
+}
+
+
+/****************************************************************
+ * Setup
+ ****************************************************************/
+
+static int bbkeys_probe(struct platform_device *pdev)
+{
+ struct htc_bbkeys_platform_data *pdata = pdev->dev.platform_data;
+ struct bbkeys_info *bb;
+ int ret;
+ struct gpio_ops ops;
+
+ /* Initialize bb data structure. */
+ bb = kzalloc(sizeof(*bb), GFP_KERNEL);
+ if (!bb)
+ return -ENOMEM;
+
+ spin_lock_init(&bb->lock);
+
+ bb->sda_gpio = pdata->sda_gpio;
+ bb->scl_gpio = pdata->scl_gpio;
+
+ platform_set_drvdata(pdev, bb);
+
+ /* Setup input handling */
+ ret = key_setup(pdev);
+ if (ret)
+ goto fail;
+
+ ops.get_value = bbkeys_get;
+ ops.set_value = bbkeys_set;
+ ops.to_irq = bbkeys_to_irq;
+ gpiodev_register(pdata->gpio_base, &pdev->dev, &ops);
+
+ return 0;
+fail:
+ printk(KERN_NOTICE "BBKEYS failed to setup\n");
+ kfree(bb);
+ return ret;
+}
+
+static int bbkeys_remove(struct platform_device *pdev)
+{
+ struct bbkeys_info *bb = platform_get_drvdata(pdev);
+ free_irq(bb->irq, pdev);
+ input_unregister_device(bb->input);
+ kfree(bb);
+ return 0;
+}
+
+static struct platform_driver bbkeys_driver = {
+ .driver = {
+ .name = "htc-bbkeys",
+ },
+ .probe = bbkeys_probe,
+ .remove = bbkeys_remove,
+};
+
+static int __init bbkeys_init(void)
+{
+ return platform_driver_register(&bbkeys_driver);
+}
+
+static void __exit bbkeys_exit(void)
+{
+ platform_driver_unregister(&bbkeys_driver);
+}
+
+/* Ugh. The input subsystem comes up later in the boot process, but
+ * several devices need the bbkeys gpio driver earlier. So, if this
+ * driver comes up early, we delay input registration until later in
+ * the boot. */
+static int __init bbkeys_late_init(void)
+{
+ InputReady = 1;
+ if (Early_pdev) {
+ printk("Registering delayed bbkeys input driver\n");
+ key_setup(Early_pdev);
+ }
+ Early_pdev = NULL;
+ return 0;
+}
+
+module_init(bbkeys_late_init)
+#ifdef MODULE
+module_init(bbkeys_init);
+#else /* start early for dependencies */
+subsys_initcall(bbkeys_init);
+#endif
+module_exit(bbkeys_exit)
+
+MODULE_LICENSE("GPL");
+MODULE_AUTHOR("Kevin O'Connor <ke...@ko...>");
Added: linux4palm/linux/branches/cleanup-branch-never-commit/usr/.gitignore
===================================================================
--- linux4palm/linux/branches/cleanup-branch-never-commit/usr/.gitignore (rev 0)
+++ linux4palm/linux/branches/cleanup-branch-never-commit/usr/.gitignore 2007-09-17 20:13:33 UTC (rev 1331)
@@ -0,0 +1,7 @@
+#
+# Generated files
+#
+gen_init_cpio
+initramfs_data.cpio
+initramfs_data.cpio.gz
+initramfs_list
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
×
Want the latest updates on software, tech news, and AI?
Get latest updates about software, tech news, and AI from SourceForge directly in your inbox once a month.
Thanks for helping keep SourceForge clean.
X