Merge branch 'for-linus' of git://ftp.arm.linux.org.uk/pub/linux/arm/kernel/git-cur/linux-2.6-arm

ff000000	ffbfffff	Reserved for future expansion of DMA

				mapping region.

VMALLOC_END	feffffff	Free for platform use, recommended.

				VMALLOC_END must be aligned to a 2MB

				boundary.

VMALLOC_START	VMALLOC_END-1	vmalloc() / ioremap() space.

				Memory returned by vmalloc/ioremap will

				be dynamically placed in this region.

				VMALLOC_START may be based upon the value

				of the high_memory variable.

				Machine specific static mappings are also

				located here through iotable_init().

				VMALLOC_START is based upon the value

				of the high_memory variable, and VMALLOC_END

				is equal to 0xff000000.

PAGE_OFFSET	high_memory-1	Kernel direct-mapped RAM region.

				This maps the platforms RAM, and typically

- interrupts	: Interrupt source of the parent interrupt controller. Only

  present on secondary GICs.

- cpu-offset	: per-cpu offset within the distributor and cpu interface

  regions, used when the GIC doesn't have banked registers. The offset is

  cpu-offset * cpu-nr.

Example:

	intc: interrupt-controller@fff11000 {

* ARM Vectored Interrupt Controller

One or more Vectored Interrupt Controllers (VIC's) can be connected in an ARM

system for interrupt routing.  For multiple controllers they can either be

nested or have the outputs wire-OR'd together.

Required properties:

- compatible : should be one of

	"arm,pl190-vic"

	"arm,pl192-vic"

- interrupt-controller : Identifies the node as an interrupt controller

- #interrupt-cells : The number of cells to define the interrupts.  Must be 1 as

  the VIC has no configuration options for interrupt sources.  The cell is a u32

  and defines the interrupt number.

- reg : The register bank for the VIC.

Optional properties:

- interrupts : Interrupt source for parent controllers if the VIC is nested.

Example:

	vic0: interrupt-controller@60000 {

		compatible = "arm,pl192-vic";

		interrupt-controller;

		#interrupt-cells = <1>;

		reg = <0x60000 0x1000>;

	};

F:	arch/arm/mach-shmobile/

F:	drivers/sh/

ARM/TELECHIPS ARM ARCHITECTURE

M:	"Hans J. Koch" <hjk@hansjkoch.de>

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

S:	Maintained

F:	arch/arm/plat-tcc/

F:	arch/arm/mach-tcc8k/

ARM/TECHNOLOGIC SYSTEMS TS7250 MACHINE SUPPORT

M:	Lennert Buytenhek <kernel@wantstofly.org>

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

	select ARCH_HAS_CPUFREQ

	select CLKDEV_LOOKUP

	select HAVE_MACH_CLKDEV

	select HAVE_TCM

	select ICST

	select GENERIC_CLOCKEVENTS

	select PLAT_VERSATILE

	select ARM_AMBA

	select ARM_GIC

	select ARM_TIMER_SP804

	select CACHE_L2X0

	select CLKDEV_LOOKUP

	select CPU_V7

	select GENERIC_CLOCKEVENTS

	select HAVE_ARM_SCU

	select HAVE_SMP

	select USE_OF

	help

	  Support for the Calxeda Highbank SoC based boards.

	select CPU_V6K

	select GENERIC_CLOCKEVENTS

	select ARM_GIC

	select MIGHT_HAVE_CACHE_L2X0

	select MIGHT_HAVE_PCI

	select PCI_DOMAINS if PCI

	help

	select GENERIC_CLOCKEVENTS

	select CLKDEV_LOOKUP

	select GENERIC_IRQ_CHIP

	select MIGHT_HAVE_CACHE_L2X0

	select USE_OF

	select ZONE_DMA

	help

	select GENERIC_GPIO

	select HAVE_CLK

	select HAVE_SCHED_CLOCK

	select HAVE_SMP

	select MIGHT_HAVE_CACHE_L2X0

	select ARCH_HAS_CPUFREQ

	help

	  This enables support for NVIDIA Tegra based systems (Tegra APX,

	select HAVE_CLK

	select CLKDEV_LOOKUP

	select HAVE_MACH_CLKDEV

	select HAVE_SMP

	select GENERIC_CLOCKEVENTS

	select MIGHT_HAVE_CACHE_L2X0

	select NO_IOPORT

	select SPARSE_IRQ

	select MULTI_IRQ_HANDLER

	  Support for the StrongARM based Digital DNARD machine, also known

	  as "Shark" (<http://www.shark-linux.de/shark.html>).

config ARCH_TCC_926

	bool "Telechips TCC ARM926-based systems"

	select CLKSRC_MMIO

	select CPU_ARM926T

	select HAVE_CLK

	select CLKDEV_LOOKUP

	select GENERIC_CLOCKEVENTS

	help

	  Support for Telechips TCC ARM926-based systems.

config ARCH_U300

	bool "ST-Ericsson U300 Series"

	depends on MMU

	select CLKDEV_LOOKUP

	select ARCH_REQUIRE_GPIOLIB

	select ARCH_HAS_CPUFREQ

	select HAVE_SMP

	select MIGHT_HAVE_CACHE_L2X0

	help

	  Support for ST-Ericsson's Ux500 architecture

	select CPU_ARM926T

	select CLKDEV_LOOKUP

	select GENERIC_CLOCKEVENTS

	select MIGHT_HAVE_CACHE_L2X0

	select ARCH_REQUIRE_GPIOLIB

	help

	  Support for the Nomadik platform by ST-Ericsson

	select ARM_GIC

	select ARM_AMBA

	select ICST

	select MIGHT_HAVE_CACHE_L2X0

	select USE_OF

	help

	  Support for Xilinx Zynq ARM Cortex A9 Platform

source "arch/arm/plat-spear/Kconfig"

source "arch/arm/plat-tcc/Kconfig"

if ARCH_S3C2410

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

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

source arch/arm/mm/Kconfig

config ARM_NR_BANKS

	int

	default 16 if ARCH_EP93XX

	default 8

config IWMMXT

	bool "Enable iWMMXt support"

	depends on CPU_XSCALE || CPU_XSC3 || CPU_MOHAWK || CPU_PJ4

source "kernel/time/Kconfig"

config HAVE_SMP

	bool

	help

	  This option should be selected by machines which have an SMP-

	  capable CPU.

	  The only effect of this option is to make the SMP-related

	  options available to the user for configuration.

config SMP

	bool "Symmetric Multi-Processing"

	depends on CPU_V6K || CPU_V7

	depends on GENERIC_CLOCKEVENTS

	depends on REALVIEW_EB_ARM11MP || REALVIEW_EB_A9MP || \

		 MACH_REALVIEW_PB11MP || MACH_REALVIEW_PBX || ARCH_OMAP4 || \

		 ARCH_EXYNOS4 || ARCH_TEGRA || ARCH_U8500 || ARCH_VEXPRESS_CA9X4 || \

		 ARCH_MSM_SCORPIONMP || ARCH_SHMOBILE || ARCH_HIGHBANK || SOC_IMX6Q

	depends on HAVE_SMP

	depends on MMU

	select USE_GENERIC_SMP_HELPERS

	select HAVE_ARM_SCU if !ARCH_MSM_SCORPIONMP

	  accounting to be spread across the timer interval, preventing a

	  "thundering herd" at every timer tick.

config ARCH_NR_GPIO

	int

	default 1024 if ARCH_SHMOBILE || ARCH_TEGRA

	default 350 if ARCH_U8500

	default 0

	help

	  Maximum number of GPIOs in the system.

	  If unsure, leave the default value.

source kernel/Kconfig.preempt

config HZ

config XIP_KERNEL

	bool "Kernel Execute-In-Place from ROM"

	depends on !ZBOOT_ROM

	depends on !ZBOOT_ROM && !ARM_LPAE

	help

	  Execute-In-Place allows the kernel to run from non-volatile storage

	  directly addressable by the CPU, such as NOR flash. This saves RAM

config KEXEC

	bool "Kexec system call (EXPERIMENTAL)"

	depends on EXPERIMENTAL

	depends on EXPERIMENTAL && (!SMP || HOTPLUG_CPU)

	help

	  kexec is a system call that implements the ability to shutdown your

	  current kernel, and to start another kernel.  It is like a reboot