Commit 9e268beb 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: (49 commits)
  [ARM] idle: clean up pm_idle calling, obey hlt_counter
  [ARM] S3C: Fix gpio-config off-by-one bug
  [ARM] S3C64XX: add to_irq() support for EINT() GPIO
  [ARM] S3C64XX: clock.c: fix typo in usb-host clock ctrlbit
  [ARM] S3C64XX: fix HCLK gate defines
  [ARM] Update mach-types
  [ARM] wire up rt_tgsigqueueinfo and perf_counter_open
  OMAP2 clock/powerdomain: off by 1 error in loop timeout comparisons
  OMAP3 SDRC: set FIXEDDELAY when disabling SDRC DLL
  OMAP3: Add support for DPLL3 divisor values higher than 2
  OMAP3 SRAM: convert SRAM code to use macros rather than magic numbers
  OMAP3 SRAM: add more comments on the SRAM code
  OMAP3 clock/SDRC: program SDRC_MR register during SDRC clock change
  OMAP3 clock: add a short delay when lowering CORE clk rate
  OMAP3 clock: initialize SDRC timings at kernel start
  OMAP3 clock: remove wait for DPLL3 M2 clock to stabilize
  [ARM] Add old Feroceon support to compressed/head.S
  [ARM] 5559/1: Limit the stack unwinding caused by a kthread exit
  [ARM] 5558/1: Add extra checks to ARM unwinder to avoid tracing corrupt stacks
  [ARM] 5557/1: Discard some ARM.ex*.*exit.text sections when !HOTPLUG or !HOTPLUG_CPU
  ...
parents 2e8b5a09 9ccdac36

Documentation/kernel-parameters.txt

+21 −0
Original line number Diff line number Diff line
@@ -1369,6 +1369,27 @@ and is between 256 and 4096 characters. It is defined in the file 
	min_addr=nn[KMG]	[KNL,BOOT,ia64] All physical memory below this

			physical address is ignored.



	mini2440=	[ARM,HW,KNL]

			Format:[0..2][b][c][t]

			Default: "0tb"

			MINI2440 configuration specification:

			0 - The attached screen is the 3.5" TFT

			1 - The attached screen is the 7" TFT

			2 - The VGA Shield is attached (1024x768)

			Leaving out the screen size parameter will not load

			the TFT driver, and the framebuffer will be left

			unconfigured.

			b - Enable backlight. The TFT backlight pin will be

			linked to the kernel VESA blanking code and a GPIO

			LED. This parameter is not necessary when using the

			VGA shield.

			c - Enable the s3c camera interface.

			t - Reserved for enabling touchscreen support. The

			touchscreen support is not enabled in the mainstream

			kernel as of 2.6.30, a preliminary port can be found

			in the "bleeding edge" mini2440 support kernel at

			http://repo.or.cz/w/linux-2.6/mini2440.git



	mminit_loglevel=

			[KNL] When CONFIG_DEBUG_MEMORY_INIT is set, this

			parameter allows control of the logging verbosity for

MAINTAINERS

+22 −0
Original line number Diff line number Diff line
@@ -653,6 +653,8 @@ M: laforge@openezx.org 
L:	openezx-devel@lists.openezx.org (subscribers-only)

W:	http://www.openezx.org/

S:	Maintained

T:	topgit git://git.openezx.org/openezx.git

F:	arch/arm/mach-pxa/ezx.c



ARM/FARADAY FA526 PORT

P:	Paulius Zaleckas
@@ -774,11 +776,25 @@ P: Philipp Zabel 
M:	philipp.zabel@gmail.com

S:	Maintained



ARM/MIOA701 MACHINE SUPPORT

P:	Robert Jarzmik

M:	robert.jarzmik@free.fr

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

F:	arch/arm/mach-pxa/mioa701.c

S:	Maintained



ARM/NEC MOBILEPRO 900/c MACHINE SUPPORT

P:	Michael Petchkovsky

M:	mkpetch@internode.on.net

S:	Maintained



ARM/OPENMOKO NEO FREERUNNER (GTA02) MACHINE SUPPORT

P:	Nelson Castillo

M:	arhuaco@freaks-unidos.net

L:	openmoko-kernel@lists.openmoko.org (subscribers-only)

W:	http://wiki.openmoko.org/wiki/Neo_FreeRunner

S:	Supported



ARM/TOSA MACHINE SUPPORT

P:	Dmitry Eremin-Solenikov

M:	dbaryshkov@gmail.com
@@ -792,6 +808,12 @@ M: marek.vasut@gmail.com 
W:	http://hackndev.com

S:	Maintained



ARM/PALM TREO 680 SUPPORT

P:	Tomas Cech

M:	sleep_walker@suse.cz

W:	http://hackndev.com

S:	Maintained



ARM/PALMZ72 SUPPORT

P:	Sergey Lapin

M:	slapin@ossfans.org

arch/arm/Kconfig

+5 −1
Original line number Diff line number Diff line
@@ -1241,7 +1241,7 @@ endmenu 


menu "CPU Power Management"



if (ARCH_SA1100 || ARCH_INTEGRATOR || ARCH_OMAP || ARCH_PXA)

if (ARCH_SA1100 || ARCH_INTEGRATOR || ARCH_OMAP || ARCH_PXA || ARCH_S3C64XX)



source "drivers/cpufreq/Kconfig"
@@ -1272,6 +1272,10 @@ config CPU_FREQ_PXA 
	default y

	select CPU_FREQ_DEFAULT_GOV_USERSPACE



config CPU_FREQ_S3C64XX

	bool "CPUfreq support for Samsung S3C64XX CPUs"

	depends on CPU_FREQ && CPU_S3C6410



endif



source "drivers/cpuidle/Kconfig"

arch/arm/boot/compressed/head.S

+9 −0
Original line number Diff line number Diff line
@@ -674,6 +674,15 @@ proc_types: 
		b	__armv4_mmu_cache_off

		b	__armv5tej_mmu_cache_flush



#ifdef CONFIG_CPU_FEROCEON_OLD_ID

		/* this conflicts with the standard ARMv5TE entry */

		.long	0x41009260		@ Old Feroceon

		.long	0xff00fff0

		b	__armv4_mmu_cache_on

		b	__armv4_mmu_cache_off

		b	__armv5tej_mmu_cache_flush

#endif



		.word	0x66015261		@ FA526

		.word	0xff01fff1

		b	__fa526_cache_on

arch/arm/common/gic.c

+1 −1
Original line number Diff line number Diff line
@@ -117,7 +117,7 @@ static int gic_set_cpu(unsigned int irq, const struct cpumask *mask_val) 
	u32 val;



	spin_lock(&irq_controller_lock);

	irq_desc[irq].cpu = cpu;

	irq_desc[irq].node = cpu;

	val = readl(reg) & ~(0xff << shift);

	val |= 1 << (cpu + shift);

	writel(val, reg);

CRA Git | Maintained and supported by SUSTech CRA and CCSE