Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 677f4f64 authored by Russell King's avatar Russell King
Browse files

Merge branch 'for-rmk' of git://git.pengutronix.de/git/imx/linux-2.6 into devel-stable

parents 4567c4a8 fedea672

MAINTAINERS

+3 −0
Original line number Diff line number Diff line
@@ -637,6 +637,9 @@ ARM/FREESCALE IMX / MXC ARM ARCHITECTURE 
M:	Sascha Hauer <kernel@pengutronix.de>

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

S:	Maintained

T:	git://git.pengutronix.de/git/imx/linux-2.6.git

F:	arch/arm/mach-mx*/

F:	arch/arm/plat-mxc/



ARM/GLOMATION GESBC9312SX MACHINE SUPPORT

M:	Lennert Buytenhek <kernel@wantstofly.org>

arch/arm/configs/mx3_defconfig

+68 −33
Original line number Diff line number Diff line 
#

# Automatically generated make config: don't edit

# Linux kernel version: 2.6.31-rc4

# Tue Jul 28 14:11:34 2009

# Linux kernel version: 2.6.32-rc5

# Sun Nov  1 22:56:24 2009

#

CONFIG_ARM=y

CONFIG_HAVE_PWM=y
@@ -9,7 +9,6 @@ CONFIG_SYS_SUPPORTS_APM_EMULATION=y 
CONFIG_GENERIC_GPIO=y

CONFIG_GENERIC_TIME=y

CONFIG_GENERIC_CLOCKEVENTS=y

CONFIG_MMU=y

CONFIG_GENERIC_HARDIRQS=y

CONFIG_STACKTRACE_SUPPORT=y

CONFIG_HAVE_LATENCYTOP_SUPPORT=y
@@ -46,11 +45,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=14
@@ -87,16 +87,14 @@ CONFIG_SHMEM=y 
CONFIG_AIO=y



#

# Performance Counters

# Kernel Performance Events And Counters

#

CONFIG_VM_EVENT_COUNTERS=y

# CONFIG_STRIP_ASM_SYMS is not set

CONFIG_COMPAT_BRK=y

CONFIG_SLAB=y

# CONFIG_SLUB is not set

# 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
@@ -139,6 +137,7 @@ 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
@@ -153,6 +152,7 @@ CONFIG_ARCH_MXC=y 
# CONFIG_ARCH_STMP3XXX is not set

# CONFIG_ARCH_NETX is not set

# CONFIG_ARCH_H720X 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
@@ -175,18 +175,22 @@ CONFIG_ARCH_MXC=y 
# 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_BCMRING is not set



#

# Freescale MXC Implementations

#

# CONFIG_ARCH_MX1 is not set

# CONFIG_ARCH_MX2 is not set

# CONFIG_ARCH_MX25 is not set

CONFIG_ARCH_MX3=y

# CONFIG_ARCH_MXC91231 is not set

CONFIG_ARCH_MX31=y

CONFIG_ARCH_MX35=y
@@ -205,6 +209,7 @@ CONFIG_MACH_QONG=y 
CONFIG_MACH_PCM043=y

CONFIG_MACH_ARMADILLO5X0=y

CONFIG_MACH_MX35_3DS=y

CONFIG_MACH_KZM_ARM11_01=y

CONFIG_MXC_IRQ_PRIOR=y

CONFIG_MXC_PWM=y

CONFIG_ARCH_HAS_RNGA=y
@@ -218,7 +223,7 @@ CONFIG_CPU_V6=y 
# CONFIG_CPU_32v6K is not set

CONFIG_CPU_32v6=y

CONFIG_CPU_ABRT_EV6=y

CONFIG_CPU_PABRT_NOIFAR=y

CONFIG_CPU_PABRT_V6=y

CONFIG_CPU_CACHE_V6=y

CONFIG_CPU_CACHE_VIPT=y

CONFIG_CPU_COPY_V6=y
@@ -236,6 +241,7 @@ CONFIG_ARM_THUMB=y 
# CONFIG_CPU_BPREDICT_DISABLE is not set

CONFIG_OUTER_CACHE=y

CONFIG_CACHE_L2X0=y

CONFIG_ARM_L1_CACHE_SHIFT=5

# CONFIG_ARM_ERRATA_411920 is not set

CONFIG_COMMON_CLKDEV=y
@@ -257,6 +263,8 @@ CONFIG_VMSPLIT_3G=y 
# CONFIG_VMSPLIT_2G is not set

# CONFIG_VMSPLIT_1G is not set

CONFIG_PAGE_OFFSET=0xC0000000

# CONFIG_PREEMPT_NONE is not set

# CONFIG_PREEMPT_VOLUNTARY is not set

CONFIG_PREEMPT=y

CONFIG_HZ=100

CONFIG_AEABI=y
@@ -277,6 +285,7 @@ CONFIG_ZONE_DMA_FLAG=0 
CONFIG_VIRT_TO_BUS=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
@@ -326,6 +335,7 @@ CONFIG_PM_SLEEP=y 
CONFIG_SUSPEND=y

CONFIG_SUSPEND_FREEZER=y

# CONFIG_APM_EMULATION is not set

# CONFIG_PM_RUNTIME is not set

CONFIG_ARCH_SUSPEND_POSSIBLE=y

CONFIG_NET=y
@@ -367,6 +377,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
@@ -407,6 +418,7 @@ CONFIG_DEFAULT_TCP_CONG="cubic" 
# 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=m
@@ -416,9 +428,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=y

# CONFIG_MTD_AFS_PARTS is not set
@@ -587,14 +599,12 @@ CONFIG_DNET=y 
# CONFIG_B44 is not set

# CONFIG_CS89x0 is not set

# CONFIG_KS8842 is not set

# CONFIG_KS8851_MLL is not set

CONFIG_FEC=y

# CONFIG_FEC2 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 is not set
@@ -608,6 +618,7 @@ CONFIG_FEC=y 
# 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
@@ -630,7 +641,14 @@ CONFIG_DEVKMEM=y 
#

# Serial drivers

#

# CONFIG_SERIAL_8250 is not set

CONFIG_SERIAL_8250=m

CONFIG_SERIAL_8250_NR_UARTS=4

CONFIG_SERIAL_8250_RUNTIME_UARTS=4

CONFIG_SERIAL_8250_EXTENDED=y

# CONFIG_SERIAL_8250_MANY_PORTS is not set

CONFIG_SERIAL_8250_SHARE_IRQ=y

# CONFIG_SERIAL_8250_DETECT_IRQ is not set

# CONFIG_SERIAL_8250_RSA is not set



#

# Non-8250 serial port support
@@ -649,6 +667,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=y

CONFIG_I2C_HELPER_AUTO=y
@@ -681,15 +700,17 @@ CONFIG_I2C_IMX=y 
# Miscellaneous I2C Chip support

#

# CONFIG_DS1682 is not set

# CONFIG_SENSORS_PCF8574 is not set

# CONFIG_PCF8575 is not set

# CONFIG_SENSORS_PCA9539 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



#

# PPS support

#

# CONFIG_PPS is not set

CONFIG_ARCH_REQUIRE_GPIOLIB=y

CONFIG_GPIOLIB=y

# CONFIG_GPIO_SYSFS is not set
@@ -712,6 +733,10 @@ CONFIG_GPIOLIB=y 
#

# SPI GPIO expanders:

#



#

# AC97 GPIO expanders:

#

CONFIG_W1=y



#
@@ -734,7 +759,6 @@ CONFIG_W1_SLAVE_THERM=y 
# 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
@@ -759,12 +783,24 @@ CONFIG_SSB_POSSIBLE=y 
# CONFIG_MFD_TC6393XB is not set

# CONFIG_PMIC_DA903X is not set

# CONFIG_MFD_WM8400 is not set

# CONFIG_MFD_WM831X is not set

CONFIG_MFD_WM8350=y

CONFIG_MFD_WM8350_CONFIG_MODE_0=y

CONFIG_MFD_WM8352_CONFIG_MODE_0=y

CONFIG_MFD_WM8350_I2C=y

# CONFIG_MFD_PCF50633 is not set

# CONFIG_AB3100_CORE 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_WM8350=y

# CONFIG_REGULATOR_LP3971 is not set

# CONFIG_REGULATOR_TPS65023 is not set

# CONFIG_REGULATOR_TPS6507X is not set

CONFIG_MEDIA_SUPPORT=y



#
@@ -874,10 +910,12 @@ CONFIG_MMC_BLOCK_BOUNCE=y 
# MMC/SD/SDIO Host Controller Drivers

#

# CONFIG_MMC_SDHCI is not set

# CONFIG_MMC_AT91 is not set

# CONFIG_MMC_ATMELMCI is not set

CONFIG_MMC_MXC=y

# CONFIG_MEMSTICK is not set

# CONFIG_ACCESSIBILITY is not set

# CONFIG_NEW_LEDS is not set

# CONFIG_ACCESSIBILITY is not set

CONFIG_RTC_LIB=y

# CONFIG_RTC_CLASS is not set

CONFIG_DMADEVICES=y
@@ -896,16 +934,11 @@ CONFIG_DMA_ENGINE=y 
# CONFIG_ASYNC_TX_DMA is not set

# CONFIG_DMATEST is not set

# CONFIG_AUXDISPLAY 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_WM8350=y

# CONFIG_REGULATOR_LP3971 is not set

# CONFIG_UIO is not set



#

# TI VLYNQ

#

# CONFIG_STAGING is not set



#
@@ -921,6 +954,7 @@ CONFIG_REGULATOR_WM8350=y 
# 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 is not set
@@ -995,7 +1029,6 @@ CONFIG_UBIFS_FS_ZLIB=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
@@ -1033,6 +1066,7 @@ CONFIG_MSDOS_PARTITION=y 
# CONFIG_ENABLE_MUST_CHECK is not set

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 is not set

# CONFIG_HEADERS_CHECK is not set
@@ -1062,7 +1096,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
@@ -1104,11 +1137,13 @@ CONFIG_CRYPTO_CBC=y 
#

# 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 is not set

arch/arm/mach-mx2/Kconfig

+7 −0
Original line number Diff line number Diff line
@@ -104,4 +104,11 @@ config MACH_PCA100 
	  Include support for phyCARD-s (aka pca100) platform. This

	  includes specific configurations for the module and its peripherals.



config MACH_MXT_TD60

	bool "Maxtrack i-MXT TD60"

	depends on MACH_MX27

	help

	  Include support for i-MXT (aka td60) platform. This

	  includes specific configurations for the module and its peripherals.



endif

arch/arm/mach-mx2/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -20,4 +20,5 @@ obj-$(CONFIG_MACH_MX27LITE) += mx27lite.o 
obj-$(CONFIG_MACH_EUKREA_CPUIMX27) += eukrea_cpuimx27.o

obj-$(CONFIG_MACH_EUKREA_MBIMX27_BASEBOARD) += eukrea_mbimx27-baseboard.o

obj-$(CONFIG_MACH_PCA100) += pca100.o

obj-$(CONFIG_MACH_MXT_TD60) += mxt_td60.o

arch/arm/mach-mx2/clock_imx21.c

+1 −1
Original line number Diff line number Diff line
@@ -1000,7 +1000,7 @@ int __init mx21_clocks_init(unsigned long lref, unsigned long href) 
	clk_enable(&per_clk[0]);

	clk_enable(&gpio_clk);



#ifdef CONFIG_DEBUG_LL_CONSOLE

#if defined(CONFIG_DEBUG_LL) && !defined(CONFIG_DEBUG_ICEDCC)

	clk_enable(&uart_clk[0]);

#endif