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

Commit 404a02cb authored by Russell King's avatar Russell King
Browse files

Merge branch 'devel-stable' into devel 

Conflicts:
	arch/arm/mach-pxa/clock.c
	arch/arm/mach-pxa/clock.h
parents 28cdac66 1051b9f0

arch/arm/Kconfig

+13 −2
Original line number Diff line number Diff line
@@ -364,6 +364,14 @@ config ARCH_MXC 
	help

	  Support for Freescale MXC/iMX-based family of processors



config ARCH_MXS

	bool "Freescale MXS-based"

	select GENERIC_CLOCKEVENTS

	select ARCH_REQUIRE_GPIOLIB

	select COMMON_CLKDEV

	help

	  Support for Freescale MXS-based family of processors



config ARCH_STMP3XXX

	bool "Freescale STMP3xxx"

	select CPU_ARM926T
@@ -817,6 +825,7 @@ config ARCH_U8500 
	select GENERIC_CLOCKEVENTS

	select CLKDEV_LOOKUP

	select ARCH_REQUIRE_GPIOLIB

	select ARCH_HAS_CPUFREQ

	help

	  Support for ST-Ericsson's Ux500 architecture
@@ -923,6 +932,8 @@ source "arch/arm/mach-mv78xx0/Kconfig" 


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



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



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



source "arch/arm/mach-nomadik/Kconfig"
@@ -1022,8 +1033,8 @@ source arch/arm/mm/Kconfig 


config IWMMXT

	bool "Enable iWMMXt support"

	depends on CPU_XSCALE || CPU_XSC3 || CPU_MOHAWK

	default y if PXA27x || PXA3xx || ARCH_MMP

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

	default y if PXA27x || PXA3xx || PXA95x || ARCH_MMP

	help

	  Enable support for iWMMXt context switching at run time if

	  running on a CPU that supports it.

arch/arm/Makefile

+2 −1
Original line number Diff line number Diff line
@@ -154,10 +154,11 @@ machine-$(CONFIG_ARCH_MSM) := msm 
machine-$(CONFIG_ARCH_MV78XX0)		:= mv78xx0

machine-$(CONFIG_ARCH_MX1)		:= imx

machine-$(CONFIG_ARCH_MX2)		:= imx

machine-$(CONFIG_ARCH_MX25)		:= mx25

machine-$(CONFIG_ARCH_MX25)		:= imx

machine-$(CONFIG_ARCH_MX3)		:= mx3

machine-$(CONFIG_ARCH_MX5)		:= mx5

machine-$(CONFIG_ARCH_MXC91231)		:= mxc91231

machine-$(CONFIG_ARCH_MXS)		:= mxs

machine-$(CONFIG_ARCH_NETX)		:= netx

machine-$(CONFIG_ARCH_NOMADIK)		:= nomadik

machine-$(CONFIG_ARCH_NS9XXX)		:= ns9xxx

arch/arm/configs/mx3_defconfig

+1 −0
Original line number Diff line number Diff line
@@ -84,6 +84,7 @@ CONFIG_SERIAL_IMX_CONSOLE=y 
CONFIG_I2C=y

CONFIG_I2C_CHARDEV=y

CONFIG_I2C_IMX=y

CONFIG_SPI=y

CONFIG_W1=y

CONFIG_W1_MASTER_MXC=y

CONFIG_W1_SLAVE_THERM=y

arch/arm/include/asm/hw_breakpoint.h

+2 −2
Original line number Diff line number Diff line
@@ -20,7 +20,7 @@ struct arch_hw_breakpoint_ctrl { 
struct arch_hw_breakpoint {

	u32	address;

	u32	trigger;

	struct perf_event *suspended_wp;

	struct	arch_hw_breakpoint_ctrl step_ctrl;

	struct	arch_hw_breakpoint_ctrl ctrl;

};

arch/arm/kernel/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -54,6 +54,7 @@ AFLAGS_crunch-bits.o := -Wa,-mcpu=ep9312 
obj-$(CONFIG_CPU_XSCALE)	+= xscale-cp0.o

obj-$(CONFIG_CPU_XSC3)		+= xscale-cp0.o

obj-$(CONFIG_CPU_MOHAWK)	+= xscale-cp0.o

obj-$(CONFIG_CPU_PJ4)		+= pj4-cp0.o

obj-$(CONFIG_IWMMXT)		+= iwmmxt.o

obj-$(CONFIG_CPU_HAS_PMU)	+= pmu.o

obj-$(CONFIG_HW_PERF_EVENTS)	+= perf_event.o