Merge branches 'at91', 'ep93xx', 'etm', 'ks8695', 'nuc', 'u300' and 'u8500' into devel (e28edb72) · Commits · e / devices / android_kernel_teracube_emerald

MAINTAINERS

+6 −0

Original line number	Original line	Diff line number	Diff line
	@@ -923,6 +923,12 @@ L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
	W: http://www.mcuos.com		W: http://www.mcuos.com
	S: Maintained		S: Maintained

			ARM/U8500 ARM ARCHITECTURE
			M: Srinidhi Kasagar <srinidhi.kasagar@stericsson.com>
			L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
			S: Maintained
			F: arch/arm/mach-ux500/

	ARM/VFP SUPPORT		ARM/VFP SUPPORT
	M: Russell King <linux@arm.linux.org.uk>		M: Russell King <linux@arm.linux.org.uk>
	L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)		L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)

arch/arm/Kconfig

+17 −4

Original line number	Original line	Diff line number	Diff line
	@@ -702,6 +702,16 @@ config ARCH_BCMRING
	help		help
	Support for Broadcom's BCMRing platform.		Support for Broadcom's BCMRing platform.

			config ARCH_U8500
			bool "ST-Ericsson U8500 Series"
			select CPU_V7
			select ARM_AMBA
			select GENERIC_TIME
			select GENERIC_CLOCKEVENTS
			select COMMON_CLKDEV
			help
			Support for ST-Ericsson's Ux500 architecture

	endchoice		endchoice

	source "arch/arm/mach-clps711x/Kconfig"		source "arch/arm/mach-clps711x/Kconfig"
	@@ -787,6 +797,7 @@ source "arch/arm/mach-at91/Kconfig"
	source "arch/arm/plat-mxc/Kconfig"		source "arch/arm/plat-mxc/Kconfig"

	source "arch/arm/mach-nomadik/Kconfig"		source "arch/arm/mach-nomadik/Kconfig"
			source "arch/arm/plat-nomadik/Kconfig"

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

	@@ -804,6 +815,8 @@ source "arch/arm/mach-w90x900/Kconfig"

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

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

	# Definitions to make life easier		# Definitions to make life easier
	config ARCH_ACORN		config ARCH_ACORN
	bool		bool
	@@ -955,10 +968,10 @@ source "kernel/time/Kconfig"
	config SMP		config SMP
	bool "Symmetric Multi-Processing (EXPERIMENTAL)"		bool "Symmetric Multi-Processing (EXPERIMENTAL)"
	depends on EXPERIMENTAL && (REALVIEW_EB_ARM11MP \|\| REALVIEW_EB_A9MP \|\|\		depends on EXPERIMENTAL && (REALVIEW_EB_ARM11MP \|\| REALVIEW_EB_A9MP \|\|\
	MACH_REALVIEW_PB11MP \|\| MACH_REALVIEW_PBX \|\| ARCH_OMAP4)		MACH_REALVIEW_PB11MP \|\| MACH_REALVIEW_PBX \|\| ARCH_OMAP4 \|\| ARCH_U8500)
	depends on GENERIC_CLOCKEVENTS		depends on GENERIC_CLOCKEVENTS
	select USE_GENERIC_SMP_HELPERS		select USE_GENERIC_SMP_HELPERS
	select HAVE_ARM_SCU if (ARCH_REALVIEW \|\| ARCH_OMAP4)		select HAVE_ARM_SCU if (ARCH_REALVIEW \|\| ARCH_OMAP4 \|\| ARCH_U8500)
	help		help
	This enables support for systems with more than one CPU. If you have		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		a system with only one CPU, like most personal computers, say N. If
	@@ -1027,9 +1040,9 @@ config HOTPLUG_CPU
	config LOCAL_TIMERS		config LOCAL_TIMERS
	bool "Use local timer interrupts"		bool "Use local timer interrupts"
	depends on SMP && (REALVIEW_EB_ARM11MP \|\| MACH_REALVIEW_PB11MP \|\| \		depends on SMP && (REALVIEW_EB_ARM11MP \|\| MACH_REALVIEW_PB11MP \|\| \
	REALVIEW_EB_A9MP \|\| MACH_REALVIEW_PBX \|\| ARCH_OMAP4)		REALVIEW_EB_A9MP \|\| MACH_REALVIEW_PBX \|\| ARCH_OMAP4 \|\| ARCH_U8500)
	default y		default y
	select HAVE_ARM_TWD if (ARCH_REALVIEW \|\| ARCH_OMAP4)		select HAVE_ARM_TWD if (ARCH_REALVIEW \|\| ARCH_OMAP4 \|\| ARCH_U8500)
	help		help
	Enable support for local timers on SMP platforms, rather then the		Enable support for local timers on SMP platforms, rather then the
	legacy IPI broadcast method. Local timers allows the system		legacy IPI broadcast method. Local timers allows the system

arch/arm/Kconfig.debug

+8 −0

Original line number	Original line	Diff line number	Diff line
	@@ -83,6 +83,14 @@ config DEBUG_ICEDCC
	It does include a timeout to ensure that the system does not		It does include a timeout to ensure that the system does not
	totally freeze when there is nothing connected to read.		totally freeze when there is nothing connected to read.

			config OC_ETM
			bool "On-chip ETM and ETB"
			select ARM_AMBA
			help
			Enables the on-chip embedded trace macrocell and embedded trace
			buffer driver that will allow you to collect traces of the
			kernel code.

	config DEBUG_DC21285_PORT		config DEBUG_DC21285_PORT
	bool "Kernel low-level debugging messages via footbridge serial port"		bool "Kernel low-level debugging messages via footbridge serial port"
	depends on DEBUG_LL && FOOTBRIDGE		depends on DEBUG_LL && FOOTBRIDGE

arch/arm/Makefile

+2 −0

arch/arm/configs/at91rm9200dk_defconfig

+1 −0

Original line number	Original line	Diff line number	Diff line
	@@ -120,6 +120,7 @@ CONFIG_ARCH_AT91RM9200DK=y
	# CONFIG_MACH_CARMEVA is not set		# CONFIG_MACH_CARMEVA is not set
	# CONFIG_MACH_KB9200 is not set		# CONFIG_MACH_KB9200 is not set
	# CONFIG_MACH_ATEB9200 is not set		# CONFIG_MACH_ATEB9200 is not set
			CONFIG_MACH_ECO920=y

	#		#
	# AT91RM9200 Feature Selections		# AT91RM9200 Feature Selections

Original line number	Original line	Diff line number	Diff line
	@@ -166,6 +166,7 @@ machine-$(CONFIG_ARCH_SHARK) := shark
	machine-$(CONFIG_ARCH_STMP378X) := stmp378x		machine-$(CONFIG_ARCH_STMP378X) := stmp378x
	machine-$(CONFIG_ARCH_STMP37XX) := stmp37xx		machine-$(CONFIG_ARCH_STMP37XX) := stmp37xx
	machine-$(CONFIG_ARCH_U300) := u300		machine-$(CONFIG_ARCH_U300) := u300
			machine-$(CONFIG_ARCH_U8500) := ux500
	machine-$(CONFIG_ARCH_VERSATILE) := versatile		machine-$(CONFIG_ARCH_VERSATILE) := versatile
	machine-$(CONFIG_ARCH_W90X900) := w90x900		machine-$(CONFIG_ARCH_W90X900) := w90x900
	machine-$(CONFIG_FOOTBRIDGE) := footbridge		machine-$(CONFIG_FOOTBRIDGE) := footbridge
	@@ -176,6 +177,7 @@ machine-$(CONFIG_ARCH_MXC91231) := mxc91231
	plat-$(CONFIG_ARCH_MXC) := mxc		plat-$(CONFIG_ARCH_MXC) := mxc
	plat-$(CONFIG_ARCH_OMAP) := omap		plat-$(CONFIG_ARCH_OMAP) := omap
	plat-$(CONFIG_PLAT_IOP) := iop		plat-$(CONFIG_PLAT_IOP) := iop
			plat-$(CONFIG_PLAT_NOMADIK) := nomadik
	plat-$(CONFIG_PLAT_ORION) := orion		plat-$(CONFIG_PLAT_ORION) := orion
	plat-$(CONFIG_PLAT_PXA) := pxa		plat-$(CONFIG_PLAT_PXA) := pxa
	plat-$(CONFIG_PLAT_S3C24XX) := s3c24xx s3c		plat-$(CONFIG_PLAT_S3C24XX) := s3c24xx s3c