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

Commit 6f95416e authored by Russell King's avatar Russell King Committed by Russell King
Browse files

Merge branches 'arm-mm', 'at91', 'clkevts', 'imx', 'iop', 'misc', 'netx',... 

Merge branches 'arm-mm', 'at91', 'clkevts', 'imx', 'iop', 'misc', 'netx', 'ns9xxx', 'omap', 'pxa', 'rpc', 's3c' and 'sa1100' into devel
parents 3603ab2b 93afa752 075192ae ff4bfb21 ad902cb9 1b116522 fe7fdb80 13ea55b0 fcf126d8 7053acbd 5559bca8 d0fdb5a5 d0a9d75b

Documentation/spi/pxa2xx

+1 −1
Original line number Original line Diff line number Diff line
@@ -62,7 +62,7 @@ static struct resource pxa_spi_nssp_resources[] = { 




static struct pxa2xx_spi_master pxa_nssp_master_info = {

static struct pxa2xx_spi_master pxa_nssp_master_info = {

	.ssp_type = PXA25x_NSSP, /* Type of SSP */

	.ssp_type = PXA25x_NSSP, /* Type of SSP */

	.clock_enable = CKEN9_NSSP, /* NSSP Peripheral clock */

	.clock_enable = CKEN_NSSP, /* NSSP Peripheral clock */

	.num_chipselect = 1, /* Matches the number of chips attached to NSSP */

	.num_chipselect = 1, /* Matches the number of chips attached to NSSP */

	.enable_dma = 1, /* Enables NSSP DMA */

	.enable_dma = 1, /* Enables NSSP DMA */

};

};

arch/arm/Kconfig

+20 −0
Original line number Original line Diff line number Diff line
@@ -29,6 +29,10 @@ config GENERIC_TIME 
	bool

	bool

	default n

	default n





config GENERIC_CLOCKEVENTS

	bool

	default n



config MMU

config MMU

	bool

	bool

	default y

	default y
@@ -67,6 +71,14 @@ config GENERIC_HARDIRQS 
	bool

	bool

	default y

	default y





config STACKTRACE_SUPPORT

	bool

	default y



config LOCKDEP_SUPPORT

	bool

	default y



config TRACE_IRQFLAGS_SUPPORT

config TRACE_IRQFLAGS_SUPPORT

	bool

	bool

	default y

	default y
@@ -162,6 +174,8 @@ config ARCH_VERSATILE 
	select ARM_AMBA

	select ARM_AMBA

	select ARM_VIC

	select ARM_VIC

	select ICST307

	select ICST307

	select GENERIC_TIME

	select GENERIC_CLOCKEVENTS

	help

	help

	  This enables support for ARM Ltd Versatile board.

	  This enables support for ARM Ltd Versatile board.
@@ -262,6 +276,7 @@ config ARCH_IXP4XX 
	bool "IXP4xx-based"

	bool "IXP4xx-based"

	depends on MMU

	depends on MMU

	select GENERIC_TIME

	select GENERIC_TIME

	select GENERIC_CLOCKEVENTS

	help

	help

	  Support for Intel's IXP4XX (XScale) family of processors.

	  Support for Intel's IXP4XX (XScale) family of processors.
@@ -363,6 +378,7 @@ config ARCH_LH7A40X 
config ARCH_OMAP

config ARCH_OMAP

	bool "TI OMAP"

	bool "TI OMAP"

	select GENERIC_GPIO

	select GENERIC_GPIO

	select GENERIC_TIME

	help

	help

	  Support for TI's OMAP platform (OMAP1 and OMAP2).

	  Support for TI's OMAP platform (OMAP1 and OMAP2).
@@ -513,6 +529,8 @@ endmenu 




menu "Kernel Features"

menu "Kernel Features"





source "kernel/time/Kconfig"



config SMP

config SMP

	bool "Symmetric Multi-Processing (EXPERIMENTAL)"

	bool "Symmetric Multi-Processing (EXPERIMENTAL)"

	depends on EXPERIMENTAL && REALVIEW_MPCORE

	depends on EXPERIMENTAL && REALVIEW_MPCORE
@@ -572,6 +590,7 @@ config PREEMPT 




config NO_IDLE_HZ

config NO_IDLE_HZ

	bool "Dynamic tick timer"

	bool "Dynamic tick timer"

	depends on !GENERIC_CLOCKEVENTS

	help

	help

	  Select this option if you want to disable continuous timer ticks

	  Select this option if you want to disable continuous timer ticks

	  and have them programmed to occur as required. This option saves

	  and have them programmed to occur as required. This option saves
@@ -669,6 +688,7 @@ config LEDS_TIMER 
	bool "Timer LED" if (!ARCH_CDB89712 && !ARCH_OMAP) || \

	bool "Timer LED" if (!ARCH_CDB89712 && !ARCH_OMAP) || \

			    MACH_OMAP_H2 || MACH_OMAP_PERSEUS2

			    MACH_OMAP_H2 || MACH_OMAP_PERSEUS2

	depends on LEDS

	depends on LEDS

	depends on !GENERIC_CLOCKEVENTS

	default y if ARCH_EBSA110

	default y if ARCH_EBSA110

	help

	help

	  If you say Y here, one of the system LEDs (the green one on the

	  If you say Y here, one of the system LEDs (the green one on the

arch/arm/boot/compressed/head-at91rm9200.S

+6 −0
Original line number Original line Diff line number Diff line
@@ -61,6 +61,12 @@ 
		cmp	r7, r3

		cmp	r7, r3

		beq	99f

		beq	99f





		@ picotux 200 : 963

		mov	r3,	#(MACH_TYPE_PICOTUX2XX & 0xff)

		orr	r3, r3, #(MACH_TYPE_PICOTUX2XX & 0xff00)

		cmp	r7, r3

		beq	99f



		@ Ajeco 1ARM : 1075

		@ Ajeco 1ARM : 1075

		mov	r3,	#(MACH_TYPE_ONEARM & 0xff)

		mov	r3,	#(MACH_TYPE_ONEARM & 0xff)

		orr	r3, r3, #(MACH_TYPE_ONEARM & 0xff00)

		orr	r3, r3, #(MACH_TYPE_ONEARM & 0xff00)

arch/arm/configs/picotux200_defconfig

0 → 100644
+1386 −0

File added.

Preview size limit exceeded, changes collapsed.

arch/arm/kernel/Makefile

+2 −2
Original line number Original line Diff line number Diff line
@@ -7,8 +7,8 @@ AFLAGS_head.o := -DTEXT_OFFSET=$(TEXT_OFFSET) 
# Object file lists.

# Object file lists.





obj-y		:= compat.o entry-armv.o entry-common.o irq.o \

obj-y		:= compat.o entry-armv.o entry-common.o irq.o \

		   process.o ptrace.o semaphore.o setup.o signal.o sys_arm.o \

		   process.o ptrace.o semaphore.o setup.o signal.o \

		   time.o traps.o

		   sys_arm.o stacktrace.o time.o traps.o





obj-$(CONFIG_ISA_DMA_API)	+= dma.o

obj-$(CONFIG_ISA_DMA_API)	+= dma.o

obj-$(CONFIG_ARCH_ACORN)	+= ecard.o 

obj-$(CONFIG_ARCH_ACORN)	+= ecard.o