Commit 464d155c authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge master.kernel.org:/home/rmk/linux-2.6-arm 

* master.kernel.org:/home/rmk/linux-2.6-arm: (22 commits)
  ARM: Fix lubbock defconfig build
  ARM: 5769/1: CPU_ARM920T: remove dead Maverick EP9312 URL
  ARM: 5768/1: ep93xx: remove dead code in ep93xx_gpio_ab_irq_handler()
  ARM: 5767/1: ep93xx: remove ep93xx_init_time() prototype
  ARM: 5765/1: Updated U300 defconfig
  ARM: 5766/1: Fix watchdog enabling for AT91SAM9G45
  ARM: 5764/1: bcmring: add oprofile pmu support
  [ARM] pxa/spitz: add gpio button support (fixes regression)
  [ARM] pxa/cm-x300: fix mmc numbering
  ARM: 5763/1: ARM: SMP: Fix the BUG with CONFIG_PREEMPT enabled
  ARM: 5760/1: ep93xx: fix build error in edb93xx.c
  ARM: 5759/1: Add register information of threads to coredump
  ARM: 5757/1: Thumb-2: Correct "mov.w pc, lr" instruction which is unpredictable
  MXC: fix reset for mx31, mx35 and mx27 SoCs
  fix pcm037_eet compilation with the new SPI driver
  fix compilation of i.MX31 platforms
  pcm970 mmc: Fix ro switch
  pcm038: Add SPI/MC13783 support
  mx25: Add missing copyright / license header
  mx25pdk: remove nand support as it is not present in current tree
  ...
parents fefcfd43 09963911

arch/arm/configs/u300_defconfig

+66 −28
Original line number Diff line number Diff line 
#

# Automatically generated make config: don't edit

# Linux kernel version: 2.6.31-rc3

# Thu Jul 16 23:36:10 2009

# Linux kernel version: 2.6.32-rc5

# Sat Oct 17 23:32:24 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_HAVE_TCM=y

CONFIG_GENERIC_HARDIRQS=y

CONFIG_STACKTRACE_SUPPORT=y

CONFIG_HAVE_LATENCYTOP_SUPPORT=y
@@ -44,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 is not set

CONFIG_LOG_BUF_SHIFT=14

# CONFIG_GROUP_SCHED is not set
@@ -80,17 +81,15 @@ CONFIG_SHMEM=y 
# CONFIG_AIO is not set



#

# Performance Counters

# Kernel Performance Events And Counters

#

# CONFIG_VM_EVENT_COUNTERS is not set

CONFIG_SLUB_DEBUG=y

# CONFIG_STRIP_ASM_SYMS is not set

CONFIG_COMPAT_BRK=y

# CONFIG_SLAB is not set

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
@@ -133,6 +132,7 @@ CONFIG_DEFAULT_IOSCHED="deadline" 
#

# System Type

#

CONFIG_MMU=y

# CONFIG_ARCH_AAEC2000 is not set

# CONFIG_ARCH_INTEGRATOR is not set

# CONFIG_ARCH_REALVIEW is not set
@@ -147,6 +147,7 @@ CONFIG_DEFAULT_IOSCHED="deadline" 
# 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
@@ -169,11 +170,13 @@ CONFIG_DEFAULT_IOSCHED="deadline" 
# 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=y

# CONFIG_ARCH_DAVINCI is not set

# CONFIG_ARCH_OMAP is not set

# CONFIG_ARCH_BCMRING is not set



#

# ST-Ericsson AB U300/U330/U335/U365 Platform
@@ -195,6 +198,7 @@ CONFIG_MACH_U300_BS335=y 
CONFIG_MACH_U300_DUAL_RAM=y

CONFIG_U300_DEBUG=y

# CONFIG_MACH_U300_SEMI_IS_SHARED is not set

CONFIG_MACH_U300_SPIDUMMY=y



#

# All the settings below must match the bootloader's settings
@@ -207,7 +211,7 @@ CONFIG_CPU_32=y 
CONFIG_CPU_ARM926T=y

CONFIG_CPU_32v5=y

CONFIG_CPU_ABRT_EV5TJ=y

CONFIG_CPU_PABRT_NOIFAR=y

CONFIG_CPU_PABRT_LEGACY=y

CONFIG_CPU_CACHE_VIVT=y

CONFIG_CPU_COPY_V4WB=y

CONFIG_CPU_TLB_V4WBI=y
@@ -222,6 +226,7 @@ CONFIG_ARM_THUMB=y 
# CONFIG_CPU_DCACHE_DISABLE is not set

# CONFIG_CPU_DCACHE_WRITETHROUGH is not set

# CONFIG_CPU_CACHE_ROUND_ROBIN is not set

CONFIG_ARM_L1_CACHE_SHIFT=5

CONFIG_ARM_VIC=y

CONFIG_ARM_VIC_NR=2

CONFIG_COMMON_CLKDEV=y
@@ -245,6 +250,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
@@ -265,6 +272,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
@@ -313,6 +321,7 @@ CONFIG_PM=y 
# CONFIG_PM_DEBUG is not set

# CONFIG_SUSPEND is not set

# CONFIG_APM_EMULATION is not set

# CONFIG_PM_RUNTIME is not set

CONFIG_ARCH_SUSPEND_POSSIBLE=y

CONFIG_NET=y
@@ -351,6 +360,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
@@ -391,6 +401,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 is not set

CONFIG_FW_LOADER=y
@@ -402,9 +413,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
@@ -453,6 +464,7 @@ CONFIG_MTD_CFI_I2=y 
#

# 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
@@ -520,6 +532,7 @@ CONFIG_HAVE_IDE=y 
# CONFIG_MD is not set

# CONFIG_NETDEVICES is not set

# CONFIG_ISDN is not set

# CONFIG_PHONE is not set



#

# Input device support
@@ -540,12 +553,16 @@ CONFIG_INPUT_EVDEV=y 
# Input Device Drivers

#

CONFIG_INPUT_KEYBOARD=y

# CONFIG_KEYBOARD_ADP5588 is not set

# CONFIG_KEYBOARD_ATKBD is not set

# CONFIG_QT2160 is not set

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

# CONFIG_KEYBOARD_STOWAWAY is not set

# CONFIG_KEYBOARD_SUNKBD is not set

# CONFIG_KEYBOARD_XTKBD is not set
@@ -597,6 +614,7 @@ CONFIG_LEGACY_PTY_COUNT=16 
# 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
@@ -629,9 +647,6 @@ CONFIG_I2C_STU300=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
@@ -653,16 +668,21 @@ CONFIG_SPI_PL022=y 
#

# CONFIG_SPI_SPIDEV is not set

# CONFIG_SPI_TLE62X0 is not set



#

# PPS support

#

# CONFIG_PPS is not set

# CONFIG_W1 is not set

CONFIG_POWER_SUPPLY=y

# CONFIG_POWER_SUPPLY_DEBUG is not set

# CONFIG_PDA_POWER is not set

# CONFIG_BATTERY_DS2760 is not set

# CONFIG_BATTERY_DS2782 is not set

# CONFIG_BATTERY_BQ27x00 is not set

# CONFIG_BATTERY_MAX17040 is not set

# CONFIG_HWMON is not set

# CONFIG_THERMAL is not set

# CONFIG_THERMAL_HWMON is not set

CONFIG_WATCHDOG=y

# CONFIG_WATCHDOG_NOWAYOUT is not set
@@ -690,10 +710,24 @@ CONFIG_SSB_POSSIBLE=y 
# CONFIG_MFD_TC6387XB is not set

# CONFIG_PMIC_DA903X is not set

# 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

# CONFIG_MFD_MC13783 is not set

CONFIG_AB3100_CORE=y

CONFIG_AB3100_OTP=y

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

CONFIG_REGULATOR_AB3100=y

# CONFIG_REGULATOR_TPS65023 is not set

# CONFIG_REGULATOR_TPS6507X is not set

# CONFIG_MEDIA_SUPPORT is not set



#
@@ -792,9 +826,10 @@ CONFIG_MMC_BLOCK_BOUNCE=y 
#

CONFIG_MMC_ARMMMCI=y

# CONFIG_MMC_SDHCI is not set

# CONFIG_MMC_AT91 is not set

# CONFIG_MMC_ATMELMCI is not set

# CONFIG_MMC_SPI is not set

# CONFIG_MEMSTICK is not set

# CONFIG_ACCESSIBILITY is not set

CONFIG_NEW_LEDS=y

CONFIG_LEDS_CLASS=y
@@ -820,10 +855,10 @@ CONFIG_LEDS_TRIGGER_BACKLIGHT=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

CONFIG_RTC_HCTOSYS_DEVICE="rtc0"

# CONFIG_RTC_HCTOSYS is not set

# CONFIG_RTC_DEBUG is not set



#
@@ -863,6 +898,7 @@ CONFIG_RTC_INTF_DEV=y 
# 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
@@ -878,27 +914,25 @@ CONFIG_RTC_INTF_DEV=y 
# CONFIG_RTC_DRV_M48T59 is not set

# CONFIG_RTC_DRV_BQ4802 is not set

# CONFIG_RTC_DRV_V3020 is not set

CONFIG_RTC_DRV_AB3100=y



#

# on-CPU RTC drivers

#

# CONFIG_RTC_DRV_PL030 is not set

# CONFIG_RTC_DRV_PL031 is not set

CONFIG_RTC_DRV_COH901331=y

CONFIG_DMADEVICES=y



#

# DMA Devices

#

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

# CONFIG_UIO is not set



#

# TI VLYNQ

#

# CONFIG_STAGING is not set



#
@@ -913,6 +947,7 @@ CONFIG_REGULATOR=y 
# CONFIG_XFS_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
@@ -975,7 +1010,6 @@ CONFIG_MISC_FILESYSTEMS=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 is not set



#
@@ -1033,6 +1067,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 is not set

# CONFIG_HEADERS_CHECK is not set
@@ -1066,11 +1101,13 @@ CONFIG_DEBUG_INFO=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 is not set
@@ -1121,6 +1158,7 @@ CONFIG_GENERIC_FIND_LAST_BIT=y 
# CONFIG_CRC32 is not set

# CONFIG_CRC7 is not set

# CONFIG_LIBCRC32C is not set

CONFIG_GENERIC_ALLOCATOR=y

CONFIG_HAS_IOMEM=y

CONFIG_HAS_IOPORT=y

CONFIG_HAS_DMA=y

arch/arm/include/asm/elf.h

+3 −0
Original line number Diff line number Diff line
@@ -98,6 +98,9 @@ extern int elf_check_arch(const struct elf32_hdr *); 
extern int arm_elf_read_implies_exec(const struct elf32_hdr *, int);

#define elf_read_implies_exec(ex,stk) arm_elf_read_implies_exec(&(ex), stk)



int dump_task_regs(struct task_struct *t, elf_gregset_t *elfregs);

#define ELF_CORE_COPY_TASK_REGS dump_task_regs



#define USE_ELF_CORE_DUMP

#define ELF_EXEC_PAGESIZE	4096

arch/arm/include/asm/tlbflush.h

+2 −1
Original line number Diff line number Diff line
@@ -350,7 +350,7 @@ static inline void local_flush_tlb_mm(struct mm_struct *mm) 
	if (tlb_flag(TLB_WB))

		dsb();



	if (cpumask_test_cpu(smp_processor_id(), mm_cpumask(mm))) {

	if (cpumask_test_cpu(get_cpu(), mm_cpumask(mm))) {

		if (tlb_flag(TLB_V3_FULL))

			asm("mcr p15, 0, %0, c6, c0, 0" : : "r" (zero) : "cc");

		if (tlb_flag(TLB_V4_U_FULL))
@@ -360,6 +360,7 @@ static inline void local_flush_tlb_mm(struct mm_struct *mm) 
		if (tlb_flag(TLB_V4_I_FULL))

			asm("mcr p15, 0, %0, c8, c5, 0" : : "r" (zero) : "cc");

	}

	put_cpu();



	if (tlb_flag(TLB_V6_U_ASID))

		asm("mcr p15, 0, %0, c8, c7, 2" : : "r" (asid) : "cc");

arch/arm/kernel/entry-armv.S

+14 −14
Original line number Diff line number Diff line
@@ -608,33 +608,33 @@ call_fpe: 
 THUMB(	add	pc, r8			)

	nop



	W(mov)	pc, lr				@ CP#0

	movw_pc	lr				@ CP#0

	W(b)	do_fpe				@ CP#1 (FPE)

	W(b)	do_fpe				@ CP#2 (FPE)

	W(mov)	pc, lr				@ CP#3

	movw_pc	lr				@ CP#3

#ifdef CONFIG_CRUNCH

	b	crunch_task_enable		@ CP#4 (MaverickCrunch)

	b	crunch_task_enable		@ CP#5 (MaverickCrunch)

	b	crunch_task_enable		@ CP#6 (MaverickCrunch)

#else

	W(mov)	pc, lr				@ CP#4

	W(mov)	pc, lr				@ CP#5

	W(mov)	pc, lr				@ CP#6

	movw_pc	lr				@ CP#4

	movw_pc	lr				@ CP#5

	movw_pc	lr				@ CP#6

#endif

	W(mov)	pc, lr				@ CP#7

	W(mov)	pc, lr				@ CP#8

	W(mov)	pc, lr				@ CP#9

	movw_pc	lr				@ CP#7

	movw_pc	lr				@ CP#8

	movw_pc	lr				@ CP#9

#ifdef CONFIG_VFP

	W(b)	do_vfp				@ CP#10 (VFP)

	W(b)	do_vfp				@ CP#11 (VFP)

#else

	W(mov)	pc, lr				@ CP#10 (VFP)

	W(mov)	pc, lr				@ CP#11 (VFP)

	movw_pc	lr				@ CP#10 (VFP)

	movw_pc	lr				@ CP#11 (VFP)

#endif

	W(mov)	pc, lr				@ CP#12

	W(mov)	pc, lr				@ CP#13

	W(mov)	pc, lr				@ CP#14 (Debug)

	W(mov)	pc, lr				@ CP#15 (Control)

	movw_pc	lr				@ CP#12

	movw_pc	lr				@ CP#13

	movw_pc	lr				@ CP#14 (Debug)

	movw_pc	lr				@ CP#15 (Control)



#ifdef CONFIG_NEON

	.align	6

arch/arm/kernel/entry-header.S

+15 −0
Original line number Diff line number Diff line
@@ -110,6 +110,13 @@ 
	mov	\rd, sp, lsr #13

	mov	\rd, \rd, lsl #13

	.endm



	@

	@ 32-bit wide "mov pc, reg"

	@

	.macro	movw_pc, reg

	mov	pc, \reg

	.endm

#else	/* CONFIG_THUMB2_KERNEL */

	.macro	svc_exit, rpsr

	clrex					@ clear the exclusive monitor
@@ -146,6 +153,14 @@ 
	lsr	\rd, \rd, #13

	mov	\rd, \rd, lsl #13

	.endm



	@

	@ 32-bit wide "mov pc, reg"

	@

	.macro	movw_pc, reg

	mov	pc, \reg

	nop

	.endm

#endif	/* !CONFIG_THUMB2_KERNEL */



/*

CRA Git | Maintained and supported by SUSTech CRA and CCSE