linux-ezx 2.6.21: update patches to r1988 to get a working mux_cli (needs a recent opentapi)

3 files changed, 261 insertions, 204 deletions

diff --git a/packages/linux/linux-ezx-2.6.21/defconfig-a780 b/packages/linux/linux-ezx-2.6.21/defconfig-a780
index eb80b2abd8..42fb38751c 100644
--- a/packages/linux/linux-ezx-2.6.21/defconfig-a780
+++ b/packages/linux/linux-ezx-2.6.21/defconfig-a780
@@ -1,11 +1,14 @@
 #
 # Automatically generated make config: don't edit
-# Linux kernel version: 2.6.20.7
-# Tue Apr 24 16:05:51 2007
+# Linux kernel version: 2.6.21
+# Fri Apr 27 21:27:36 2007
 #
 CONFIG_ARM=y
-# CONFIG_GENERIC_TIME is not set
+CONFIG_SYS_SUPPORTS_APM_EMULATION=y
+CONFIG_GENERIC_GPIO=y
+CONFIG_GENERIC_TIME=y
 CONFIG_MMU=y
+# CONFIG_NO_IOPORT is not set
 CONFIG_GENERIC_HARDIRQS=y
 CONFIG_TRACE_IRQFLAGS_SUPPORT=y
 CONFIG_HARDIRQS_SW_RESEND=y
@@ -15,6 +18,7 @@ CONFIG_RWSEM_GENERIC_SPINLOCK=y
 # CONFIG_ARCH_HAS_ILOG2_U64 is not set
 CONFIG_GENERIC_HWEIGHT=y
 CONFIG_GENERIC_CALIBRATE_DELAY=y
+CONFIG_ZONE_DMA=y
 CONFIG_ARCH_MTD_XIP=y
 CONFIG_VECTORS_BASE=0xffff0000
 CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
@@ -24,6 +28,7 @@ CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
 #
 CONFIG_EXPERIMENTAL=y
 CONFIG_BROKEN_ON_SMP=y
+CONFIG_LOCK_KERNEL=y
 CONFIG_INIT_ENV_ARG_LIMIT=32
 
 #
@@ -34,6 +39,7 @@ CONFIG_LOCALVERSION="-ezxdev"
 # CONFIG_SWAP is not set
 CONFIG_SYSVIPC=y
 # CONFIG_IPC_NS is not set
+CONFIG_SYSVIPC_SYSCTL=y
 # CONFIG_POSIX_MQUEUE is not set
 # CONFIG_BSD_PROCESS_ACCT is not set
 # CONFIG_TASKSTATS is not set
@@ -43,10 +49,10 @@ CONFIG_IKCONFIG=y
 CONFIG_IKCONFIG_PROC=y
 # CONFIG_SYSFS_DEPRECATED is not set
 # CONFIG_RELAY is not set
-CONFIG_INITRAMFS_SOURCE=""
+# CONFIG_BLK_DEV_INITRD is not set
 CONFIG_CC_OPTIMIZE_FOR_SIZE=y
 CONFIG_SYSCTL=y
-# CONFIG_EMBEDDED is not set
+CONFIG_EMBEDDED=y
 CONFIG_UID16=y
 CONFIG_SYSCTL_SYSCALL=y
 CONFIG_KALLSYMS=y
@@ -59,11 +65,11 @@ CONFIG_ELF_CORE=y
 CONFIG_BASE_FULL=y
 CONFIG_FUTEX=y
 CONFIG_EPOLL=y
-CONFIG_SHMEM=y
+# CONFIG_SHMEM is not set
 CONFIG_SLAB=y
 CONFIG_VM_EVENT_COUNTERS=y
 CONFIG_RT_MUTEXES=y
-# CONFIG_TINY_SHMEM is not set
+CONFIG_TINY_SHMEM=y
 CONFIG_BASE_SMALL=0
 # CONFIG_SLOB is not set
 
@@ -89,14 +95,14 @@ CONFIG_BLOCK=y
 # IO Schedulers
 #
 CONFIG_IOSCHED_NOOP=y
-CONFIG_IOSCHED_AS=y
-CONFIG_IOSCHED_DEADLINE=m
-CONFIG_IOSCHED_CFQ=m
-CONFIG_DEFAULT_AS=y
-# CONFIG_DEFAULT_DEADLINE is not set
+# CONFIG_IOSCHED_AS is not set
+CONFIG_IOSCHED_DEADLINE=y
+# CONFIG_IOSCHED_CFQ is not set
+# CONFIG_DEFAULT_AS is not set
+CONFIG_DEFAULT_DEADLINE=y
 # CONFIG_DEFAULT_CFQ is not set
 # CONFIG_DEFAULT_NOOP is not set
-CONFIG_DEFAULT_IOSCHED="anticipatory"
+CONFIG_DEFAULT_IOSCHED="deadline"
 
 #
 # System Type
@@ -122,6 +128,7 @@ CONFIG_DEFAULT_IOSCHED="anticipatory"
 # CONFIG_ARCH_IXP2000 is not set
 # CONFIG_ARCH_IXP23XX is not set
 # CONFIG_ARCH_L7200 is not set
+# CONFIG_ARCH_NS9XXX is not set
 # CONFIG_ARCH_PNX4008 is not set
 CONFIG_ARCH_PXA=y
 # CONFIG_ARCH_RPC is not set
@@ -168,6 +175,7 @@ CONFIG_CPU_CP15_MMU=y
 #
 CONFIG_ARM_THUMB=y
 # CONFIG_CPU_DCACHE_DISABLE is not set
+# CONFIG_OUTER_CACHE is not set
 CONFIG_IWMMXT=y
 CONFIG_XSCALE_PMU=y
 
@@ -183,8 +191,8 @@ CONFIG_XSCALE_PMU=y
 #
 # Kernel Features
 #
-# CONFIG_PREEMPT is not set
-CONFIG_NO_IDLE_HZ=y
+CONFIG_PREEMPT=y
+# CONFIG_NO_IDLE_HZ is not set
 CONFIG_HZ=100
 CONFIG_AEABI=y
 CONFIG_OABI_COMPAT=y
@@ -198,15 +206,17 @@ CONFIG_FLAT_NODE_MEM_MAP=y
 # CONFIG_SPARSEMEM_STATIC is not set
 CONFIG_SPLIT_PTLOCK_CPUS=4096
 # CONFIG_RESOURCES_64BIT is not set
+CONFIG_ZONE_DMA_FLAG=1
 CONFIG_ALIGNMENT_TRAP=y
 
 #
 # Boot options
 #
-CONFIG_ZBOOT_ROM_TEXT=0x0
-CONFIG_ZBOOT_ROM_BSS=0x0
+CONFIG_ZBOOT_ROM_TEXT=0
+CONFIG_ZBOOT_ROM_BSS=0
 CONFIG_CMDLINE="console=tty1 noinitrd root=/dev/mmcblk0p2 rootfstype=ext3 ip=169.254.1.11:169.254.1.10:169.254.1.10:255.255.255.254:ezx:usb0:off debug mem=32M@0xA0000000 mem=16M@0xAC000000"
 # CONFIG_XIP_KERNEL is not set
+# CONFIG_KEXEC is not set
 
 #
 # Floating point emulation
@@ -229,8 +239,11 @@ CONFIG_BINFMT_MISC=m
 #
 # Power management options
 #
-# CONFIG_PM is not set
-# CONFIG_APM is not set
+CONFIG_PM=y
+# CONFIG_PM_LEGACY is not set
+# CONFIG_PM_DEBUG is not set
+# CONFIG_PM_SYSFS_DEPRECATED is not set
+CONFIG_APM_EMULATION=y
 
 #
 # Networking
@@ -247,6 +260,7 @@ 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 is not set
@@ -351,6 +365,7 @@ CONFIG_STANDALONE=y
 CONFIG_PREVENT_FIRMWARE_BUILD=y
 CONFIG_FW_LOADER=m
 # CONFIG_DEBUG_DRIVER is not set
+# CONFIG_DEBUG_DEVRES is not set
 # CONFIG_SYS_HYPERVISOR is not set
 
 #
@@ -361,20 +376,20 @@ CONFIG_CONNECTOR=m
 #
 # Memory Technology Devices (MTD)
 #
-CONFIG_MTD=y
+CONFIG_MTD=m
 # CONFIG_MTD_DEBUG is not set
-CONFIG_MTD_CONCAT=y
+CONFIG_MTD_CONCAT=m
 CONFIG_MTD_PARTITIONS=y
 # CONFIG_MTD_REDBOOT_PARTS is not set
-CONFIG_MTD_CMDLINE_PARTS=y
 # 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_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
@@ -384,29 +399,24 @@ CONFIG_MTD_BLOCK=y
 #
 # RAM/ROM/Flash chip drivers
 #
-CONFIG_MTD_CFI=y
+CONFIG_MTD_CFI=m
 # 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 is not set
+CONFIG_MTD_GEN_PROBE=m
+# CONFIG_MTD_CFI_ADV_OPTIONS is not set
+CONFIG_MTD_MAP_BANK_WIDTH_1=y
 CONFIG_MTD_MAP_BANK_WIDTH_2=y
-# CONFIG_MTD_MAP_BANK_WIDTH_4 is not set
+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 is not set
+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_INTELEXT=m
 # CONFIG_MTD_CFI_AMDSTD is not set
 # CONFIG_MTD_CFI_STAA is not set
-CONFIG_MTD_CFI_UTIL=y
+CONFIG_MTD_CFI_UTIL=m
 # CONFIG_MTD_RAM is not set
 # CONFIG_MTD_ROM is not set
 # CONFIG_MTD_ABSENT is not set
@@ -416,13 +426,13 @@ CONFIG_MTD_XIP=y
 #
 # Mapping drivers for chip access
 #
-# CONFIG_MTD_COMPLEX_MAPPINGS is not set
+CONFIG_MTD_COMPLEX_MAPPINGS=y
 # CONFIG_MTD_PHYSMAP is not set
 # CONFIG_MTD_ARM_INTEGRATOR is not set
 # CONFIG_MTD_SHARP_SL is not set
-CONFIG_MTD_EZX=y
-CONFIG_MTD_EZX_A780=y
-# CONFIG_MTD_EZX_A780_ALTERNATE is not set
+CONFIG_MTD_EZX=m
+# CONFIG_MTD_EZX_A780 is not set
+CONFIG_MTD_EZX_A780_ALTERNATE=y
 # CONFIG_MTD_EZX_E2 is not set
 # CONFIG_MTD_PLATRAM is not set
 
@@ -461,17 +471,17 @@ CONFIG_MTD_EZX_A780=y
 #
 # Plug and Play support
 #
+# CONFIG_PNPACPI is not set
 
 #
 # Block devices
 #
 # CONFIG_BLK_DEV_COW_COMMON is not set
-CONFIG_BLK_DEV_LOOP=y
+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
-# CONFIG_BLK_DEV_INITRD is not set
 # CONFIG_CDROM_PKTCDVD is not set
 # CONFIG_ATA_OVER_ETH is not set
 
@@ -570,10 +580,7 @@ CONFIG_INPUT=y
 #
 # Userland interfaces
 #
-CONFIG_INPUT_MOUSEDEV=y
-CONFIG_INPUT_MOUSEDEV_PSAUX=y
-CONFIG_INPUT_MOUSEDEV_SCREEN_X=1024
-CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768
+# CONFIG_INPUT_MOUSEDEV is not set
 # CONFIG_INPUT_JOYDEV is not set
 CONFIG_INPUT_TSDEV=y
 CONFIG_INPUT_TSDEV_SCREEN_X=240
@@ -591,6 +598,7 @@ CONFIG_INPUT_KEYBOARD=y
 # CONFIG_KEYBOARD_XTKBD is not set
 # CONFIG_KEYBOARD_NEWTON is not set
 # CONFIG_KEYBOARD_STOWAWAY is not set
+CONFIG_KEYBOARD_GPIO=y
 # CONFIG_INPUT_MOUSE is not set
 # CONFIG_INPUT_JOYSTICK is not set
 CONFIG_INPUT_TOUCHSCREEN=y
@@ -608,9 +616,7 @@ CONFIG_INPUT_TOUCHSCREEN=y
 #
 # Hardware I/O ports
 #
-CONFIG_SERIO=y
-# CONFIG_SERIO_SERPORT is not set
-# CONFIG_SERIO_RAW is not set
+# CONFIG_SERIO is not set
 # CONFIG_GAMEPORT is not set
 
 #
@@ -657,14 +663,14 @@ CONFIG_LEGACY_PTY_COUNT=8
 # TPM devices
 #
 # CONFIG_TCG_TPM is not set
-CONFIG_TS0710_MUX=m
-CONFIG_TS0710_MUX_USB=m
+CONFIG_TS0710_MUX=y
+CONFIG_TS0710_MUX_USB=y
 
 #
 # I2C support
 #
-CONFIG_I2C=y
-CONFIG_I2C_CHARDEV=y
+CONFIG_I2C=m
+CONFIG_I2C_CHARDEV=m
 
 #
 # I2C Algorithms
@@ -676,7 +682,7 @@ CONFIG_I2C_CHARDEV=y
 #
 # I2C Hardware Bus support
 #
-CONFIG_I2C_PXA=y
+CONFIG_I2C_PXA=m
 # CONFIG_I2C_PXA_SLAVE is not set
 # CONFIG_I2C_OCORES is not set
 # CONFIG_I2C_PARPORT_LIGHT is not set
@@ -714,6 +720,7 @@ CONFIG_SPI_PXA2XX=y
 #
 # SPI Protocol Masters
 #
+# CONFIG_SPI_AT25 is not set
 
 #
 # Dallas's 1-wire bus
@@ -729,13 +736,16 @@ CONFIG_SPI_PXA2XX=y
 #
 # Misc devices
 #
-# CONFIG_TIFM_CORE is not set
+
+#
+# Multifunction device drivers
+#
+# CONFIG_MFD_SM501 is not set
 
 #
 # LED devices
 #
-CONFIG_NEW_LEDS=y
-CONFIG_LEDS_CLASS=y
+# CONFIG_NEW_LEDS is not set
 
 #
 # LED drivers
@@ -744,9 +754,6 @@ CONFIG_LEDS_CLASS=y
 #
 # LED Triggers
 #
-CONFIG_LEDS_TRIGGERS=y
-CONFIG_LEDS_TRIGGER_TIMER=y
-CONFIG_LEDS_TRIGGER_HEARTBEAT=y
 
 #
 # Multimedia devices
@@ -762,15 +769,24 @@ CONFIG_LEDS_TRIGGER_HEARTBEAT=y
 #
 # Graphics support
 #
-# CONFIG_FIRMWARE_EDID is not set
+CONFIG_BACKLIGHT_LCD_SUPPORT=y
+CONFIG_BACKLIGHT_CLASS_DEVICE=y
+# CONFIG_LCD_CLASS_DEVICE is not set
 CONFIG_FB=y
+# CONFIG_FIRMWARE_EDID is not set
+# CONFIG_FB_DDC is not set
 CONFIG_FB_CFB_FILLRECT=y
 CONFIG_FB_CFB_COPYAREA=y
 CONFIG_FB_CFB_IMAGEBLIT=y
+# CONFIG_FB_SVGALIB is not set
 # CONFIG_FB_MACMODES is not set
 # CONFIG_FB_BACKLIGHT is not set
 # CONFIG_FB_MODE_HELPERS is not set
 # CONFIG_FB_TILEBLITTING is not set
+
+#
+# Frame buffer hardware drivers
+#
 # CONFIG_FB_S1D13XXX is not set
 CONFIG_FB_PXA=y
 CONFIG_FB_PXA_PARAMETERS=y
@@ -800,53 +816,17 @@ CONFIG_FONT_MINI_4x6=y
 # Logo configuration
 #
 # CONFIG_LOGO is not set
-# CONFIG_BACKLIGHT_LCD_SUPPORT is not set
 
 #
 # Sound
 #
-CONFIG_SOUND=y
-
-#
-# Advanced Linux Sound Architecture
-#
-CONFIG_SND=y
-# CONFIG_SND_SEQUENCER is not set
-# CONFIG_SND_MIXER_OSS is not set
-# CONFIG_SND_PCM_OSS is not set
-# CONFIG_SND_DYNAMIC_MINORS is not set
-# CONFIG_SND_SUPPORT_OLD_API is not set
-# CONFIG_SND_VERBOSE_PROCFS is not set
-# CONFIG_SND_VERBOSE_PRINTK is not set
-# CONFIG_SND_DEBUG is not set
-
-#
-# Generic devices
-#
-# CONFIG_SND_DUMMY is not set
-# CONFIG_SND_MTPAV is not set
-# CONFIG_SND_SERIAL_U16550 is not set
-# CONFIG_SND_MPU401 is not set
-
-#
-# ALSA ARM devices
-#
-# CONFIG_SND_PXA2XX_AC97 is not set
-
-#
-# USB devices
-#
-# CONFIG_SND_USB_AUDIO is not set
-
-#
-# Open Sound System
-#
-# CONFIG_SOUND_PRIME is not set
+# CONFIG_SOUND is not set
 
 #
 # HID Devices
 #
 CONFIG_HID=y
+# CONFIG_HID_DEBUG is not set
 
 #
 # USB support
@@ -861,8 +841,8 @@ CONFIG_USB=y
 # Miscellaneous USB options
 #
 # CONFIG_USB_DEVICEFS is not set
-# CONFIG_USB_BANDWIDTH is not set
 # CONFIG_USB_DYNAMIC_MINORS is not set
+# CONFIG_USB_SUSPEND is not set
 # CONFIG_USB_OTG is not set
 
 #
@@ -870,7 +850,8 @@ CONFIG_USB=y
 #
 # CONFIG_USB_ISP116X_HCD is not set
 CONFIG_USB_OHCI_HCD=y
-# CONFIG_USB_OHCI_BIG_ENDIAN is not set
+# CONFIG_USB_OHCI_BIG_ENDIAN_DESC is not set
+# CONFIG_USB_OHCI_BIG_ENDIAN_MMIO is not set
 CONFIG_USB_OHCI_LITTLE_ENDIAN=y
 # CONFIG_USB_SL811_HCD is not set
 
@@ -911,6 +892,7 @@ CONFIG_USB_OHCI_LITTLE_ENDIAN=y
 # CONFIG_USB_ATI_REMOTE2 is not set
 # CONFIG_USB_KEYSPAN_REMOTE is not set
 # CONFIG_USB_APPLETOUCH is not set
+# CONFIG_USB_GTCO is not set
 
 #
 # USB Imaging devices
@@ -947,6 +929,7 @@ CONFIG_USB_MON=y
 # CONFIG_USB_RIO500 is not set
 # CONFIG_USB_LEGOTOWER is not set
 # CONFIG_USB_LCD is not set
+# CONFIG_USB_BERRY_CHARGE is not set
 # CONFIG_USB_LED is not set
 # CONFIG_USB_CYPRESS_CY7C63 is not set
 # CONFIG_USB_CYTHERM is not set
@@ -956,6 +939,7 @@ CONFIG_USB_MON=y
 # CONFIG_USB_APPLEDISPLAY is not set
 # CONFIG_USB_LD is not set
 # CONFIG_USB_TRANCEVIBRATOR is not set
+# CONFIG_USB_IOWARRIOR is not set
 
 #
 # USB DSL modem support
@@ -969,14 +953,15 @@ CONFIG_USB_GADGET=y
 CONFIG_USB_GADGET_SELECTED=y
 # CONFIG_USB_GADGET_NET2280 is not set
 # CONFIG_USB_GADGET_PXA2XX is not set
-# CONFIG_USB_GADGET_PXA27X is not set
+CONFIG_USB_GADGET_PXA27X=y
+CONFIG_USB_PXA27X=y
+# CONFIG_USB_PXA2XX_SMALL is not set
 # CONFIG_USB_GADGET_GOKU is not set
 # CONFIG_USB_GADGET_LH7A40X is not set
 # CONFIG_USB_GADGET_OMAP is not set
 # CONFIG_USB_GADGET_AT91 is not set
-CONFIG_USB_GADGET_DUMMY_HCD=y
-CONFIG_USB_DUMMY_HCD=y
-CONFIG_USB_GADGET_DUALSPEED=y
+# CONFIG_USB_GADGET_DUMMY_HCD is not set
+# CONFIG_USB_GADGET_DUALSPEED is not set
 # CONFIG_USB_ZERO is not set
 CONFIG_USB_ETH=y
 # CONFIG_USB_ETH_RNDIS is not set
@@ -992,28 +977,25 @@ CONFIG_MMC=y
 # CONFIG_MMC_DEBUG is not set
 CONFIG_MMC_BLOCK=y
 CONFIG_MMC_PXA=y
-# CONFIG_MMC_TIFM_SD is not set
 
 #
 # Real Time Clock
 #
 CONFIG_RTC_LIB=y
-CONFIG_RTC_CLASS=y
-CONFIG_RTC_HCTOSYS=y
-CONFIG_RTC_HCTOSYS_DEVICE="rtc0"
-# CONFIG_RTC_DEBUG is not set
+CONFIG_RTC_CLASS=m
 
 #
 # RTC interfaces
 #
-CONFIG_RTC_INTF_SYSFS=y
-CONFIG_RTC_INTF_PROC=y
-CONFIG_RTC_INTF_DEV=y
+CONFIG_RTC_INTF_SYSFS=m
+CONFIG_RTC_INTF_PROC=m
+CONFIG_RTC_INTF_DEV=m
 # CONFIG_RTC_INTF_DEV_UIE_EMUL is not set
 
 #
 # RTC drivers
 #
+# CONFIG_RTC_DRV_CMOS is not set
 # CONFIG_RTC_DRV_X1205 is not set
 # CONFIG_RTC_DRV_DS1307 is not set
 # CONFIG_RTC_DRV_DS1553 is not set
@@ -1021,11 +1003,10 @@ CONFIG_RTC_INTF_DEV=y
 # CONFIG_RTC_DRV_DS1672 is not set
 # CONFIG_RTC_DRV_DS1742 is not set
 # CONFIG_RTC_DRV_PCF8563 is not set
-# CONFIG_RTC_DRV_PCF8583 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=y
+CONFIG_RTC_DRV_SA1100=m
 # CONFIG_RTC_DRV_TEST is not set
 # CONFIG_RTC_DRV_MAX6902 is not set
 # CONFIG_RTC_DRV_V3020 is not set
@@ -1089,8 +1070,7 @@ CONFIG_FAT_DEFAULT_IOCHARSET="iso8859-1"
 CONFIG_PROC_FS=y
 CONFIG_PROC_SYSCTL=y
 CONFIG_SYSFS=y
-CONFIG_TMPFS=y
-# CONFIG_TMPFS_POSIX_ACL is not set
+# CONFIG_TMPFS is not set
 # CONFIG_HUGETLB_PAGE is not set
 CONFIG_RAMFS=y
 # CONFIG_CONFIGFS_FS is not set
@@ -1118,25 +1098,34 @@ CONFIG_CRAMFS=y
 #
 CONFIG_NFS_FS=y
 CONFIG_NFS_V3=y
-# CONFIG_NFS_V3_ACL is not set
+CONFIG_NFS_V3_ACL=y
 # CONFIG_NFS_V4 is not set
-# CONFIG_NFS_DIRECTIO is not set
+CONFIG_NFS_DIRECTIO=y
 CONFIG_NFSD=m
+CONFIG_NFSD_V2_ACL=y
 CONFIG_NFSD_V3=y
-# CONFIG_NFSD_V3_ACL is not set
+CONFIG_NFSD_V3_ACL=y
 # CONFIG_NFSD_V4 is not set
 CONFIG_NFSD_TCP=y
-# CONFIG_ROOT_NFS is not set
+CONFIG_ROOT_NFS=y
 CONFIG_LOCKD=y
 CONFIG_LOCKD_V4=y
 CONFIG_EXPORTFS=m
+CONFIG_NFS_ACL_SUPPORT=y
 CONFIG_NFS_COMMON=y
 CONFIG_SUNRPC=y
 # CONFIG_RPCSEC_GSS_KRB5 is not set
 # CONFIG_RPCSEC_GSS_SPKM3 is not set
 CONFIG_SMB_FS=m
 # CONFIG_SMB_NLS_DEFAULT is not set
-# CONFIG_CIFS is not set
+CONFIG_CIFS=m
+CONFIG_CIFS_STATS=y
+# CONFIG_CIFS_STATS2 is not set
+CONFIG_CIFS_WEAK_PW_HASH=y
+CONFIG_CIFS_XATTR=y
+CONFIG_CIFS_POSIX=y
+# CONFIG_CIFS_DEBUG2 is not set
+# CONFIG_CIFS_EXPERIMENTAL is not set
 # CONFIG_NCP_FS is not set
 # CONFIG_CODA_FS is not set
 # CONFIG_AFS_FS is not set
@@ -1206,22 +1195,24 @@ CONFIG_NLS_UTF8=m
 # Kernel hacking
 #
 # CONFIG_PRINTK_TIME is not set
-# CONFIG_ENABLE_MUST_CHECK is not set
+CONFIG_ENABLE_MUST_CHECK=y
 # CONFIG_MAGIC_SYSRQ is not set
 # CONFIG_UNUSED_SYMBOLS is not set
 # CONFIG_DEBUG_FS is not set
 # CONFIG_HEADERS_CHECK is not set
 CONFIG_DEBUG_KERNEL=y
-CONFIG_LOG_BUF_SHIFT=16
+# CONFIG_DEBUG_SHIRQ is not set
+CONFIG_LOG_BUF_SHIFT=14
 CONFIG_DETECT_SOFTLOCKUP=y
 # CONFIG_SCHEDSTATS is not set
+# CONFIG_TIMER_STATS is not set
 # CONFIG_DEBUG_SLAB is not set
+CONFIG_DEBUG_PREEMPT=y
 CONFIG_DEBUG_RT_MUTEXES=y
 CONFIG_DEBUG_PI_LIST=y
 # CONFIG_RT_MUTEX_TESTER is not set
 CONFIG_DEBUG_SPINLOCK=y
 CONFIG_DEBUG_MUTEXES=y
-CONFIG_DEBUG_RWSEMS=y
 CONFIG_DEBUG_SPINLOCK_SLEEP=y
 # CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set
 # CONFIG_DEBUG_KOBJECT is not set
@@ -1232,6 +1223,7 @@ CONFIG_DEBUG_BUGVERBOSE=y
 CONFIG_FRAME_POINTER=y
 CONFIG_FORCED_INLINING=y
 # CONFIG_RCU_TORTURE_TEST is not set
+# CONFIG_FAULT_INJECTION is not set
 # CONFIG_DEBUG_USER is not set
 CONFIG_DEBUG_ERRORS=y
 # CONFIG_DEBUG_LL is not set
@@ -1251,10 +1243,11 @@ CONFIG_DEBUG_ERRORS=y
 # Library routines
 #
 CONFIG_BITREVERSE=y
-CONFIG_CRC_CCITT=y
+CONFIG_CRC_CCITT=m
 CONFIG_CRC16=m
 CONFIG_CRC32=y
 CONFIG_LIBCRC32C=m
 CONFIG_ZLIB_INFLATE=y
 CONFIG_PLIST=y
-CONFIG_IOMAP_COPY=y
+CONFIG_HAS_IOMEM=y
+CONFIG_HAS_IOPORT=y
diff --git a/packages/linux/linux-ezx-2.6.21/mux-linux-2.6.20.7-fix.patch b/packages/linux/linux-ezx-2.6.21/mux-linux-2.6.21-fix.patch
index cab7490118..79f48ae581 100644
--- a/packages/linux/linux-ezx-2.6.21/mux-linux-2.6.20.7-fix.patch
+++ b/packages/linux/linux-ezx-2.6.21/mux-linux-2.6.21-fix.patch
@@ -1,48 +1,52 @@
-Index: linux-2.6.20.7/drivers/char/ts0710.h
+Index: linux-2.6.21/drivers/char/ts0710.h
 ===================================================================
---- linux-2.6.20.7.orig/drivers/char/ts0710.h	2007-04-24 16:04:23.000000000 +0200
-+++ linux-2.6.20.7/drivers/char/ts0710.h	2007-04-24 16:04:23.000000000 +0200
-@@ -45,7 +45,7 @@
+--- linux-2.6.21.orig/drivers/char/ts0710.h	2007-04-27 20:35:44.000000000 -0300
++++ linux-2.6.21/drivers/char/ts0710.h	2007-04-27 20:36:03.000000000 -0300
+@@ -45,7 +45,6 @@
   *  11/18/2002  Modified
   */
  
 -#include <linux/config.h>
-+//#include <linux/config.h>
  #include <linux/module.h>
  
  #include <linux/errno.h>
-@@ -58,7 +58,7 @@
+@@ -58,7 +57,6 @@
  #include <linux/major.h>
  #include <linux/mm.h>
  #include <linux/init.h>
 -#include <linux/devfs_fs_kernel.h>
-+//#include <linux/devfs_fs_kernel.h>
  
  #include <asm/uaccess.h>
  #include <asm/system.h>
-Index: linux-2.6.20.7/drivers/char/ts0710_mux.c
+Index: linux-2.6.21/drivers/char/ts0710_mux.c
 ===================================================================
---- linux-2.6.20.7.orig/drivers/char/ts0710_mux.c	2007-04-24 16:04:23.000000000 +0200
-+++ linux-2.6.20.7/drivers/char/ts0710_mux.c	2007-04-24 16:26:58.000000000 +0200
-@@ -46,7 +46,7 @@
+--- linux-2.6.21.orig/drivers/char/ts0710_mux.c	2007-04-27 20:35:44.000000000 -0300
++++ linux-2.6.21/drivers/char/ts0710_mux.c	2007-04-27 20:36:03.000000000 -0300
+@@ -46,7 +46,6 @@
   *  11/18/2002  Second version
   *  04/21/2004  Add GPRS PROC
   */
 -#include <linux/config.h>
-+//#include <linux/config.h>
  #include <linux/module.h>
  #include <linux/types.h>
  
-@@ -70,7 +70,7 @@
+@@ -70,15 +69,12 @@
  #include <linux/mm.h>
  #include <linux/slab.h>
  #include <linux/init.h>
 -#include <linux/devfs_fs_kernel.h>
-+//#include <linux/devfs_fs_kernel.h>
- //#include <syslog.h>
+-//#include <syslog.h>
  
  #include <asm/uaccess.h>
-@@ -268,8 +268,8 @@
+ #include <asm/system.h>
+ #include <asm/bitops.h>
+ 
+ #ifdef USB_FOR_MUX
+-//#include <linux/usb.h>
+ #include "ts0710_mux_usb.h"
+ #endif
+ 
+@@ -268,8 +264,8 @@
  static struct work_struct post_recv_tqueue;
  
  static struct tty_struct *mux_table[NR_MUXS];
@@ -53,66 +57,109 @@ Index: linux-2.6.20.7/drivers/char/ts0710_mux.c
  static volatile short int mux_tty[NR_MUXS];
  
  #ifdef min
-@@ -1894,11 +1894,14 @@
+@@ -1894,11 +1890,7 @@
  				if (test_bit(TTY_THROTTLED, &tty->flags)) {
  					queue_data = 1;
  				} else {
-+					/*
- 					if (test_bit
- 					    (TTY_DONT_FLIP, &tty->flags)) {
- 						queue_data = 1;
- 						post_recv = 1;
+-					if (test_bit
+-					    (TTY_DONT_FLIP, &tty->flags)) {
+-						queue_data = 1;
+-						post_recv = 1;
 -					} else if (recv_info->total) {
-+					} else 
-+					*/
 +					if (recv_info->total) {
  						queue_data = 1;
  						post_recv = 1;
  					} else if (recv_room < uih_len) {
-@@ -3149,7 +3152,7 @@
+@@ -3149,10 +3141,10 @@
  
  /*For BP UART problem End*/
  
 -static void receive_worker(void *private_)
-+static void receive_worker(struct work_struct *private_)
++static void receive_worker(struct work_struct *work)
  {
  	struct tty_struct *tty = COMM_FOR_MUX_TTY;
- 	int i, count, tbuf_free, tbuf_read;
-@@ -3440,7 +3443,7 @@
+-	int i, count, tbuf_free, tbuf_read;
++	int count, tbuf_free, tbuf_read;
+ 	static unsigned char tbuf[TS0710MUX_MAX_BUF_SIZE];
+ 	static unsigned char *tbuf_ptr = &tbuf[0];
+ 	static unsigned char *start_flag = 0;
+@@ -3168,7 +3160,7 @@
+ 	__u32 uih_len;
+ 	/*For BP UART problem End */
+ 
+-	UNUSED_PARAM(private_);
++	UNUSED_PARAM(work);
+ 
+   	if (!tty)
+   		return;
+@@ -3440,7 +3432,7 @@
  	clear_bit(RECV_RUNNING, &mux_recv_flags);
  }
  
 -static void post_recv_worker(void *private_)
-+static void post_recv_worker(struct work_struct *private_)
++static void post_recv_worker(struct work_struct *work)
  {
  	ts0710_con *ts0710 = &ts0710_connection;
  	int tty_idx;
-@@ -3499,11 +3502,14 @@
+@@ -3453,7 +3445,7 @@
+ 	mux_recv_packet *recv_packet, *recv_packet2;
+ 	__u8 j;
+ 
+-	UNUSED_PARAM(private_);
++	UNUSED_PARAM(work);
+ 
+ 	if (test_and_set_bit(RECV_RUNNING, &mux_recv_flags)) {
+ 		schedule_work(&post_recv_tqueue);
+@@ -3499,10 +3491,6 @@
  		if (test_bit(TTY_THROTTLED, &tty->flags)) {
  			add_post_recv_queue(&post_recv_q, recv_info);
  			continue;
 -		} else if (test_bit(TTY_DONT_FLIP, &tty->flags)) {
-+		}
-+		/*
-+		else if (test_bit(TTY_DONT_FLIP, &tty->flags)) {
- 			post_recv = 1;
- 			add_post_recv_queue(&post_recv_q, recv_info);
- 			continue;
+-			post_recv = 1;
+-			add_post_recv_queue(&post_recv_q, recv_info);
+-			continue;
  		}
-+		*/
  
  		flow_control = 0;
- 		recv_packet2 = recv_info->mux_packet;
-@@ -3635,7 +3641,7 @@
+@@ -3635,7 +3623,7 @@
  	}
  }
  
 -static void send_worker(void *private_)
-+static void send_worker(struct work_struct *private_)
++static void send_worker(struct work_struct *work)
  {
  	ts0710_con *ts0710 = &ts0710_connection;
  	__u8 j;
-@@ -3893,9 +3899,9 @@
+@@ -3644,7 +3632,7 @@
+ 	struct tty_struct *tty;
+ 	__u8 dlci;
+ 
+-	UNUSED_PARAM(private_);
++	UNUSED_PARAM(work);
+ 
+ 	TS0710_DEBUG("Enter into send_worker");
+ 
+@@ -3819,7 +3807,8 @@
+ 	gprsData[TS0710MUX_GPRS_SESSION_MAX - 1].sentBytes =
+ 	    get_count(TS0710MUX_GPRS2_SEND_COUNT_IDX);
+ 
+-	copy_to_user(buf, gprsData, bufLen);
++	if(copy_to_user(buf, gprsData, bufLen))
++		return -EFAULT;
+ 
+ 	return bufLen;
+ }
+@@ -3836,7 +3825,8 @@
+ 
+ 	memset(gprsData, 0, bufLen);
+ 
+-	copy_from_user(gprsData, buf, bufLen);
++	if(copy_from_user(gprsData, buf, bufLen))
++		return -EFAULT;
+ 
+ 	set_count(TS0710MUX_GPRS1_RECV_COUNT_IDX, gprsData[0].recvBytes);
+ 	set_count(TS0710MUX_GPRS1_SEND_COUNT_IDX, gprsData[0].sentBytes);
+@@ -3893,9 +3883,9 @@
  	}
  	post_recv_count_flag = 0;
  
@@ -125,12 +172,11 @@ Index: linux-2.6.20.7/drivers/char/ts0710_mux.c
  
  	mux_driver = alloc_tty_driver(NR_MUXS);
  	if (!mux_driver)
-@@ -3904,12 +3910,12 @@
+@@ -3904,12 +3894,11 @@
  	mux_driver->owner = THIS_MODULE;
  	mux_driver->driver_name = "ts0710mux";
  	mux_driver->name = "mux";
 -	mux_driver->devfs_name = "mux";
-+	//mux_driver->devfs_name = "mux";
  	mux_driver->major = TS0710MUX_MAJOR;
  	mux_driver->minor_start = TS0710MUX_MINOR_START;
  	mux_driver->type = TTY_DRIVER_TYPE_SERIAL;
@@ -140,7 +186,7 @@ Index: linux-2.6.20.7/drivers/char/ts0710_mux.c
  
  	mux_driver->init_termios = tty_std_termios;
  	mux_driver->init_termios.c_iflag = 0;
-@@ -3917,10 +3923,10 @@
+@@ -3917,10 +3906,10 @@
  	mux_driver->init_termios.c_cflag = B38400 | CS8 | CREAD;
  	mux_driver->init_termios.c_lflag = 0;
  
@@ -153,39 +199,40 @@ Index: linux-2.6.20.7/drivers/char/ts0710_mux.c
  	mux_driver->other = NULL;
  
  	mux_driver->open = mux_open;
-Index: linux-2.6.20.7/drivers/char/ts0710_mux_usb.c
+Index: linux-2.6.21/drivers/char/ts0710_mux_usb.c
 ===================================================================
---- linux-2.6.20.7.orig/drivers/char/ts0710_mux_usb.c	2007-04-24 16:27:30.000000000 +0200
-+++ linux-2.6.20.7/drivers/char/ts0710_mux_usb.c	2007-04-24 16:31:51.000000000 +0200
-@@ -86,8 +86,8 @@
- struct tty_struct *usb_for_mux_tty = NULL;
- void (*usb_mux_dispatcher)(struct tty_struct *tty) = NULL;
- void (*usb_mux_sender)(void) = NULL;
--void (*ipcusb_ap_to_bp)(unsigned char*, int) = NULL;
--void (*ipcusb_bp_to_ap)(unsigned char*, int) = NULL;
-+void (*ipcusb_ap_to_bp)(const unsigned char*, int) = NULL;
-+void (*ipcusb_bp_to_ap)(const unsigned char*, int) = NULL;
- EXPORT_SYMBOL(usb_for_mux_driver);
- EXPORT_SYMBOL(usb_for_mux_tty);
- EXPORT_SYMBOL(usb_mux_dispatcher);
-@@ -222,7 +222,7 @@
+--- linux-2.6.21.orig/drivers/char/ts0710_mux_usb.c	2007-04-27 20:35:44.000000000 -0300
++++ linux-2.6.21/drivers/char/ts0710_mux_usb.c	2007-04-27 22:28:55.000000000 -0300
+@@ -188,7 +188,8 @@
+ 	buf_list_t *inbuf;
+ 	int count = urb->actual_length;
+ 
+-	inbuf = kmalloc(sizeof(buf_list_t), GFP_KERNEL);
++	// we are called from interrupt context.
++	inbuf = kmalloc(sizeof(buf_list_t), GFP_ATOMIC);
+ 	if (!inbuf) {
+ 		printk("append_to_inbuf_list: (%d) out of memory!\n",
+ 			sizeof(buf_list_t));
+@@ -222,7 +223,7 @@
  		inbuf = list_entry(ptr, buf_list_t, list);
  		src_count = inbuf->size;
  		if (dst_count >= src_count) {
 -			memcpy(buf, inbuf->body, src_count);
-+			memcpy((char *)buf, inbuf->body, src_count);
++			memcpy((unsigned char *)buf, inbuf->body, src_count);
  			ret = src_count;
  			list_del(ptr);
  			kfree(inbuf->body);
-@@ -282,7 +282,7 @@
+@@ -282,9 +283,8 @@
  	spin_unlock(&bvd_ipc->in_buf_lock);
  }
  
 -static void usb_ipc_read_bulk(struct urb *urb, struct pt_regs *regs)
 +static void usb_ipc_read_bulk(struct urb *urb)
  {
- 	buf_list_t *inbuf;
+-	buf_list_t *inbuf;
  	int count = urb->actual_length;
+ 	struct tty_struct *tty = &ipcusb_tty;
+ 
 @@ -319,7 +319,7 @@
  	bvd_dbg("usb_ipc_read_bulk: completed!!!");
  }
@@ -200,7 +247,7 @@ Index: linux-2.6.20.7/drivers/char/ts0710_mux_usb.c
  			bvd_ipc->readurb_mux.actual_length = 0;
  			bvd_ipc->readurb_mux.dev = bvd_ipc->ipc_dev;
 -			if (ret = usb_submit_urb(&bvd_ipc->readurb_mux, GFP_ATOMIC))
-+			if ( (ret = usb_submit_urb(&bvd_ipc->readurb_mux, GFP_ATOMIC)) )
++			if ((ret = usb_submit_urb(&bvd_ipc->readurb_mux, GFP_ATOMIC)))
  				printk("ipcusb_xmit_data: usb_submit_urb(read mux bulk)"
  					"failed! status=%d\n", ret);
  			bvd_dbg("ipcusb_xmit_data: Send a IN token successfully!");
@@ -209,16 +256,33 @@ Index: linux-2.6.20.7/drivers/char/ts0710_mux_usb.c
  		//printk("%s: clear write_finished_flag:%d\n", __FUNCTION__, bvd_ipc->write_finished_flag);
  		bvd_ipc->writeurb_mux.dev = bvd_ipc->ipc_dev;
 -		if (result = usb_submit_urb(&bvd_ipc->writeurb_mux, GFP_ATOMIC))
-+		if ( (result = usb_submit_urb(&bvd_ipc->writeurb_mux, GFP_ATOMIC)) )
++		if ((result = usb_submit_urb(&bvd_ipc->writeurb_mux, GFP_ATOMIC)))
  			warn("ipcusb_xmit_data: funky result! result=%d\n", result);
  
  		bvd_dbg("ipcusb_xmit_data: usb_submit_urb finished! result:%d", result);
-@@ -556,7 +556,7 @@
- 	struct usb_config_descriptor *ipccfg;
- 	struct usb_interface_descriptor *interface;
- 	struct usb_endpoint_descriptor *endpoint;
--	int ep_cnt, readsize, writesize;
-+	int ep_cnt, readsize=0, writesize=0;
- 	char have_bulk_in_mux, have_bulk_out_mux;
- 
- 	bvd_dbg("usb_ipc_probe: vendor id 0x%x, device id 0x%x",
+@@ -498,7 +498,7 @@
+ 		return 0;
+ 
+ 	if (*ipcusb_ap_to_bp != NULL)
+-		(*ipcusb_ap_to_bp)(buf, count);
++		(*ipcusb_ap_to_bp)((unsigned char *)buf, count);
+ 
+ 	bvd_ipc->suspend_flag = 1;
+ 
+@@ -602,6 +602,7 @@
+ 	}
+ 
+ 	ep_cnt = have_bulk_in_mux = have_bulk_out_mux = 0;
++	readsize = writesize = 0;
+ 
+ 	while (ep_cnt < interface->bNumEndpoints) {
+ 		endpoint = &intf->cur_altsetting->endpoint[ep_cnt].desc;
+@@ -792,6 +793,8 @@
+ 	bvd_ipc->ipc_dev = NULL;
+ 	bvd_ipc->xmit.head = bvd_ipc->xmit.tail = 0;
+ 	bvd_ipc->write_flag = IPC_USB_WRITE_INIT;
++	spin_lock_init(&bvd_ipc->lock);
++	spin_lock_init(&bvd_ipc->in_buf_lock);
+ 
+ 	ipcusb_tty_driver.write = usb_ipc_write;
+ 	ipcusb_tty_driver.chars_in_buffer = usb_ipc_chars_in_buffer;
diff --git a/packages/linux/linux-ezx_2.6.21.bb b/packages/linux/linux-ezx_2.6.21.bb
index bfe4655f09..2b233e0c2e 100644
--- a/packages/linux/linux-ezx_2.6.21.bb
+++ b/packages/linux/linux-ezx_2.6.21.bb
@@ -5,7 +5,7 @@ HOMEPAGE = "http://www.openezx.org"
 LICENSE = "GPL"
 DEPENDS += "quilt-native"
 EZX = "ezx0"
-PR = "${EZX}-r0"
+PR = "${EZX}-r1"
 
 DEFAULT_PREFERENCE = "-1"
 
@@ -35,7 +35,7 @@ SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/linux-${PV}.tar.bz2 \
 	file://mux-remove-usbh_finished_resume.patch;patch=1 \
 	file://mux-fix-makefile.patch;patch=1 \
 	file://mux-fix-tty-driver.patch;patch=1 \
-	file://mux-linux-2.6.20.7-fix.patch;patch=1 \
+	file://mux-linux-2.6.21-fix.patch;patch=1 \
 	file://mux-ifdef-ezx-features.patch;patch=1 \
 	file://mux_debug.patch;patch=1 \