Commit 85082fd7 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

* 'for-linus' of master.kernel.org:/home/rmk/linux-2.6-arm: (241 commits)
  [ARM] 5171/1: ep93xx: fix compilation of modules using clocks
  [ARM] 5133/2: at91sam9g20 defconfig file
  [ARM] 5130/4: Support for the at91sam9g20
  [ARM] 5160/1: IOP3XX: gpio/gpiolib support
  [ARM] at91: Fix NAND FLASH timings for at91sam9x evaluation kits.
  [ARM] 5084/1: zylonite: Register AC97 device
  [ARM] 5085/2: PXA: Move AC97 over to the new central device declaration model
  [ARM] 5120/1: pxa: correct platform driver names for PXA25x and PXA27x UDC drivers
  [ARM] 5147/1: pxaficp_ir: drop pxa_gpio_mode calls, as pin setting
  [ARM] 5145/1: PXA2xx: provide api to control IrDA pins state
  [ARM] 5144/1: pxaficp_ir: cleanup includes
  [ARM] pxa: remove pxa_set_cken()
  [ARM] pxa: allow clk aliases
  [ARM] Feroceon: don't disable BPU on boot
  [ARM] Orion: LED support for HP mv2120
  [ARM] Orion: add RD88F5181L-FXO support
  [ARM] Orion: add RD88F5181L-GE support
  [ARM] Orion: add Netgear WNR854T support
  [ARM] s3c2410_defconfig: update for current build
  [ARM] Acer n30: Minor style and indentation fixes.
  ...
parents 666484f0 53ffe3b4

Documentation/kernel-parameters.txt

+5 −0
Original line number Original line Diff line number Diff line
@@ -1242,6 +1242,11 @@ and is between 256 and 4096 characters. It is defined in the file 
	mtdparts=	[MTD]

	mtdparts=	[MTD]

			See drivers/mtd/cmdlinepart.c.

			See drivers/mtd/cmdlinepart.c.





	mtdset=		[ARM]

			ARM/S3C2412 JIVE boot control



			See arch/arm/mach-s3c2412/mach-jive.c



	mtouchusb.raw_coordinates=

	mtouchusb.raw_coordinates=

			[HW] Make the MicroTouch USB driver use raw coordinates

			[HW] Make the MicroTouch USB driver use raw coordinates

			('y', default) or cooked coordinates ('n')

			('y', default) or cooked coordinates ('n')

arch/arm/Kconfig

+58 −30
Original line number Original line Diff line number Diff line
@@ -24,6 +24,9 @@ config ARM 
	  Europe.  There is an ARM Linux project with a web page at

	  Europe.  There is an ARM Linux project with a web page at

	  <http://www.arm.linux.org.uk/>.

	  <http://www.arm.linux.org.uk/>.





config HAVE_PWM

	bool



config SYS_SUPPORTS_APM_EMULATION

config SYS_SUPPORTS_APM_EMULATION

	bool

	bool
@@ -86,6 +89,11 @@ config STACKTRACE_SUPPORT 
	bool

	bool

	default y

	default y





config HAVE_LATENCYTOP_SUPPORT

	bool

	depends on !SMP

	default y



config LOCKDEP_SUPPORT

config LOCKDEP_SUPPORT

	bool

	bool

	default y

	default y
@@ -149,6 +157,10 @@ config FIQ 
config ARCH_MTD_XIP

config ARCH_MTD_XIP

	bool

	bool





config GENERIC_HARDIRQS_NO__DO_IRQ

	bool

	def_bool y



if OPROFILE

if OPROFILE





config OPROFILE_ARMV6

config OPROFILE_ARMV6
@@ -234,13 +246,6 @@ config ARCH_CLPS711X 
	help

	help

	  Support for Cirrus Logic 711x/721x based boards.

	  Support for Cirrus Logic 711x/721x based boards.





config ARCH_CO285

	bool "Co-EBSA285"

	select FOOTBRIDGE

	select FOOTBRIDGE_ADDIN

	help

	  Support for Intel's EBSA285 companion chip.



config ARCH_EBSA110

config ARCH_EBSA110

	bool "EBSA-110"

	bool "EBSA-110"

	select ISA

	select ISA
@@ -301,6 +306,8 @@ config ARCH_IOP32X 
	depends on MMU

	depends on MMU

	select PLAT_IOP

	select PLAT_IOP

	select PCI

	select PCI

	select GENERIC_GPIO

	select HAVE_GPIO_LIB

	help

	help

	  Support for Intel's 80219 and IOP32X (XScale) family of

	  Support for Intel's 80219 and IOP32X (XScale) family of

	  processors.

	  processors.
@@ -310,6 +317,8 @@ config ARCH_IOP33X 
	depends on MMU

	depends on MMU

	select PLAT_IOP

	select PLAT_IOP

	select PCI

	select PCI

	select GENERIC_GPIO

	select HAVE_GPIO_LIB

	help

	help

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

	  Support for Intel's IOP33X (XScale) family of processors.
@@ -349,6 +358,16 @@ config ARCH_L7200 
	  If you have any questions or comments about the Linux kernel port

	  If you have any questions or comments about the Linux kernel port

	  to this board, send e-mail to <sjhill@cotw.com>.

	  to this board, send e-mail to <sjhill@cotw.com>.





config ARCH_KIRKWOOD

	bool "Marvell Kirkwood"

	select PCI

	select GENERIC_TIME

	select GENERIC_CLOCKEVENTS

	select PLAT_ORION

	help

	  Support for the following Marvell Kirkwood series SoCs:

	  88F6180, 88F6192 and 88F6281.



config ARCH_KS8695

config ARCH_KS8695

	bool "Micrel/Kendin KS8695"

	bool "Micrel/Kendin KS8695"

	select GENERIC_GPIO

	select GENERIC_GPIO
@@ -367,9 +386,31 @@ config ARCH_NS9XXX 




	  <http://www.digi.com/products/microprocessors/index.jsp>

	  <http://www.digi.com/products/microprocessors/index.jsp>





config ARCH_LOKI

	bool "Marvell Loki (88RC8480)"

	select GENERIC_TIME

	select GENERIC_CLOCKEVENTS

	select PLAT_ORION

	help

	  Support for the Marvell Loki (88RC8480) SoC.



config ARCH_MV78XX0

	bool "Marvell MV78xx0"

	select PCI

	select GENERIC_TIME

	select GENERIC_CLOCKEVENTS

	select PLAT_ORION

	help

	  Support for the following Marvell MV78xx0 series SoCs:

	  MV781x0, MV782x0.



config ARCH_MXC

config ARCH_MXC

	bool "Freescale MXC/iMX-based"

	bool "Freescale MXC/iMX-based"

	select GENERIC_TIME

	select GENERIC_CLOCKEVENTS

	select ARCH_MTD_XIP

	select ARCH_MTD_XIP

	select GENERIC_GPIO

	select HAVE_GPIO_LIB

	help

	help

	  Support for Freescale MXC/iMX-based family of processors

	  Support for Freescale MXC/iMX-based family of processors
@@ -383,7 +424,8 @@ config ARCH_ORION5X 
	select PLAT_ORION

	select PLAT_ORION

	help

	help

	  Support for the following Marvell Orion 5x series SoCs:

	  Support for the following Marvell Orion 5x series SoCs:

	  Orion-1 (5181), Orion-NAS (5182), Orion-2 (5281.)

	  Orion-1 (5181), Orion-VoIP (5181L), Orion-NAS (5182),

	  Orion-2 (5281).





config ARCH_PNX4008

config ARCH_PNX4008

	bool "Philips Nexperia PNX4008 Mobile"

	bool "Philips Nexperia PNX4008 Mobile"
@@ -408,6 +450,7 @@ config ARCH_RPC 
	select FIQ

	select FIQ

	select TIMER_ACORN

	select TIMER_ACORN

	select ARCH_MAY_HAVE_PC_FDC

	select ARCH_MAY_HAVE_PC_FDC

	select HAVE_PATA_PLATFORM

	select ISA_DMA_API

	select ISA_DMA_API

	select NO_IOPORT

	select NO_IOPORT

	help

	help
@@ -504,6 +547,10 @@ source "arch/arm/mach-ixp2000/Kconfig" 




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

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





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



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



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

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





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

source "arch/arm/mach-sa1100/Kconfig"
@@ -516,6 +563,8 @@ source "arch/arm/mach-omap2/Kconfig" 




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

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





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



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

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

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

source "arch/arm/plat-s3c/Kconfig"
@@ -705,27 +754,6 @@ config PREEMPT 
	  Say Y here if you are building a kernel for a desktop, embedded

	  Say Y here if you are building a kernel for a desktop, embedded

	  or real-time system.  Say N if you are unsure.

	  or real-time system.  Say N if you are unsure.





config NO_IDLE_HZ

	bool "Dynamic tick timer"

	depends on !GENERIC_CLOCKEVENTS

	help

	  Select this option if you want to disable continuous timer ticks

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

	  power as the system can remain in idle state for longer.



	  By default dynamic tick is disabled during the boot, and can be

	  manually enabled with:



	    echo 1 > /sys/devices/system/timer/timer0/dyn_tick



	  Alternatively, if you want dynamic tick automatically enabled

	  during boot, pass "dyntick=enable" via the kernel command string.



	  Please note that dynamic tick may affect the accuracy of

	  timekeeping on some platforms depending on the implementation.

	  Currently at least OMAP, PXA2xx and SA11x0 platforms are known

	  to have accurate timekeeping with dynamic tick.



config HZ

config HZ

	int

	int

	default 128 if ARCH_L7200

	default 128 if ARCH_L7200
@@ -791,7 +819,7 @@ source "mm/Kconfig" 




config LEDS

config LEDS

	bool "Timer and CPU usage LEDs"

	bool "Timer and CPU usage LEDs"

	depends on ARCH_CDB89712 || ARCH_CO285 || ARCH_EBSA110 || \

	depends on ARCH_CDB89712 || ARCH_EBSA110 || \

		   ARCH_EBSA285 || ARCH_IMX || ARCH_INTEGRATOR || \

		   ARCH_EBSA285 || ARCH_IMX || ARCH_INTEGRATOR || \

		   ARCH_LUBBOCK || MACH_MAINSTONE || ARCH_NETWINDER || \

		   ARCH_LUBBOCK || MACH_MAINSTONE || ARCH_NETWINDER || \

		   ARCH_OMAP || ARCH_P720T || ARCH_PXA_IDP || \

		   ARCH_OMAP || ARCH_P720T || ARCH_PXA_IDP || \

arch/arm/Makefile

+4 −4
Original line number Original line Diff line number Diff line
@@ -100,8 +100,6 @@ textofs-y := 0x00008000 
  incdir-$(CONFIG_ARCH_CLPS7500)   := cl7500

  incdir-$(CONFIG_ARCH_CLPS7500)   := cl7500

 machine-$(CONFIG_FOOTBRIDGE)	   := footbridge

 machine-$(CONFIG_FOOTBRIDGE)	   := footbridge

  incdir-$(CONFIG_FOOTBRIDGE)	   := ebsa285

  incdir-$(CONFIG_FOOTBRIDGE)	   := ebsa285

 machine-$(CONFIG_ARCH_CO285)	   := footbridge

  incdir-$(CONFIG_ARCH_CO285)	   := ebsa285

 machine-$(CONFIG_ARCH_SHARK)	   := shark

 machine-$(CONFIG_ARCH_SHARK)	   := shark

 machine-$(CONFIG_ARCH_SA1100)	   := sa1100

 machine-$(CONFIG_ARCH_SA1100)	   := sa1100

ifeq ($(CONFIG_ARCH_SA1100),y)

ifeq ($(CONFIG_ARCH_SA1100),y)
@@ -135,11 +133,15 @@ endif 
 machine-$(CONFIG_ARCH_NETX)	   := netx

 machine-$(CONFIG_ARCH_NETX)	   := netx

 machine-$(CONFIG_ARCH_NS9XXX)	   := ns9xxx

 machine-$(CONFIG_ARCH_NS9XXX)	   := ns9xxx

 machine-$(CONFIG_ARCH_DAVINCI)	   := davinci

 machine-$(CONFIG_ARCH_DAVINCI)	   := davinci

 machine-$(CONFIG_ARCH_KIRKWOOD)   := kirkwood

 machine-$(CONFIG_ARCH_KS8695)     := ks8695

 machine-$(CONFIG_ARCH_KS8695)     := ks8695

  incdir-$(CONFIG_ARCH_MXC)	   := mxc

  incdir-$(CONFIG_ARCH_MXC)	   := mxc

 machine-$(CONFIG_ARCH_MX2)	   := mx2

 machine-$(CONFIG_ARCH_MX3)	   := mx3

 machine-$(CONFIG_ARCH_MX3)	   := mx3

 machine-$(CONFIG_ARCH_ORION5X)	   := orion5x

 machine-$(CONFIG_ARCH_ORION5X)	   := orion5x

 machine-$(CONFIG_ARCH_MSM7X00A)   := msm

 machine-$(CONFIG_ARCH_MSM7X00A)   := msm

 machine-$(CONFIG_ARCH_LOKI)       := loki

 machine-$(CONFIG_ARCH_MV78XX0)    := mv78xx0





ifeq ($(CONFIG_ARCH_EBSA110),y)

ifeq ($(CONFIG_ARCH_EBSA110),y)

# This is what happens if you forget the IOCS16 line.

# This is what happens if you forget the IOCS16 line.
@@ -190,8 +192,6 @@ core-$(CONFIG_PLAT_S3C24XX) += arch/arm/plat-s3c24xx/ 
core-$(CONFIG_ARCH_MXC)		+= arch/arm/plat-mxc/

core-$(CONFIG_ARCH_MXC)		+= arch/arm/plat-mxc/





drivers-$(CONFIG_OPROFILE)      += arch/arm/oprofile/

drivers-$(CONFIG_OPROFILE)      += arch/arm/oprofile/

drivers-$(CONFIG_ARCH_CLPS7500)	+= drivers/acorn/char/

drivers-$(CONFIG_ARCH_L7200)	+= drivers/acorn/char/





libs-y				:= arch/arm/lib/ $(libs-y)

libs-y				:= arch/arm/lib/ $(libs-y)

arch/arm/boot/compressed/head.S

+2 −2
Original line number Original line Diff line number Diff line
@@ -623,8 +623,8 @@ proc_types: 
		b	__armv4_mmu_cache_off

		b	__armv4_mmu_cache_off

		b	__armv4_mmu_cache_flush

		b	__armv4_mmu_cache_flush





		.word	0x56055310		@ Feroceon

		.word	0x56050000		@ Feroceon

		.word	0xfffffff0

		.word	0xff0f0000

		b	__armv4_mmu_cache_on

		b	__armv4_mmu_cache_on

		b	__armv4_mmu_cache_off

		b	__armv4_mmu_cache_off

		b	__armv5tej_mmu_cache_flush

		b	__armv5tej_mmu_cache_flush

arch/arm/common/Makefile

+0 −1
Original line number Original line Diff line number Diff line
@@ -2,7 +2,6 @@ 
# Makefile for the linux kernel.

# Makefile for the linux kernel.

#

#





obj-y				+= rtctime.o

obj-$(CONFIG_ARM_GIC)		+= gic.o

obj-$(CONFIG_ARM_GIC)		+= gic.o

obj-$(CONFIG_ARM_VIC)		+= vic.o

obj-$(CONFIG_ARM_VIC)		+= vic.o

obj-$(CONFIG_ICST525)		+= icst525.o

obj-$(CONFIG_ICST525)		+= icst525.o

CRA Git | Maintained and supported by SUSTech CRA and CCSE