Commit 0fe41b89 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: (422 commits)
  [ARM] 5435/1: fix compile warning in sanity_check_meminfo()
  [ARM] 5434/1: ARM: OMAP: Fix mailbox compile for 24xx
  [ARM] pxa: fix the bad assumption that PCMCIA sockets always start with 0
  [ARM] pxa: fix Colibri PXA300 and PXA320 LCD backlight pins
  imxfb: Fix TFT mode
  i.MX21/27: remove ifdef CONFIG_FB_IMX
  imxfb: add clock support
  mxc: add arch_reset() function
  clkdev: add possibility to get a clock based on the device name
  i.MX1: remove fb support from mach-imx
  [ARM] pxa: build arch/arm/plat-pxa/mfp.c only when PXA3xx or ARCH_MMP defined
  Gemini: Add support for Teltonika RUT100
  Gemini: gpiolib based GPIO support v2
  MAINTAINERS: add myself as Gemini architecture maintainer
  ARM: Add Gemini architecture v3
  [ARM] OMAP: Fix compile for omap2_init_common_hw()
  MAINTAINERS: Add myself as Faraday ARM core variant maintainer
  ARM: Add support for FA526 v2
  [ARM] acorn,ebsa110,footbridge,integrator,sa1100: Convert asm/io.h to linux/io.h
  [ARM] collie: fix two minor formatting nits
  ...
parents eedf2c52 9759d22c

Documentation/arm/Samsung-S3C24XX/Suspend.txt

+4 −4
Original line number Diff line number Diff line
@@ -40,13 +40,13 @@ Resuming 
Machine Support

---------------



  The machine specific functions must call the s3c2410_pm_init() function

  The machine specific functions must call the s3c_pm_init() function

  to say that its bootloader is capable of resuming. This can be as

  simple as adding the following to the machine's definition:



  INITMACHINE(s3c2410_pm_init)

  INITMACHINE(s3c_pm_init)



  A board can do its own setup before calling s3c2410_pm_init, if it

  A board can do its own setup before calling s3c_pm_init, if it

  needs to setup anything else for power management support.



  There is currently no support for over-riding the default method of
@@ -74,7 +74,7 @@ statuc void __init machine_init(void) 


	enable_irq_wake(IRQ_EINT0);



	s3c2410_pm_init();

	s3c_pm_init();

}

Documentation/arm/memory.txt

+8 −1
Original line number Diff line number Diff line
@@ -29,7 +29,14 @@ ffff0000 ffff0fff CPU vector page. 
				CPU supports vector relocation (control

				register V bit.)



ffc00000	fffeffff	DMA memory mapping region.  Memory returned

fffe0000	fffeffff	XScale cache flush area.  This is used

				in proc-xscale.S to flush the whole data

				cache.  Free for other usage on non-XScale.



fff00000	fffdffff	Fixmap mapping region.  Addresses provided

				by fix_to_virt() will be located here.



ffc00000	ffefffff	DMA memory mapping region.  Memory returned

				by the dma_alloc_xxx functions will be

				dynamically mapped here.

Documentation/kernel-parameters.txt

+6 −0
Original line number Diff line number Diff line
@@ -836,6 +836,12 @@ and is between 256 and 4096 characters. It is defined in the file 
			       If specified, z/VM IUCV HVC accepts connections

			       from listed z/VM user IDs only.



	i2c_bus=	[HW] Override the default board specific I2C bus speed

			     or register an additional I2C bus that is not

			     registered from board initialization code.

			     Format:

			     <bus_id>,<clkrate>



	i8042.debug	[HW] Toggle i8042 debug mode

	i8042.direct	[HW] Put keyboard port into non-translated mode

	i8042.dumbkbd	[HW] Pretend that controller can only read data from

MAINTAINERS

+30 −1
Original line number Diff line number Diff line
@@ -502,6 +502,13 @@ P: Richard Purdie 
M:	rpurdie@rpsys.net

S:	Maintained



ARM/CORTINA SYSTEMS GEMINI ARM ARCHITECTURE

P:	Paulius Zaleckas

M:	paulius.zaleckas@teltonika.lt

L:	linux-arm-kernel@lists.arm.linux.org.uk (subscribers-only)

T:	git gitorious.org/linux-gemini/mainline.git

S:	Maintained



ARM/EZX SMARTPHONES (A780, A910, A1200, E680, ROKR E2 and ROKR E6)

P:	Daniel Ribeiro

M:	drwyrm@gmail.com
@@ -513,6 +520,12 @@ L: openezx-devel@lists.openezx.org (subscribers-only) 
W:	http://www.openezx.org/

S:	Maintained



ARM/FARADAY FA526 PORT

P:	Paulius Zaleckas

M:	paulius.zaleckas@teltonika.lt

L:	linux-arm-kernel@lists.arm.linux.org.uk (subscribers-only)

S:	Maintained



ARM/FREESCALE IMX / MXC ARM ARCHITECTURE

P:	Sascha Hauer

M:	kernel@pengutronix.de
@@ -622,7 +635,7 @@ P: Dirk Opfer 
M:	dirk@opfer-online.de

S:	Maintained



ARM/PALMTX SUPPORT

ARM/PALMTX,PALMT5,PALMLD SUPPORT

P:	Marek Vasut

M:	marek.vasut@gmail.com

W:	http://hackndev.com
@@ -3570,6 +3583,22 @@ M: linux@arm.linux.org.uk 
L:	linux-arm-kernel@lists.arm.linux.org.uk	(subscribers-only)

S:	Maintained



PXA168 SUPPORT

P:	Eric Miao

M:	eric.miao@marvell.com

P:	Jason Chagas

M:	jason.chagas@marvell.com

L:	linux-arm-kernel@lists.arm.linux.org.uk	(subscribers-only)

T:	git kernel.org:/pub/scm/linux/kernel/git/ycmiao/pxa-linux-2.6.git

S:	Supported



PXA910 SUPPORT

P:	Eric Miao

M:	eric.miao@marvell.com

L:	linux-arm-kernel@lists.arm.linux.org.uk	(subscribers-only)

T:	git kernel.org:/pub/scm/linux/kernel/git/ycmiao/pxa-linux-2.6.git

S:	Supported



PXA MMCI DRIVER

S:	Orphan

arch/arm/Kconfig

+54 −3
Original line number Diff line number Diff line
@@ -241,6 +241,7 @@ config ARCH_VERSATILE 
config ARCH_AT91

	bool "Atmel AT91"

	select GENERIC_GPIO

	select ARCH_REQUIRE_GPIOLIB

	select HAVE_CLK

	help

	  This enables support for systems based on the Atmel AT91RM9200,
@@ -275,6 +276,14 @@ config ARCH_EP93XX 
	help

	  This enables support for the Cirrus EP93xx series of CPUs.



config ARCH_GEMINI

	bool "Cortina Systems Gemini"

	select CPU_FA526

	select GENERIC_GPIO

	select ARCH_REQUIRE_GPIOLIB

	help

	  Support for the Cortina Systems Gemini family SoCs



config ARCH_FOOTBRIDGE

	bool "FootBridge"

	select CPU_SA110
@@ -477,12 +486,29 @@ config ARCH_PXA 
	select HAVE_CLK

	select COMMON_CLKDEV

	select ARCH_REQUIRE_GPIOLIB

	select HAVE_CLK

	select COMMON_CLKDEV

	select GENERIC_TIME

	select GENERIC_CLOCKEVENTS

	select TICK_ONESHOT

	select PLAT_PXA

	help

	  Support for Intel/Marvell's PXA2xx/PXA3xx processor line.



config ARCH_MMP

	bool "Marvell PXA168/910"

	depends on MMU

	select GENERIC_GPIO

	select ARCH_REQUIRE_GPIOLIB

	select HAVE_CLK

	select COMMON_CLKDEV

	select GENERIC_TIME

	select GENERIC_CLOCKEVENTS

	select TICK_ONESHOT

	select PLAT_PXA

	help

	  Support for Marvell's PXA168/910 processor line.



config ARCH_RPC

	bool "RiscPC"

	select ARCH_ACORN
@@ -598,6 +624,8 @@ source "arch/arm/mach-ep93xx/Kconfig" 


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



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



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



source "arch/arm/mach-iop32x/Kconfig"
@@ -617,6 +645,9 @@ source "arch/arm/mach-loki/Kconfig" 
source "arch/arm/mach-mv78xx0/Kconfig"



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

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



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



source "arch/arm/mach-sa1100/Kconfig"
@@ -686,12 +717,15 @@ config PLAT_IOP 
config PLAT_ORION

	bool



config PLAT_PXA

	bool



source arch/arm/mm/Kconfig



config IWMMXT

	bool "Enable iWMMXt support"

	depends on CPU_XSCALE || CPU_XSC3

	default y if PXA27x || PXA3xx

	depends on CPU_XSCALE || CPU_XSC3 || CPU_MOHAWK

	default y if PXA27x || PXA3xx || ARCH_MMP

	help

	  Enable support for iWMMXt context switching at run time if

	  running on a CPU that supports it.
@@ -915,6 +949,23 @@ config NODES_SHIFT 
	default "2"

	depends on NEED_MULTIPLE_NODES



config HIGHMEM

	bool "High Memory Support (EXPERIMENTAL)"

	depends on MMU && EXPERIMENTAL

	help

	  The address space of ARM processors is only 4 Gigabytes large

	  and it has to accommodate user address space, kernel address

	  space as well as some memory mapped IO. That means that, if you

	  have a large amount of physical memory and/or IO, not all of the

	  memory can be "permanently mapped" by the kernel. The physical

	  memory that is not permanently mapped is called "high memory".



	  Depending on the selected kernel/user memory split, minimum

	  vmalloc space and actual amount of RAM, you may not need this

	  option which should result in a slightly faster kernel.



	  If unsure, say n.



source "mm/Kconfig"



config LEDS
@@ -1092,7 +1143,7 @@ source "drivers/cpufreq/Kconfig" 


config CPU_FREQ_SA1100

	bool

	depends on CPU_FREQ && (SA1100_H3100 || SA1100_H3600 || SA1100_H3800 || SA1100_LART || SA1100_PLEB || SA1100_BADGE4 || SA1100_HACKKIT)

	depends on CPU_FREQ && (SA1100_H3100 || SA1100_H3600 || SA1100_LART || SA1100_PLEB || SA1100_BADGE4 || SA1100_HACKKIT)

	default y



config CPU_FREQ_SA1110

CRA Git | Maintained and supported by SUSTech CRA and CCSE