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

Commit 636d1742 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'for-linus' of master.kernel.org:/home/rmk/linux-2.6-arm 

* 'for-linus' of master.kernel.org:/home/rmk/linux-2.6-arm: (226 commits)
  ARM: 6323/1: cam60: don't use __init for cam60_spi_{flash_platform_data,partitions}
  ARM: 6324/1: cam60: move cam60_spi_devices to .init.data
  ARM: 6322/1: imx/pca100: Fix name of spi platform data
  ARM: 6321/1: fix syntax error in main Kconfig file
  ARM: 6297/1: move U300 timer to dynamic clock lookup
  ARM: 6296/1: clock U300 intcon and timer properly
  ARM: 6295/1: fix U300 apb_pclk split
  ARM: 6306/1: fix inverted MMC card detect in U300
  ARM: 6299/1: errata: TLBIASIDIS and TLBIMVAIS operations can broadcast a faulty ASID
  ARM: 6294/1: etm: do a dummy read from OSSRR during initialization
  ARM: 6292/1: coresight: add ETM management registers
  ARM: 6288/1: ftrace: document mcount formats
  ARM: 6287/1: ftrace: clean up mcount assembly indentation
  ARM: 6286/1: fix Thumb-2 decompressor broken by "Auto calculate ZRELADDR"
  ARM: 6281/1: video/imxfb.c: allow usage without BACKLIGHT_CLASS_DEVICE
  ARM: 6280/1: imx: Fix build failure when including <mach/gpio.h> without <linux/spinlock.h>
  ARM: S5PV210: Fix on missing s3c-sdhci card detection method for hsmmc3
  ARM: S5P: Fix on missing S5P_DEV_FIMC in plat-s5p/Kconfig
  ARM: S5PV210: Override FIMC driver name on Aquila board
  ARM: S5PC100: enable FIMC on SMDKC100
  ...

Fix up conflicts in arch/arm/mach-{s5pc100,s5pv210}/cpu.c due to
different subsystem 'setname' calls, and trivial port types in
include/linux/serial_core.h
parents dd21e9bd 0b019a41

MAINTAINERS

+15 −6
Original line number Diff line number Diff line
@@ -616,10 +616,10 @@ M: Richard Purdie <rpurdie@rpsys.net> 
S:	Maintained



ARM/CORTINA SYSTEMS GEMINI ARM ARCHITECTURE

M:	Paulius Zaleckas <paulius.zaleckas@gmail.com>

M:	Hans Ulli Kroll <ulli.kroll@googlemail.com>

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

T:	git git://gitorious.org/linux-gemini/mainline.git

S:	Odd Fixes

T:	git git://git.berlios.de/gemini-board

S:	Maintained

F:	arch/arm/mach-gemini/



ARM/EBSA110 MACHINE SUPPORT
@@ -641,9 +641,10 @@ T: topgit git://git.openezx.org/openezx.git 
F:	arch/arm/mach-pxa/ezx.c



ARM/FARADAY FA526 PORT

M:	Paulius Zaleckas <paulius.zaleckas@gmail.com>

M:	Hans Ulli Kroll <ulli.kroll@googlemail.com>

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

S:	Odd Fixes

S:	Maintained

T:	git://git.berlios.de/gemini-board

F:	arch/arm/mm/*-fa*



ARM/FOOTBRIDGE ARCHITECTURE
@@ -692,6 +693,13 @@ T: git git://git.kernel.org/pub/scm/linux/kernel/git/kristoffer/linux-hpc.git 
F:	arch/arm/mach-sa1100/jornada720.c

F:	arch/arm/mach-sa1100/include/mach/jornada720.h



ARM/INCOME PXA270 SUPPORT

M:	Marek Vasut <marek.vasut@gmail.com>

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

S:	Maintained

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

F:	arch/arm/mach-pxa/include/mach-pxa/income.h



ARM/INTEL IOP32X ARM ARCHITECTURE

M:	Lennert Buytenhek <kernel@wantstofly.org>

M:	Dan Williams <dan.j.williams@intel.com>
@@ -947,8 +955,9 @@ ARM/SHMOBILE ARM ARCHITECTURE 
M:	Paul Mundt <lethal@linux-sh.org>

M:	Magnus Damm <magnus.damm@gmail.com>

L:	linux-sh@vger.kernel.org

T:	git git://git.kernel.org/pub/scm/linux/kernel/git/lethal/genesis-2.6.git

W:	http://oss.renesas.com

Q:	http://patchwork.kernel.org/project/linux-sh/list/

T:	git git://git.kernel.org/pub/scm/linux/kernel/git/lethal/genesis-2.6.git

S:	Supported

F:	arch/arm/mach-shmobile/

F:	drivers/sh/

arch/arm/Kconfig

+44 −7
Original line number Diff line number Diff line
@@ -644,6 +644,7 @@ config ARCH_S3C2410 
	select ARCH_HAS_CPUFREQ

	select HAVE_CLK

	select ARCH_USES_GETTIMEOFFSET

	select HAVE_S3C2410_I2C

	help

	  Samsung S3C2410X CPU based systems, such as the Simtec Electronics

	  BAST (<http://www.simtec.co.uk/products/EB110ITX/>), the IPAQ 1940 or
@@ -673,6 +674,8 @@ config ARCH_S3C64XX 
	select S3C_DEV_NAND

	select USB_ARCH_HAS_OHCI

	select SAMSUNG_GPIOLIB_4BIT

	select HAVE_S3C2410_I2C

	select HAVE_S3C2410_WATCHDOG

	help

	  Samsung S3C64XX series based systems
@@ -681,7 +684,10 @@ config ARCH_S5P6440 
	select CPU_V6

	select GENERIC_GPIO

	select HAVE_CLK

	select HAVE_S3C2410_WATCHDOG

	select ARCH_USES_GETTIMEOFFSET

	select HAVE_S3C2410_I2C

	select HAVE_S3C_RTC

	help

	  Samsung S5P6440 CPU based systems
@@ -691,6 +697,7 @@ config ARCH_S5P6442 
	select GENERIC_GPIO

	select HAVE_CLK

	select ARCH_USES_GETTIMEOFFSET

	select HAVE_S3C2410_WATCHDOG

	help

	  Samsung S5P6442 CPU based systems
@@ -701,6 +708,9 @@ config ARCH_S5PC100 
	select CPU_V7

	select ARM_L1_CACHE_SHIFT_6

	select ARCH_USES_GETTIMEOFFSET

	select HAVE_S3C2410_I2C

	select HAVE_S3C_RTC

	select HAVE_S3C2410_WATCHDOG

	help

	  Samsung S5PC100 series based systems
@@ -711,9 +721,21 @@ config ARCH_S5PV210 
	select HAVE_CLK

	select ARM_L1_CACHE_SHIFT_6

	select ARCH_USES_GETTIMEOFFSET

	select HAVE_S3C2410_I2C

	select HAVE_S3C_RTC

	select HAVE_S3C2410_WATCHDOG

	help

	  Samsung S5PV210/S5PC110 series based systems



config ARCH_S5PV310

	bool "Samsung S5PV310/S5PC210"

	select CPU_V7

	select GENERIC_GPIO

	select HAVE_CLK

	select GENERIC_CLOCKEVENTS

	help

	  Samsung S5PV310 series based systems



config ARCH_SHARK

	bool "Shark"

	select CPU_SA110
@@ -915,6 +937,8 @@ source "arch/arm/mach-s5pc100/Kconfig" 


source "arch/arm/mach-s5pv210/Kconfig"



source "arch/arm/mach-s5pv310/Kconfig"



source "arch/arm/mach-shmobile/Kconfig"



source "arch/arm/plat-stmp3xxx/Kconfig"
@@ -1040,6 +1064,18 @@ config PL310_ERRATA_588369 
	   is not correctly implemented in PL310 as clean lines are not

	   invalidated as a result of these operations. Note that this errata

	   uses Texas Instrument's secure monitor api.



config ARM_ERRATA_720789

	bool "ARM errata: TLBIASIDIS and TLBIMVAIS operations can broadcast a faulty ASID"

	depends on CPU_V7 && SMP

	help

	  This option enables the workaround for the 720789 Cortex-A9 (prior to

	  r2p0) erratum. A faulty ASID can be sent to the other CPUs for the

	  broadcasted CP15 TLB maintenance operations TLBIASIDIS and TLBIMVAIS.

	  As a consequence of this erratum, some TLB entries which should be

	  invalidated are not, resulting in an incoherency in the system page

	  tables. The workaround changes the TLB flushing routines to invalidate

	  entries regardless of the ASID.

endmenu



source "arch/arm/common/Kconfig"
@@ -1108,11 +1144,11 @@ config SMP 
	bool "Symmetric Multi-Processing (EXPERIMENTAL)"

	depends on EXPERIMENTAL && (REALVIEW_EB_ARM11MP || REALVIEW_EB_A9MP ||\

		 MACH_REALVIEW_PB11MP || MACH_REALVIEW_PBX || ARCH_OMAP4 ||\

		 ARCH_U8500 || ARCH_VEXPRESS_CA9X4 || ARCH_TEGRA)

		 ARCH_S5PV310 || ARCH_TEGRA || ARCH_U8500 || ARCH_VEXPRESS_CA9X4)

	depends on GENERIC_CLOCKEVENTS

	select USE_GENERIC_SMP_HELPERS

	select HAVE_ARM_SCU if (ARCH_REALVIEW || ARCH_OMAP4 || ARCH_U8500 || \

		 ARCH_VEXPRESS_CA9X4 || ARCH_TEGRA)

	select HAVE_ARM_SCU if ARCH_REALVIEW || ARCH_OMAP4 || ARCH_S5PV310 ||\

		 ARCH_TEGRA || ARCH_U8500 || ARCH_VEXPRESS_CA9X4

	help

	  This enables support for systems with more than one CPU. If you have

	  a system with only one CPU, like most personal computers, say N. If
@@ -1182,10 +1218,10 @@ config LOCAL_TIMERS 
	bool "Use local timer interrupts"

	depends on SMP && (REALVIEW_EB_ARM11MP || MACH_REALVIEW_PB11MP || \

		REALVIEW_EB_A9MP || MACH_REALVIEW_PBX || ARCH_OMAP4 || \

		ARCH_U8500 || ARCH_VEXPRESS_CA9X4 || ARCH_TEGRA)

		ARCH_S5PV310 || ARCH_TEGRA || ARCH_U8500 || ARCH_VEXPRESS_CA9X4)

	default y

	select HAVE_ARM_TWD if (ARCH_REALVIEW || ARCH_VEXPRESS || ARCH_OMAP4 || \\

		ARCH_U8500 || ARCH_TEGRA

	select HAVE_ARM_TWD if ARCH_REALVIEW || ARCH_OMAP4 || ARCH_S5PV310 || \

		ARCH_TEGRA || ARCH_U8500 || ARCH_VEXPRESS

	help

	  Enable support for local timers on SMP platforms, rather then the

	  legacy IPI broadcast method.  Local timers allows the system
@@ -1196,7 +1232,8 @@ source kernel/Kconfig.preempt 


config HZ

	int

	default 200 if ARCH_EBSA110 || ARCH_S3C2410 || ARCH_S5P6440 || ARCH_S5P6442 || ARCH_S5PV210

	default 200 if ARCH_EBSA110 || ARCH_S3C2410 || ARCH_S5P6440 || \

		ARCH_S5P6442 || ARCH_S5PV210 || ARCH_S5PV310

	default OMAP_32K_TIMER_HZ if ARCH_OMAP && OMAP_32K_TIMER

	default AT91_TIMER_HZ if ARCH_AT91

	default SHMOBILE_TIMER_HZ if ARCH_SHMOBILE

arch/arm/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -174,6 +174,7 @@ machine-$(CONFIG_ARCH_S5P6440) := s5p6440 
machine-$(CONFIG_ARCH_S5P6442)		:= s5p6442

machine-$(CONFIG_ARCH_S5PC100)		:= s5pc100

machine-$(CONFIG_ARCH_S5PV210)		:= s5pv210

machine-$(CONFIG_ARCH_S5PV310)		:= s5pv310

machine-$(CONFIG_ARCH_SA1100)		:= sa1100

machine-$(CONFIG_ARCH_SHARK)		:= shark

machine-$(CONFIG_ARCH_SHMOBILE) 	:= shmobile

arch/arm/boot/compressed/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -33,7 +33,7 @@ ifeq ($(CONFIG_CPU_XSCALE),y) 
OBJS		+= head-xscale.o

endif



ifeq ($(CONFIG_PXA_SHARPSL),y)

ifeq ($(CONFIG_PXA_SHARPSL_DETECT_MACH_ID),y)

OBJS		+= head-sharpsl.o

endif

arch/arm/boot/compressed/head.S

+2 −3
Original line number Diff line number Diff line
@@ -170,9 +170,8 @@ not_angel: 


		.text

		adr	r0, LC0

 ARM(		ldmia	r0, {r1, r2, r3, r5, r6, r11, ip, sp})

 THUMB(		ldmia	r0, {r1, r2, r3, r5, r6, r11, ip}	)

 THUMB(		ldr	sp, [r0, #32]				)

		ldmia	r0, {r1, r2, r3, r5, r6, r11, ip}

		ldr	sp, [r0, #28]

#ifdef CONFIG_AUTO_ZRELADDR

		@ determine final kernel image address

		and	r4, pc, #0xf8000000