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

Commit 0b019a41 authored by Russell King's avatar Russell King
Browse files

Merge branches 'master' and 'devel' into for-linus 

Conflicts:
	arch/arm/Kconfig
	arch/arm/mm/Kconfig
parents 5f6878b0 054d5c92

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

+32 −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"
@@ -1120,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
@@ -1194,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
@@ -1208,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/common/it8152.c

+0 −8
Original line number Diff line number Diff line
@@ -263,14 +263,6 @@ static int it8152_pci_platform_notify_remove(struct device *dev) 
	return 0;

}



int dma_needs_bounce(struct device *dev, dma_addr_t dma_addr, size_t size)

{

	dev_dbg(dev, "%s: dma_addr %08x, size %08x\n",

		__func__, dma_addr, size);

	return (dev->bus == &pci_bus_type) &&

		((dma_addr + size - PHYS_OFFSET) >= SZ_64M);

}



int __init it8152_pci_setup(int nr, struct pci_sys_data *sys)

{

	it8152_io.start = IT8152_IO_BASE + 0x12000;