Commit 4567c4a8 authored by Russell King's avatar Russell King
Browse files

Merge branch 'devel' of... 

Merge branch 'devel' of git://git.kernel.org/pub/scm/linux/kernel/git/ycmiao/pxa-linux-2.6 into devel-stable
parents 602fd7c3 19d6c13b

MAINTAINERS

+13 −0
Original line number Diff line number Diff line
@@ -707,6 +707,19 @@ L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers) 
S:	Maintained

F:	arch/arm/mach-ixp4xx/



ARM/INTEL RESEARCH IMOTE 2 MACHINE SUPPORT

M:	Jonathan Cameron <jic23@cam.ac.uk>

L:	linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)

S:	Maintained

F:	arch/arm/mach-pxa/imote2.c



ARM/INTEL RESEARCH STARGATE 2 MACHINE SUPPORT

M:	Jonathan Cameron <jic23@cam.ac.uk>

L:	linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)

S:	Maintained

F:	arch/arm/mach-pxa/stargate2.c

F:	drivers/pcmcia/pxa2xx_stargate2.c



ARM/INTEL XSC3 (MANZANO) ARM CORE

M:	Lennert Buytenhek <kernel@wantstofly.org>

M:	Dan Williams <dan.j.williams@intel.com>

arch/arm/configs/cm_x300_defconfig

+240 −111
Original line number Diff line number Diff line 
#

# Automatically generated make config: don't edit

# Linux kernel version: 2.6.30-rc8

# Thu Jun  4 09:53:21 2009

# Linux kernel version: 2.6.32-rc4

# Tue Oct 13 19:03:13 2009

#

CONFIG_ARM=y

CONFIG_SYS_SUPPORTS_APM_EMULATION=y

CONFIG_GENERIC_GPIO=y

CONFIG_GENERIC_TIME=y

CONFIG_GENERIC_CLOCKEVENTS=y

CONFIG_MMU=y

# CONFIG_NO_IOPORT is not set

CONFIG_GENERIC_HARDIRQS=y

CONFIG_STACKTRACE_SUPPORT=y

CONFIG_HAVE_LATENCYTOP_SUPPORT=y
@@ -18,14 +16,14 @@ CONFIG_TRACE_IRQFLAGS_SUPPORT=y 
CONFIG_HARDIRQS_SW_RESEND=y

CONFIG_GENERIC_IRQ_PROBE=y

CONFIG_RWSEM_GENERIC_SPINLOCK=y

# CONFIG_ARCH_HAS_ILOG2_U32 is not set

# CONFIG_ARCH_HAS_ILOG2_U64 is not set

CONFIG_ARCH_HAS_CPUFREQ=y

CONFIG_GENERIC_HWEIGHT=y

CONFIG_GENERIC_CALIBRATE_DELAY=y

CONFIG_ARCH_MTD_XIP=y

CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y

CONFIG_VECTORS_BASE=0xffff0000

CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"

CONFIG_CONSTRUCTORS=y



#

# General setup
@@ -46,11 +44,12 @@ CONFIG_SYSVIPC_SYSCTL=y 
#

# RCU Subsystem

#

CONFIG_CLASSIC_RCU=y

# CONFIG_TREE_RCU is not set

# CONFIG_PREEMPT_RCU is not set

CONFIG_TREE_RCU=y

# CONFIG_TREE_PREEMPT_RCU is not set

# CONFIG_RCU_TRACE is not set

CONFIG_RCU_FANOUT=32

# CONFIG_RCU_FANOUT_EXACT is not set

# CONFIG_TREE_RCU_TRACE is not set

# CONFIG_PREEMPT_RCU_TRACE is not set

CONFIG_IKCONFIG=y

CONFIG_IKCONFIG_PROC=y

CONFIG_LOG_BUF_SHIFT=18
@@ -83,7 +82,6 @@ CONFIG_SYSCTL_SYSCALL=y 
CONFIG_KALLSYMS=y

# CONFIG_KALLSYMS_ALL is not set

# CONFIG_KALLSYMS_EXTRA_PASS is not set

# CONFIG_STRIP_ASM_SYMS is not set

CONFIG_HOTPLUG=y

CONFIG_PRINTK=y

CONFIG_BUG=y
@@ -96,6 +94,10 @@ CONFIG_TIMERFD=y 
CONFIG_EVENTFD=y

CONFIG_SHMEM=y

CONFIG_AIO=y



#

# Kernel Performance Events And Counters

#

CONFIG_VM_EVENT_COUNTERS=y

CONFIG_SLUB_DEBUG=y

CONFIG_COMPAT_BRK=y
@@ -103,13 +105,17 @@ CONFIG_COMPAT_BRK=y 
CONFIG_SLUB=y

# CONFIG_SLOB is not set

# CONFIG_PROFILING is not set

# CONFIG_MARKERS is not set

CONFIG_HAVE_OPROFILE=y

# CONFIG_KPROBES is not set

CONFIG_HAVE_KPROBES=y

CONFIG_HAVE_KRETPROBES=y

CONFIG_HAVE_CLK=y

# CONFIG_SLOW_WORK is not set



#

# GCOV-based kernel profiling

#

# CONFIG_GCOV_KERNEL is not set

CONFIG_SLOW_WORK=y

CONFIG_HAVE_GENERIC_DMA_COHERENT=y

CONFIG_SLABINFO=y

CONFIG_RT_MUTEXES=y
@@ -117,11 +123,11 @@ CONFIG_BASE_SMALL=0 
CONFIG_MODULES=y

# CONFIG_MODULE_FORCE_LOAD is not set

CONFIG_MODULE_UNLOAD=y

# CONFIG_MODULE_FORCE_UNLOAD is not set

CONFIG_MODULE_FORCE_UNLOAD=y

# CONFIG_MODVERSIONS is not set

# CONFIG_MODULE_SRCVERSION_ALL is not set

CONFIG_BLOCK=y

# CONFIG_LBD is not set

CONFIG_LBDAF=y

# CONFIG_BLK_DEV_BSG is not set

# CONFIG_BLK_DEV_INTEGRITY is not set
@@ -142,19 +148,22 @@ CONFIG_FREEZER=y 
#

# System Type

#

CONFIG_MMU=y

# CONFIG_ARCH_AAEC2000 is not set

# CONFIG_ARCH_INTEGRATOR is not set

# CONFIG_ARCH_REALVIEW is not set

# CONFIG_ARCH_VERSATILE is not set

# CONFIG_ARCH_AT91 is not set

# CONFIG_ARCH_CLPS711X is not set

# CONFIG_ARCH_GEMINI is not set

# CONFIG_ARCH_EBSA110 is not set

# CONFIG_ARCH_EP93XX is not set

# CONFIG_ARCH_GEMINI is not set

# CONFIG_ARCH_FOOTBRIDGE is not set

# CONFIG_ARCH_MXC is not set

# CONFIG_ARCH_STMP3XXX is not set

# CONFIG_ARCH_NETX is not set

# CONFIG_ARCH_H720X is not set

# CONFIG_ARCH_IMX is not set

# CONFIG_ARCH_NOMADIK is not set

# CONFIG_ARCH_IOP13XX is not set

# CONFIG_ARCH_IOP32X is not set

# CONFIG_ARCH_IOP33X is not set
@@ -163,25 +172,27 @@ CONFIG_FREEZER=y 
# CONFIG_ARCH_IXP4XX is not set

# CONFIG_ARCH_L7200 is not set

# CONFIG_ARCH_KIRKWOOD is not set

# CONFIG_ARCH_KS8695 is not set

# CONFIG_ARCH_NS9XXX is not set

# CONFIG_ARCH_LOKI is not set

# CONFIG_ARCH_MV78XX0 is not set

# CONFIG_ARCH_MXC is not set

# CONFIG_ARCH_ORION5X is not set

# CONFIG_ARCH_MMP is not set

# CONFIG_ARCH_KS8695 is not set

# CONFIG_ARCH_NS9XXX is not set

# CONFIG_ARCH_W90X900 is not set

# CONFIG_ARCH_PNX4008 is not set

CONFIG_ARCH_PXA=y

# CONFIG_ARCH_MMP is not set

# CONFIG_ARCH_MSM is not set

# CONFIG_ARCH_RPC is not set

# CONFIG_ARCH_SA1100 is not set

# CONFIG_ARCH_S3C2410 is not set

# CONFIG_ARCH_S3C64XX is not set

# CONFIG_ARCH_S5PC1XX is not set

# CONFIG_ARCH_SHARK is not set

# CONFIG_ARCH_LH7A40X is not set

# CONFIG_ARCH_U300 is not set

# CONFIG_ARCH_DAVINCI is not set

# CONFIG_ARCH_OMAP is not set

# CONFIG_ARCH_MSM is not set

# CONFIG_ARCH_W90X900 is not set

# CONFIG_ARCH_BCMRING is not set



#

# Intel PXA2xx/PXA3xx Implementations
@@ -191,16 +202,19 @@ CONFIG_ARCH_PXA=y 
# Supported PXA3xx Processor Variants

#

CONFIG_CPU_PXA300=y

# CONFIG_CPU_PXA310 is not set

CONFIG_CPU_PXA310=y

# CONFIG_CPU_PXA320 is not set

# CONFIG_CPU_PXA930 is not set

# CONFIG_CPU_PXA935 is not set

# CONFIG_CPU_PXA950 is not set

# CONFIG_ARCH_GUMSTIX is not set

# CONFIG_MACH_INTELMOTE2 is not set

# CONFIG_MACH_STARGATE2 is not set

# CONFIG_ARCH_LUBBOCK is not set

# CONFIG_MACH_LOGICPD_PXA270 is not set

# CONFIG_MACH_MAINSTONE is not set

# CONFIG_MACH_MP900C is not set

# CONFIG_MACH_BALLOON3 is not set

# CONFIG_ARCH_PXA_IDP is not set

# CONFIG_PXA_SHARPSL is not set

# CONFIG_ARCH_VIPER is not set
@@ -218,6 +232,7 @@ CONFIG_CPU_PXA300=y 
# CONFIG_MACH_SAAR is not set

# CONFIG_MACH_ARMCORE is not set

CONFIG_MACH_CM_X300=y

# CONFIG_MACH_H4700 is not set

# CONFIG_MACH_MAGICIAN is not set

# CONFIG_MACH_HIMALAYA is not set

# CONFIG_MACH_MIOA701 is not set
@@ -225,8 +240,8 @@ CONFIG_MACH_CM_X300=y 
# CONFIG_ARCH_PXA_PALM is not set

# CONFIG_MACH_CSB726 is not set

# CONFIG_PXA_EZX is not set

# CONFIG_MACH_XCEP is not set

CONFIG_PXA3xx=y

# CONFIG_PXA_PWM is not set

CONFIG_PLAT_PXA=y



#
@@ -236,7 +251,7 @@ CONFIG_CPU_32=y 
CONFIG_CPU_XSC3=y

CONFIG_CPU_32v5=y

CONFIG_CPU_ABRT_EV5T=y

CONFIG_CPU_PABRT_NOIFAR=y

CONFIG_CPU_PABRT_LEGACY=y

CONFIG_CPU_CACHE_VIVT=y

CONFIG_CPU_TLB_V4WBI=y

CONFIG_CPU_CP15=y
@@ -246,11 +261,12 @@ CONFIG_IO_36=y 
#

# Processor Features

#

# CONFIG_ARM_THUMB is not set

CONFIG_ARM_THUMB=y

# CONFIG_CPU_DCACHE_DISABLE is not set

# CONFIG_CPU_BPREDICT_DISABLE is not set

CONFIG_OUTER_CACHE=y

CONFIG_CACHE_XSC3L2=y

CONFIG_ARM_L1_CACHE_SHIFT=5

CONFIG_IWMMXT=y

CONFIG_COMMON_CLKDEV=y
@@ -272,11 +288,12 @@ CONFIG_VMSPLIT_3G=y 
# CONFIG_VMSPLIT_2G is not set

# CONFIG_VMSPLIT_1G is not set

CONFIG_PAGE_OFFSET=0xC0000000

CONFIG_PREEMPT_NONE=y

# CONFIG_PREEMPT_VOLUNTARY is not set

# CONFIG_PREEMPT is not set

CONFIG_HZ=100

CONFIG_AEABI=y

CONFIG_OABI_COMPAT=y

# CONFIG_ARCH_HAS_HOLES_MEMORYMODEL is not set

# CONFIG_ARCH_SPARSEMEM_DEFAULT is not set

# CONFIG_ARCH_SELECT_MEMORY_MODEL is not set

CONFIG_HIGHMEM=y
@@ -292,17 +309,19 @@ CONFIG_SPLIT_PTLOCK_CPUS=4096 
CONFIG_ZONE_DMA_FLAG=0

CONFIG_BOUNCE=y

CONFIG_VIRT_TO_BUS=y

CONFIG_UNEVICTABLE_LRU=y

CONFIG_HAVE_MLOCK=y

CONFIG_HAVE_MLOCKED_PAGE_BIT=y

# CONFIG_KSM is not set

CONFIG_DEFAULT_MMAP_MIN_ADDR=4096

CONFIG_ALIGNMENT_TRAP=y

# CONFIG_UACCESS_WITH_MEMCPY is not set



#

# Boot options

#

CONFIG_ZBOOT_ROM_TEXT=0x0

CONFIG_ZBOOT_ROM_BSS=0x0

CONFIG_CMDLINE="root=/dev/mtdblock5 rootfstype=jffs2 console=ttyS2,38400"

CONFIG_CMDLINE="root=/dev/mtdblock5 rootfstype=ubifs console=ttyS2,38400"

# CONFIG_XIP_KERNEL is not set

# CONFIG_KEXEC is not set
@@ -355,6 +374,7 @@ CONFIG_PM_SLEEP=y 
CONFIG_SUSPEND=y

CONFIG_SUSPEND_FREEZER=y

CONFIG_APM_EMULATION=y

# CONFIG_PM_RUNTIME is not set

CONFIG_ARCH_SUSPEND_POSSIBLE=y

CONFIG_NET=y
@@ -396,6 +416,7 @@ CONFIG_DEFAULT_TCP_CONG="cubic" 
# CONFIG_NETFILTER is not set

# CONFIG_IP_DCCP is not set

# CONFIG_IP_SCTP is not set

# CONFIG_RDS is not set

# CONFIG_TIPC is not set

# CONFIG_ATM is not set

# CONFIG_BRIDGE is not set
@@ -410,6 +431,7 @@ CONFIG_DEFAULT_TCP_CONG="cubic" 
# CONFIG_ECONET is not set

# CONFIG_WAN_ROUTER is not set

# CONFIG_PHONET is not set

# CONFIG_IEEE802154 is not set

# CONFIG_NET_SCHED is not set

# CONFIG_DCB is not set
@@ -433,22 +455,27 @@ CONFIG_BT_HIDP=m 
#

# Bluetooth device drivers

#

# CONFIG_BT_HCIBTUSB is not set

CONFIG_BT_HCIBTUSB=m

# CONFIG_BT_HCIBTSDIO is not set

# CONFIG_BT_HCIUART is not set

# CONFIG_BT_HCIBCM203X is not set

# CONFIG_BT_HCIBPA10X is not set

# CONFIG_BT_HCIBFUSB is not set

# CONFIG_BT_HCIVHCI is not set

# CONFIG_BT_MRVL is not set

# CONFIG_AF_RXRPC is not set

CONFIG_WIRELESS=y

# CONFIG_CFG80211 is not set

CONFIG_CFG80211_DEFAULT_PS_VALUE=0

# CONFIG_WIRELESS_OLD_REGULATORY is not set

CONFIG_WIRELESS_EXT=y

CONFIG_WIRELESS_EXT_SYSFS=y

CONFIG_LIB80211=m

# CONFIG_LIB80211_DEBUG is not set

# CONFIG_MAC80211 is not set



#

# CFG80211 needs to be enabled for MAC80211

#

# CONFIG_WIMAX is not set

# CONFIG_RFKILL is not set

# CONFIG_NET_9P is not set
@@ -461,6 +488,7 @@ CONFIG_LIB80211=m 
# Generic Driver Options

#

CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"

# CONFIG_DEVTMPFS is not set

CONFIG_STANDALONE=y

CONFIG_PREVENT_FIRMWARE_BUILD=y

CONFIG_FW_LOADER=y
@@ -472,9 +500,9 @@ CONFIG_EXTRA_FIRMWARE="" 
# CONFIG_CONNECTOR is not set

CONFIG_MTD=y

# CONFIG_MTD_DEBUG is not set

# CONFIG_MTD_TESTS is not set

# CONFIG_MTD_CONCAT is not set

CONFIG_MTD_PARTITIONS=y

# CONFIG_MTD_TESTS is not set

# CONFIG_MTD_REDBOOT_PARTS is not set

# CONFIG_MTD_CMDLINE_PARTS is not set

# CONFIG_MTD_AFS_PARTS is not set
@@ -521,6 +549,9 @@ CONFIG_MTD_CFI_I2=y 
#

# Self-contained MTD device drivers

#

# CONFIG_MTD_DATAFLASH is not set

# CONFIG_MTD_M25P80 is not set

# CONFIG_MTD_SST25L is not set

# CONFIG_MTD_SLRAM is not set

# CONFIG_MTD_PHRAM is not set

# CONFIG_MTD_MTDRAM is not set
@@ -556,7 +587,15 @@ CONFIG_MTD_NAND_PXA3xx=y 
#

# UBI - Unsorted block images

#

# CONFIG_MTD_UBI is not set

CONFIG_MTD_UBI=y

CONFIG_MTD_UBI_WL_THRESHOLD=4096

CONFIG_MTD_UBI_BEB_RESERVE=1

# CONFIG_MTD_UBI_GLUEBI is not set



#

# UBI debugging options

#

# CONFIG_MTD_UBI_DEBUG is not set

# CONFIG_PARPORT is not set

CONFIG_BLK_DEV=y

# CONFIG_BLK_DEV_COW_COMMON is not set
@@ -570,6 +609,7 @@ CONFIG_BLK_DEV_RAM_SIZE=4096 
# CONFIG_BLK_DEV_XIP is not set

# CONFIG_CDROM_PKTCDVD is not set

# CONFIG_ATA_OVER_ETH is not set

# CONFIG_MG_DISK is not set

# CONFIG_MISC_DEVICES is not set

CONFIG_HAVE_IDE=y

# CONFIG_IDE is not set
@@ -593,10 +633,6 @@ CONFIG_BLK_DEV_SD=y 
# 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
@@ -621,7 +657,6 @@ CONFIG_SCSI_LOWLEVEL=y 
# CONFIG_ATA is not set

# CONFIG_MD is not set

CONFIG_NETDEVICES=y

CONFIG_COMPAT_NET_DEV_OPS=y

# CONFIG_DUMMY is not set

# CONFIG_BONDING is not set

# CONFIG_MACVLAN is not set
@@ -636,6 +671,7 @@ CONFIG_MII=y 
CONFIG_DM9000=y

CONFIG_DM9000_DEBUGLEVEL=0

CONFIG_DM9000_FORCE_SIMPLE_PHY_POLL=y

# CONFIG_ENC28J60 is not set

# CONFIG_ETHOC is not set

# CONFIG_SMC911X is not set

# CONFIG_SMSC911X is not set
@@ -648,20 +684,20 @@ CONFIG_DM9000_FORCE_SIMPLE_PHY_POLL=y 
# CONFIG_IBM_NEW_EMAC_MAL_CLR_ICINTSTAT is not set

# CONFIG_IBM_NEW_EMAC_MAL_COMMON_ERR is not set

# CONFIG_B44 is not set

# CONFIG_KS8842 is not set

# CONFIG_KS8851 is not set

# CONFIG_KS8851_MLL is not set

# CONFIG_NETDEV_1000 is not set

# CONFIG_NETDEV_10000 is not set



#

# Wireless LAN

#

CONFIG_WLAN=y

# CONFIG_WLAN_PRE80211 is not set

CONFIG_WLAN_80211=y

CONFIG_LIBERTAS=m

# CONFIG_LIBERTAS_USB is not set

CONFIG_LIBERTAS_SDIO=m

# CONFIG_LIBERTAS_SPI is not set

# CONFIG_LIBERTAS_DEBUG is not set

# CONFIG_USB_ZD1201 is not set

# CONFIG_USB_NET_RNDIS_WLAN is not set

# CONFIG_HOSTAP is not set



#
@@ -683,6 +719,7 @@ CONFIG_LIBERTAS_SDIO=m 
# CONFIG_NETPOLL is not set

# CONFIG_NET_POLL_CONTROLLER is not set

# CONFIG_ISDN is not set

# CONFIG_PHONE is not set



#

# Input device support
@@ -706,33 +743,51 @@ CONFIG_INPUT_EVDEV=y 
# Input Device Drivers

#

CONFIG_INPUT_KEYBOARD=y

# CONFIG_KEYBOARD_ADP5588 is not set

# CONFIG_KEYBOARD_ATKBD is not set

# CONFIG_KEYBOARD_SUNKBD is not set

# CONFIG_QT2160 is not set

# CONFIG_KEYBOARD_LKKBD is not set

# CONFIG_KEYBOARD_XTKBD is not set

# CONFIG_KEYBOARD_GPIO is not set

# CONFIG_KEYBOARD_MATRIX is not set

# CONFIG_KEYBOARD_LM8323 is not set

# CONFIG_KEYBOARD_MAX7359 is not set

# CONFIG_KEYBOARD_NEWTON is not set

# CONFIG_KEYBOARD_STOWAWAY is not set

# CONFIG_KEYBOARD_OPENCORES is not set

CONFIG_KEYBOARD_PXA27x=m

# CONFIG_KEYBOARD_GPIO is not set

# CONFIG_KEYBOARD_STOWAWAY is not set

# CONFIG_KEYBOARD_SUNKBD is not set

# CONFIG_KEYBOARD_XTKBD is not set

# CONFIG_INPUT_MOUSE is not set

# CONFIG_INPUT_JOYSTICK is not set

# CONFIG_INPUT_TABLET is not set

CONFIG_INPUT_TOUCHSCREEN=y

# CONFIG_TOUCHSCREEN_ADS7846 is not set

# CONFIG_TOUCHSCREEN_AD7877 is not set

# CONFIG_TOUCHSCREEN_AD7879_I2C is not set

# CONFIG_TOUCHSCREEN_AD7879_SPI is not set

# CONFIG_TOUCHSCREEN_AD7879 is not set

# CONFIG_TOUCHSCREEN_DA9034 is not set

# CONFIG_TOUCHSCREEN_EETI is not set

# CONFIG_TOUCHSCREEN_FUJITSU is not set

# CONFIG_TOUCHSCREEN_GUNZE is not set

# CONFIG_TOUCHSCREEN_ELO is not set

# CONFIG_TOUCHSCREEN_WACOM_W8001 is not set

# CONFIG_TOUCHSCREEN_MCS5000 is not set

# CONFIG_TOUCHSCREEN_MTOUCH is not set

# CONFIG_TOUCHSCREEN_INEXIO is not set

# CONFIG_TOUCHSCREEN_MK712 is not set

# CONFIG_TOUCHSCREEN_PENMOUNT is not set

# CONFIG_TOUCHSCREEN_TOUCHRIGHT is not set

# CONFIG_TOUCHSCREEN_TOUCHWIN is not set

CONFIG_TOUCHSCREEN_WM97XX=m

# CONFIG_TOUCHSCREEN_WM9705 is not set

CONFIG_TOUCHSCREEN_WM9712=y

# CONFIG_TOUCHSCREEN_WM9713 is not set

# CONFIG_TOUCHSCREEN_WM97XX_MAINSTONE is not set

# CONFIG_TOUCHSCREEN_USB_COMPOSITE is not set

# CONFIG_TOUCHSCREEN_TOUCHIT213 is not set

# CONFIG_TOUCHSCREEN_TSC2007 is not set

# CONFIG_TOUCHSCREEN_W90X900 is not set

# CONFIG_INPUT_MISC is not set



#
@@ -760,6 +815,7 @@ CONFIG_DEVKMEM=y 
#

# Non-8250 serial port support

#

# CONFIG_SERIAL_MAX3100 is not set

CONFIG_SERIAL_PXA=y

CONFIG_SERIAL_PXA_CONSOLE=y

CONFIG_SERIAL_CORE=y
@@ -774,6 +830,7 @@ CONFIG_UNIX98_PTYS=y 
# CONFIG_TCG_TPM is not set

CONFIG_I2C=y

CONFIG_I2C_BOARDINFO=y

CONFIG_I2C_COMPAT=y

# CONFIG_I2C_CHARDEV is not set

CONFIG_I2C_HELPER_AUTO=y
@@ -784,6 +841,7 @@ CONFIG_I2C_HELPER_AUTO=y 
#

# I2C system bus drivers (mostly embedded / system-on-chip)

#

# CONFIG_I2C_DESIGNWARE is not set

# CONFIG_I2C_GPIO is not set

# CONFIG_I2C_OCORES is not set

CONFIG_I2C_PXA=y
@@ -807,19 +865,36 @@ CONFIG_I2C_PXA=y 
# Miscellaneous I2C Chip support

#

# CONFIG_DS1682 is not set

# CONFIG_SENSORS_PCF8574 is not set

# CONFIG_PCF8575 is not set

# CONFIG_SENSORS_MAX6875 is not set

# CONFIG_SENSORS_TSL2550 is not set

# 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

# CONFIG_SPI is not set

CONFIG_SPI=y

# CONFIG_SPI_DEBUG is not set

CONFIG_SPI_MASTER=y



#

# SPI Master Controller Drivers

#

CONFIG_SPI_BITBANG=y

CONFIG_SPI_GPIO=y

# CONFIG_SPI_PXA2XX is not set



#

# SPI Protocol Masters

#

# CONFIG_SPI_SPIDEV is not set

# CONFIG_SPI_TLE62X0 is not set



#

# PPS support

#

# CONFIG_PPS is not set

CONFIG_ARCH_REQUIRE_GPIOLIB=y

CONFIG_GPIOLIB=y

# CONFIG_DEBUG_GPIO is not set

# CONFIG_GPIO_SYSFS is not set

CONFIG_GPIO_SYSFS=y



#

# Memory mapped GPIO expanders:
@@ -839,11 +914,17 @@ CONFIG_GPIO_PCA953X=y 
#

# SPI GPIO expanders:

#

# CONFIG_GPIO_MAX7301 is not set

# CONFIG_GPIO_MCP23S08 is not set

# CONFIG_GPIO_MC33880 is not set



#

# AC97 GPIO expanders:

#

# CONFIG_W1 is not set

# CONFIG_POWER_SUPPLY is not set

# CONFIG_HWMON is not set

# CONFIG_THERMAL is not set

# CONFIG_THERMAL_HWMON is not set

# CONFIG_WATCHDOG is not set

CONFIG_SSB_POSSIBLE=y
@@ -860,32 +941,33 @@ CONFIG_SSB_POSSIBLE=y 
# CONFIG_MFD_ASIC3 is not set

# CONFIG_HTC_EGPIO is not set

# CONFIG_HTC_PASIC3 is not set

# CONFIG_UCB1400_CORE is not set

# CONFIG_TPS65010 is not set

# CONFIG_TWL4030_CORE is not set

# CONFIG_MFD_TMIO is not set

# CONFIG_MFD_T7L66XB is not set

# CONFIG_MFD_TC6387XB is not set

# CONFIG_MFD_TC6393XB is not set

# CONFIG_PMIC_DA903X is not set

CONFIG_PMIC_DA903X=y

# CONFIG_MFD_WM8400 is not set

# CONFIG_MFD_WM831X is not set

# CONFIG_MFD_WM8350_I2C is not set

# CONFIG_MFD_PCF50633 is not set



#

# Multimedia devices

#



#

# Multimedia core support

#

# CONFIG_VIDEO_DEV is not set

# CONFIG_DVB_CORE is not set

# CONFIG_VIDEO_MEDIA is not set



#

# Multimedia drivers

#

# CONFIG_DAB is not set

# CONFIG_MFD_MC13783 is not set

# CONFIG_AB3100_CORE is not set

# CONFIG_EZX_PCAP is not set

CONFIG_REGULATOR=y

# CONFIG_REGULATOR_DEBUG is not set

# CONFIG_REGULATOR_FIXED_VOLTAGE is not set

# CONFIG_REGULATOR_VIRTUAL_CONSUMER is not set

# CONFIG_REGULATOR_USERSPACE_CONSUMER is not set

# CONFIG_REGULATOR_BQ24022 is not set

# CONFIG_REGULATOR_MAX1586 is not set

CONFIG_REGULATOR_DA903X=y

# CONFIG_REGULATOR_LP3971 is not set

# CONFIG_REGULATOR_TPS65023 is not set

# CONFIG_REGULATOR_TPS6507X is not set

# CONFIG_MEDIA_SUPPORT is not set



#

# Graphics support
@@ -925,7 +1007,17 @@ CONFIG_FB_PXA=y 
# CONFIG_FB_METRONOME is not set

# CONFIG_FB_MB862XX is not set

# CONFIG_FB_BROADSHEET is not set

# CONFIG_BACKLIGHT_LCD_SUPPORT is not set

CONFIG_BACKLIGHT_LCD_SUPPORT=y

CONFIG_LCD_CLASS_DEVICE=y

# CONFIG_LCD_LMS283GF05 is not set

# CONFIG_LCD_LTV350QV is not set

# CONFIG_LCD_ILI9320 is not set

CONFIG_LCD_TDO24M=y

# CONFIG_LCD_VGG2432A4 is not set

# CONFIG_LCD_PLATFORM is not set

CONFIG_BACKLIGHT_CLASS_DEVICE=m

# CONFIG_BACKLIGHT_GENERIC is not set

CONFIG_BACKLIGHT_DA903X=m



#

# Display device support
@@ -956,38 +1048,48 @@ CONFIG_LOGO_LINUX_MONO=y 
CONFIG_LOGO_LINUX_VGA16=y

CONFIG_LOGO_LINUX_CLUT224=y

CONFIG_SOUND=m

# CONFIG_SOUND_OSS_CORE is not set

CONFIG_SOUND_OSS_CORE=y

CONFIG_SOUND_OSS_CORE_PRECLAIM=y

CONFIG_SND=m

CONFIG_SND_TIMER=m

CONFIG_SND_PCM=m

CONFIG_SND_JACK=y

# CONFIG_SND_SEQUENCER is not set

# CONFIG_SND_MIXER_OSS is not set

# CONFIG_SND_PCM_OSS is not set

CONFIG_SND_OSSEMUL=y

CONFIG_SND_MIXER_OSS=m

CONFIG_SND_PCM_OSS=m

CONFIG_SND_PCM_OSS_PLUGINS=y

# CONFIG_SND_DYNAMIC_MINORS is not set

CONFIG_SND_SUPPORT_OLD_API=y

CONFIG_SND_VERBOSE_PROCFS=y

# CONFIG_SND_VERBOSE_PRINTK is not set

# CONFIG_SND_DEBUG is not set

CONFIG_SND_DRIVERS=y

# 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

CONFIG_SND_VMASTER=y

# CONFIG_SND_RAWMIDI_SEQ is not set

# CONFIG_SND_OPL3_LIB_SEQ is not set

# CONFIG_SND_OPL4_LIB_SEQ is not set

# CONFIG_SND_SBAWE_SEQ is not set

# CONFIG_SND_EMU10K1_SEQ is not set

CONFIG_SND_AC97_CODEC=m

# CONFIG_SND_DRIVERS is not set

CONFIG_SND_ARM=y

CONFIG_SND_PXA2XX_LIB=m

CONFIG_SND_PXA2XX_LIB_AC97=y

# CONFIG_SND_PXA2XX_AC97 is not set

CONFIG_SND_USB=y

# CONFIG_SND_USB_AUDIO is not set

# CONFIG_SND_USB_CAIAQ is not set

# CONFIG_SND_SPI is not set

# CONFIG_SND_USB is not set

CONFIG_SND_SOC=m

CONFIG_SND_SOC_AC97_BUS=y

CONFIG_SND_PXA2XX_SOC=m

CONFIG_SND_PXA2XX_SOC_AC97=m

CONFIG_SND_PXA2XX_SOC_EM_X270=m

CONFIG_SND_SOC_I2C_AND_SPI=m

# CONFIG_SND_SOC_ALL_CODECS is not set

CONFIG_SND_SOC_WM9712=m

# CONFIG_SOUND_PRIME is not set

CONFIG_AC97_BUS=m

CONFIG_HID_SUPPORT=y

CONFIG_HID=y

CONFIG_HID_DEBUG=y

# CONFIG_HIDRAW is not set



#
@@ -1006,10 +1108,12 @@ CONFIG_HID_BELKIN=y 
CONFIG_HID_CHERRY=y

CONFIG_HID_CHICONY=y

CONFIG_HID_CYPRESS=y

CONFIG_HID_DRAGONRISE=y

# CONFIG_DRAGONRISE_FF is not set

CONFIG_HID_EZKEY=y

CONFIG_HID_KYE=y

CONFIG_HID_GYRATION=y

CONFIG_HID_TWINHAN=y

CONFIG_HID_KENSINGTON=y

CONFIG_HID_LOGITECH=y

# CONFIG_LOGITECH_FF is not set
@@ -1023,9 +1127,15 @@ CONFIG_HID_PETALYNX=y 
CONFIG_HID_SAMSUNG=y

CONFIG_HID_SONY=y

CONFIG_HID_SUNPLUS=y

CONFIG_HID_GREENASIA=y

# CONFIG_GREENASIA_FF is not set

CONFIG_HID_SMARTJOYPLUS=y

# CONFIG_SMARTJOYPLUS_FF is not set

CONFIG_HID_TOPSEED=y

CONFIG_HID_THRUSTMASTER=y

# CONFIG_THRUSTMASTER_FF is not set

CONFIG_HID_WACOM=m

CONFIG_HID_ZEROPLUS=y

# CONFIG_ZEROPLUS_FF is not set

CONFIG_USB_SUPPORT=y

CONFIG_USB_ARCH_HAS_HCD=y
@@ -1054,6 +1164,7 @@ CONFIG_USB_MON=y 
# CONFIG_USB_OXU210HP_HCD is not set

# CONFIG_USB_ISP116X_HCD is not set

# CONFIG_USB_ISP1760_HCD is not set

# CONFIG_USB_ISP1362_HCD is not set

CONFIG_USB_OHCI_HCD=y

# CONFIG_USB_OHCI_BIG_ENDIAN_DESC is not set

# CONFIG_USB_OHCI_BIG_ENDIAN_MMIO is not set
@@ -1151,8 +1262,9 @@ CONFIG_MMC_BLOCK_BOUNCE=y 
#

CONFIG_MMC_PXA=m

# CONFIG_MMC_SDHCI is not set

# CONFIG_MMC_AT91 is not set

# CONFIG_MMC_ATMELMCI is not set

# CONFIG_MEMSTICK is not set

# CONFIG_ACCESSIBILITY is not set

CONFIG_NEW_LEDS=y

CONFIG_LEDS_CLASS=y
@@ -1162,8 +1274,10 @@ CONFIG_LEDS_CLASS=y 
# CONFIG_LEDS_PCA9532 is not set

CONFIG_LEDS_GPIO=y

CONFIG_LEDS_GPIO_PLATFORM=y

# CONFIG_LEDS_LP5521 is not set

# CONFIG_LEDS_LP3944 is not set

# CONFIG_LEDS_PCA955X is not set

# CONFIG_LEDS_DA903X is not set

# CONFIG_LEDS_DAC124S085 is not set

# CONFIG_LEDS_BD2802 is not set



#
@@ -1179,6 +1293,7 @@ CONFIG_LEDS_TRIGGER_HEARTBEAT=y 
#

# iptables trigger is under Netfilter config (LED target)

#

# CONFIG_ACCESSIBILITY is not set

CONFIG_RTC_LIB=y

CONFIG_RTC_CLASS=y

CONFIG_RTC_HCTOSYS=y
@@ -1210,10 +1325,19 @@ CONFIG_RTC_INTF_DEV=y 
# CONFIG_RTC_DRV_S35390A is not set

# CONFIG_RTC_DRV_FM3130 is not set

# CONFIG_RTC_DRV_RX8581 is not set

# CONFIG_RTC_DRV_RX8025 is not set



#

# SPI RTC drivers

#

# CONFIG_RTC_DRV_M41T94 is not set

# CONFIG_RTC_DRV_DS1305 is not set

# CONFIG_RTC_DRV_DS1390 is not set

# CONFIG_RTC_DRV_MAX6902 is not set

# CONFIG_RTC_DRV_R9701 is not set

# CONFIG_RTC_DRV_RS5C348 is not set

# CONFIG_RTC_DRV_DS3234 is not set

# CONFIG_RTC_DRV_PCF2123 is not set



#

# Platform RTC drivers
@@ -1233,12 +1357,15 @@ CONFIG_RTC_DRV_V3020=y 
#

# on-CPU RTC drivers

#

CONFIG_RTC_DRV_SA1100=y

# CONFIG_RTC_DRV_PXA is not set

# CONFIG_RTC_DRV_SA1100 is not set

CONFIG_RTC_DRV_PXA=y

# CONFIG_DMADEVICES is not set

# CONFIG_AUXDISPLAY is not set

# CONFIG_REGULATOR is not set

# CONFIG_UIO is not set



#

# TI VLYNQ

#

# CONFIG_STAGING is not set



#
@@ -1256,10 +1383,13 @@ CONFIG_JBD=y 
# CONFIG_REISERFS_FS is not set

# CONFIG_JFS_FS is not set

CONFIG_FS_POSIX_ACL=y

CONFIG_FILE_LOCKING=y

# CONFIG_XFS_FS is not set

# CONFIG_GFS2_FS is not set

# CONFIG_OCFS2_FS is not set

# CONFIG_BTRFS_FS is not set

# CONFIG_NILFS2_FS is not set

CONFIG_FILE_LOCKING=y

CONFIG_FSNOTIFY=y

CONFIG_DNOTIFY=y

CONFIG_INOTIFY=y

CONFIG_INOTIFY_USER=y
@@ -1319,6 +1449,12 @@ CONFIG_JFFS2_ZLIB=y 
# CONFIG_JFFS2_LZO is not set

CONFIG_JFFS2_RTIME=y

# CONFIG_JFFS2_RUBIN is not set

CONFIG_UBIFS_FS=y

# CONFIG_UBIFS_FS_XATTR is not set

# CONFIG_UBIFS_FS_ADVANCED_COMPR is not set

CONFIG_UBIFS_FS_LZO=y

CONFIG_UBIFS_FS_ZLIB=y

# CONFIG_UBIFS_FS_DEBUG is not set

# CONFIG_CRAMFS is not set

# CONFIG_SQUASHFS is not set

# CONFIG_VXFS_FS is not set
@@ -1329,12 +1465,12 @@ CONFIG_JFFS2_RTIME=y 
# CONFIG_ROMFS_FS is not set

# CONFIG_SYSV_FS is not set

# CONFIG_UFS_FS is not set

# CONFIG_NILFS2_FS is not set

CONFIG_NETWORK_FILESYSTEMS=y

CONFIG_NFS_FS=y

CONFIG_NFS_V3=y

CONFIG_NFS_V3_ACL=y

CONFIG_NFS_V4=y

# CONFIG_NFS_V4_1 is not set

CONFIG_ROOT_NFS=y

# CONFIG_NFSD is not set

CONFIG_LOCKD=y
@@ -1378,7 +1514,7 @@ CONFIG_MSDOS_PARTITION=y 
# CONFIG_KARMA_PARTITION is not set

# CONFIG_EFI_PARTITION is not set

# CONFIG_SYSV68_PARTITION is not set

CONFIG_NLS=m

CONFIG_NLS=y

CONFIG_NLS_DEFAULT="iso8859-1"

CONFIG_NLS_CODEPAGE_437=m

# CONFIG_NLS_CODEPAGE_737 is not set
@@ -1428,6 +1564,7 @@ CONFIG_ENABLE_WARN_DEPRECATED=y 
CONFIG_ENABLE_MUST_CHECK=y

CONFIG_FRAME_WARN=1024

# CONFIG_MAGIC_SYSRQ is not set

# CONFIG_STRIP_ASM_SYMS is not set

# CONFIG_UNUSED_SYMBOLS is not set

CONFIG_DEBUG_FS=y

# CONFIG_HEADERS_CHECK is not set
@@ -1441,6 +1578,7 @@ CONFIG_DEBUG_KERNEL=y 
# CONFIG_DEBUG_OBJECTS is not set

# CONFIG_SLUB_DEBUG_ON is not set

# CONFIG_SLUB_STATS is not set

# CONFIG_DEBUG_KMEMLEAK is not set

# CONFIG_DEBUG_RT_MUTEXES is not set

# CONFIG_RT_MUTEX_TESTER is not set

# CONFIG_DEBUG_SPINLOCK is not set
@@ -1460,32 +1598,20 @@ CONFIG_DEBUG_MEMORY_INIT=y 
# CONFIG_DEBUG_LIST is not set

# CONFIG_DEBUG_SG is not set

# CONFIG_DEBUG_NOTIFIERS is not set

# CONFIG_DEBUG_CREDENTIALS is not set

# CONFIG_BOOT_PRINTK_DELAY is not set

# CONFIG_RCU_TORTURE_TEST is not set

# CONFIG_RCU_CPU_STALL_DETECTOR is not set

# CONFIG_BACKTRACE_SELF_TEST is not set

# CONFIG_DEBUG_BLOCK_EXT_DEVT is not set

# CONFIG_DEBUG_FORCE_WEAK_PER_CPU is not set

# CONFIG_FAULT_INJECTION is not set

# CONFIG_LATENCYTOP is not set

CONFIG_SYSCTL_SYSCALL_CHECK=y

# CONFIG_PAGE_POISONING is not set

CONFIG_HAVE_FUNCTION_TRACER=y

CONFIG_TRACING_SUPPORT=y



#

# Tracers

#

# CONFIG_FUNCTION_TRACER is not set

# CONFIG_IRQSOFF_TRACER is not set

# CONFIG_SCHED_TRACER is not set

# CONFIG_CONTEXT_SWITCH_TRACER is not set

# CONFIG_EVENT_TRACER is not set

# CONFIG_BOOT_TRACER is not set

# CONFIG_TRACE_BRANCH_PROFILING is not set

# CONFIG_STACK_TRACER is not set

# CONFIG_KMEMTRACE is not set

# CONFIG_WORKQUEUE_TRACER is not set

# CONFIG_BLK_DEV_IO_TRACE is not set

# CONFIG_FTRACE is not set

# CONFIG_DYNAMIC_DEBUG is not set

# CONFIG_SAMPLES is not set

CONFIG_HAVE_ARCH_KGDB=y
@@ -1509,7 +1635,6 @@ CONFIG_CRYPTO=y 
#

# Crypto core or helper

#

# CONFIG_CRYPTO_FIPS is not set

CONFIG_CRYPTO_ALGAPI=y

CONFIG_CRYPTO_ALGAPI2=y

CONFIG_CRYPTO_AEAD2=y
@@ -1551,11 +1676,13 @@ CONFIG_CRYPTO_ECB=m 
#

# CONFIG_CRYPTO_HMAC is not set

# CONFIG_CRYPTO_XCBC is not set

# CONFIG_CRYPTO_VMAC is not set



#

# Digest

#

# CONFIG_CRYPTO_CRC32C is not set

# CONFIG_CRYPTO_GHASH is not set

# CONFIG_CRYPTO_MD4 is not set

CONFIG_CRYPTO_MD5=y

CONFIG_CRYPTO_MICHAEL_MIC=m
@@ -1591,9 +1718,9 @@ CONFIG_CRYPTO_DES=y 
#

# Compression

#

# CONFIG_CRYPTO_DEFLATE is not set

CONFIG_CRYPTO_DEFLATE=y

# CONFIG_CRYPTO_ZLIB is not set

# CONFIG_CRYPTO_LZO is not set

CONFIG_CRYPTO_LZO=y



#

# Random Number Generation
@@ -1608,7 +1735,7 @@ CONFIG_CRYPTO_DES=y 
CONFIG_BITREVERSE=y

CONFIG_GENERIC_FIND_LAST_BIT=y

# CONFIG_CRC_CCITT is not set

# CONFIG_CRC16 is not set

CONFIG_CRC16=y

CONFIG_CRC_T10DIF=y

# CONFIG_CRC_ITU_T is not set

CONFIG_CRC32=y
@@ -1616,6 +1743,8 @@ CONFIG_CRC32=y 
# CONFIG_LIBCRC32C is not set

CONFIG_ZLIB_INFLATE=y

CONFIG_ZLIB_DEFLATE=y

CONFIG_LZO_COMPRESS=y

CONFIG_LZO_DECOMPRESS=y

CONFIG_DECOMPRESS_GZIP=y

CONFIG_DECOMPRESS_BZIP2=y

CONFIG_DECOMPRESS_LZMA=y

arch/arm/configs/ezx_defconfig

+667 −280

File changed.

Preview size limit exceeded, changes collapsed.

arch/arm/mach-mmp/aspenite.c

+39 −0
Original line number Diff line number Diff line
@@ -13,6 +13,9 @@ 
#include <linux/kernel.h>

#include <linux/platform_device.h>

#include <linux/smc91x.h>

#include <linux/mtd/mtd.h>

#include <linux/mtd/partitions.h>

#include <linux/mtd/nand.h>



#include <asm/mach-types.h>

#include <asm/mach/arch.h>
@@ -85,12 +88,48 @@ static struct platform_device smc91x_device = { 
	.resource	= smc91x_resources,

};



static struct mtd_partition aspenite_nand_partitions[] = {

	{

		.name		= "bootloader",

		.offset		= 0,

		.size		= SZ_1M,

		.mask_flags	= MTD_WRITEABLE,

	}, {

		.name		= "reserved",

		.offset		= MTDPART_OFS_APPEND,

		.size		= SZ_128K,

		.mask_flags	= MTD_WRITEABLE,

	}, {

		.name		= "reserved",

		.offset		= MTDPART_OFS_APPEND,

		.size		= SZ_8M,

		.mask_flags	= MTD_WRITEABLE,

	}, {

		.name		= "kernel",

		.offset		= MTDPART_OFS_APPEND,

		.size		= (SZ_2M + SZ_1M),

		.mask_flags	= 0,

	}, {

		.name		= "filesystem",

		.offset		= MTDPART_OFS_APPEND,

		.size		= SZ_48M,

		.mask_flags	= 0,

	}

};



static struct pxa3xx_nand_platform_data aspenite_nand_info = {

	.enable_arbiter	= 1,

	.parts		= aspenite_nand_partitions,

	.nr_parts	= ARRAY_SIZE(aspenite_nand_partitions),

};



static void __init common_init(void)

{

	mfp_config(ARRAY_AND_SIZE(common_pin_config));



	/* on-chip devices */

	pxa168_add_uart(1);

	pxa168_add_nand(&aspenite_nand_info);



	/* off-chip devices */

	platform_device_register(&smc91x_device);

arch/arm/mach-mmp/clock.c

+15 −0
Original line number Diff line number Diff line
@@ -34,6 +34,21 @@ struct clkops apbc_clk_ops = { 
	.disable	= apbc_clk_disable,

};



static void apmu_clk_enable(struct clk *clk)

{

	__raw_writel(clk->enable_val, clk->clk_rst);

}



static void apmu_clk_disable(struct clk *clk)

{

	__raw_writel(0, clk->clk_rst);

}



struct clkops apmu_clk_ops = {

	.enable		= apmu_clk_enable,

	.disable	= apmu_clk_disable,

};



static DEFINE_SPINLOCK(clocks_lock);



int clk_enable(struct clk *clk)