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

Commit a8c4c20d authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'devel' of master.kernel.org:/home/rmk/linux-2.6-arm 

* 'devel' of master.kernel.org:/home/rmk/linux-2.6-arm: (44 commits)
  [ARM] 3541/2: workaround for PXA27x erratum E7
  [ARM] nommu: provide a way for correct control register value selection
  [ARM] 3705/1: add supersection support to ioremap()
  [ARM] 3707/1: iwmmxt: use the generic thread notifier infrastructure
  [ARM] 3706/2: ep93xx: add cirrus logic edb9315a support
  [ARM] 3704/1: format IOP Kconfig with tabs, create more consistency
  [ARM] 3703/1: Add help description for ARCH_EP80219
  [ARM] 3678/1: MMC: Make OMAP MMC work
  [ARM] 3677/1: OMAP: Update H2 defconfig
  [ARM] 3676/1: ARM: OMAP: Fix dmtimers and timer32k to compile on OMAP1
  [ARM] Add section support to ioremap
  [ARM] Fix sa11x0 SDRAM selection
  [ARM] Set bit 4 on section mappings correctly depending on CPU
  [ARM] 3666/1: TRIZEPS4 [1/5] core
  ARM: OMAP: Multiplexing for 24xx GPMC wait pin monitoring
  ARM: OMAP: Fix SRAM to use MT_MEMORY instead of MT_DEVICE
  ARM: OMAP: Update dmtimers
  ARM: OMAP: Make clock variables static
  ARM: OMAP: Fix GPMC compilation when DEBUG is defined
  ARM: OMAP: Mux updates for external DMA and GPIO
  ...
parents 168d04b3 2dc7667b

arch/arm/Kconfig

+6 −6
Original line number Diff line number Diff line
@@ -121,11 +121,11 @@ config ARCH_VERSATILE 
	help

	  This enables support for ARM Ltd Versatile board.



config ARCH_AT91RM9200

	bool "Atmel AT91RM9200"

config ARCH_AT91

	bool "Atmel AT91"

	help

	  Say Y here if you intend to run this kernel on an Atmel

	  AT91RM9200-based board.

	  This enables support for systems based on the Atmel AT91RM9200

	  and AT91SAM9xxx processors.



config ARCH_CLPS7500

	bool "Cirrus CL-PS7500FE"
@@ -547,7 +547,7 @@ config LEDS 
		   ARCH_LUBBOCK || MACH_MAINSTONE || ARCH_NETWINDER || \

		   ARCH_OMAP || ARCH_P720T || ARCH_PXA_IDP || \

		   ARCH_SA1100 || ARCH_SHARK || ARCH_VERSATILE || \

		   ARCH_AT91RM9200

		   ARCH_AT91RM9200 || MACH_TRIZEPS4

	help

	  If you say Y here, the LEDs on your machine will be used

	  to provide useful information about your current system status.
@@ -678,7 +678,7 @@ config XIP_PHYS_ADDR 


endmenu



if (ARCH_SA1100 || ARCH_INTEGRATOR || ARCH_OMAP1)

if (ARCH_SA1100 || ARCH_INTEGRATOR || ARCH_OMAP)



menu "CPU Frequency scaling"

arch/arm/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -114,7 +114,7 @@ endif 
 machine-$(CONFIG_ARCH_H720X)	   := h720x

 machine-$(CONFIG_ARCH_AAEC2000)   := aaec2000

 machine-$(CONFIG_ARCH_REALVIEW)   := realview

 machine-$(CONFIG_ARCH_AT91RM9200) := at91rm9200

 machine-$(CONFIG_ARCH_AT91)       := at91rm9200

 machine-$(CONFIG_ARCH_EP93XX)     := ep93xx

 machine-$(CONFIG_ARCH_PNX4008)    := pnx4008

 machine-$(CONFIG_ARCH_NETX)       := netx

arch/arm/boot/compressed/head.S

+5 −2
Original line number Diff line number Diff line
@@ -447,8 +447,11 @@ __common_mmu_cache_on: 
		mov	r1, #-1

		mcr	p15, 0, r3, c2, c0, 0	@ load page table pointer

		mcr	p15, 0, r1, c3, c0, 0	@ load domain access control

		mcr	p15, 0, r0, c1, c0, 0	@ load control register

		mov	pc, lr

		b	1f

		.align	5			@ cache line aligned

1:		mcr	p15, 0, r0, c1, c0, 0	@ load control register

		mrc	p15, 0, r0, c1, c0, 0	@ and read it back to

		sub	pc, lr, r0, lsr #32	@ properly flush pipeline



/*

 * All code following this line is relocatable.  It is relocated by

arch/arm/configs/at91rm9200dk_defconfig

+1 −0
Original line number Diff line number Diff line
@@ -103,6 +103,7 @@ CONFIG_DEFAULT_IOSCHED="anticipatory" 
# CONFIG_ARCH_IMX is not set

# CONFIG_ARCH_H720X is not set

# CONFIG_ARCH_AAEC2000 is not set

CONFIG_ARCH_AT91=y

CONFIG_ARCH_AT91RM9200=y



#

arch/arm/configs/at91rm9200ek_defconfig

+1 −0
Original line number Diff line number Diff line
@@ -103,6 +103,7 @@ CONFIG_DEFAULT_IOSCHED="anticipatory" 
# CONFIG_ARCH_IMX is not set

# CONFIG_ARCH_H720X is not set

# CONFIG_ARCH_AAEC2000 is not set

CONFIG_ARCH_AT91=y

CONFIG_ARCH_AT91RM9200=y



#