Commit 7cc4e87f 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: (236 commits)
  [ARM] 5300/1: fixup spitz reset during boot
  [ARM] 5295/1: make ZONE_DMA optional
  [ARM] 5239/1: Palm Zire 72 power management support
  [ARM] 5298/1: Drop desc_handle_irq()
  [ARM] 5297/1: [KS8695] Fix two compile-time warnings
  [ARM] 5296/1: [KS8695] Replace macro's with trailing underscores.
  [ARM] pxa: allow multi-machine PCMCIA builds
  [ARM] pxa: add preliminary CPUFREQ support for PXA3xx
  [ARM] pxa: add missing ACCR bit definitions to pxa3xx-regs.h
  [ARM] pxa: rename cpu-pxa.c to cpufreq-pxa2xx.c
  [ARM] pxa/zylonite: add support for USB OHCI
  [ARM] ohci-pxa27x: use ioremap() and offset for register access
  [ARM] ohci-pxa27x: introduce pxa27x_clear_otgph()
  [ARM] ohci-pxa27x: use platform_get_{irq,resource} for the resource
  [ARM] ohci-pxa27x: move OHCI controller specific registers into the driver
  [ARM] ohci-pxa27x: introduce flags to avoid direct access to OHCI registers
  [ARM] pxa: move I2S register and bit definitions into pxa2xx-i2s.c
  [ARM] pxa: simplify DMA register definitions
  [ARM] pxa: make additional DCSR bits valid for PXA3xx
  [ARM] pxa: move i2c register and bit definitions into i2c-pxa.c
  ...

Fixed up conflicts in
	arch/arm/mach-versatile/core.c
	sound/soc/pxa/pxa2xx-ac97.c
	sound/soc/pxa/pxa2xx-i2s.c
manually.
parents 5ba2f67a 69fc7eed

Documentation/sound/alsa/soc/dapm.txt

+2 −10
Original line number Diff line number Diff line
@@ -135,11 +135,7 @@ when the Mic is inserted:- 


static int spitz_mic_bias(struct snd_soc_dapm_widget* w, int event)

{

	if(SND_SOC_DAPM_EVENT_ON(event))

		set_scoop_gpio(&spitzscoop2_device.dev, SPITZ_SCP2_MIC_BIAS);

	else

		reset_scoop_gpio(&spitzscoop2_device.dev, SPITZ_SCP2_MIC_BIAS);



	gpio_set_value(SPITZ_GPIO_MIC_BIAS, SND_SOC_DAPM_EVENT_ON(event));

	return 0;

}
@@ -269,11 +265,7 @@ powered only when the spk is in use. 
/* turn speaker amplifier on/off depending on use */

static int corgi_amp_event(struct snd_soc_dapm_widget *w, int event)

{

	if (SND_SOC_DAPM_EVENT_ON(event))

		set_scoop_gpio(&corgiscoop_device.dev, CORGI_SCP_APM_ON);

	else

		reset_scoop_gpio(&corgiscoop_device.dev, CORGI_SCP_APM_ON);



	gpio_set_value(CORGI_GPIO_APM_ON, SND_SOC_DAPM_EVENT_ON(event));

	return 0;

}

MAINTAINERS

+13 −1
Original line number Diff line number Diff line
@@ -466,6 +466,12 @@ M: kernel@wantstofly.org 
L:	linux-arm-kernel@lists.arm.linux.org.uk (subscribers-only)

S:	Maintained



ARM/AFEB9260 MACHINE SUPPORT

P:	Sergey Lapin

M:	slapin@ossfans.org

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

S:	Maintained



ARM/AJECO 1ARM MACHINE SUPPORT

P:	Lennert Buytenhek

M:	kernel@wantstofly.org
@@ -491,7 +497,7 @@ M: kernel@wantstofly.org 
L:	linux-arm-kernel@lists.arm.linux.org.uk (subscribers-only)

S:	Maintained



ARM/COMPULAB CM-X270/EM-X270 MACHINE SUPPORT

ARM/COMPULAB CM-X270/EM-X270 and CM-X300 MACHINE SUPPORT

P:	Mike Rapoport

M:	mike@compulab.co.il

L:	linux-arm-kernel@lists.arm.linux.org.uk (subscribers-only)
@@ -623,6 +629,12 @@ M: marek.vasut@gmail.com 
W:	http://hackndev.com

S:	Maintained



ARM/PALMZ72 SUPPORT

P:     Sergey Lapin

M:     slapin@ossfans.org

W:     http://hackndev.com

S:     Maintained



ARM/PLEB SUPPORT

P:	Peter Chubb

M:	pleb@gelato.unsw.edu.au

arch/arm/Kconfig

+58 −16
Original line number Diff line number Diff line
@@ -148,7 +148,6 @@ config ARCH_MAY_HAVE_PC_FDC 


config ZONE_DMA

	bool

	default y



config GENERIC_ISA_DMA

	bool
@@ -178,6 +177,11 @@ config OPROFILE_MPCORE 
config OPROFILE_ARM11_CORE

	bool



config OPROFILE_ARMV7

	def_bool y

	depends on CPU_V7 && !SMP

	bool



endif



config VECTORS_BASE
@@ -245,6 +249,7 @@ config ARCH_CLPS7500 
	select TIMER_ACORN

	select ISA

	select NO_IOPORT

	select ARCH_SPARSEMEM_ENABLE

	help

	  Support for the Cirrus Logic PS7500FE system-on-a-chip.
@@ -306,6 +311,7 @@ config ARCH_IOP13XX 
	select PLAT_IOP

	select PCI

	select ARCH_SUPPORTS_MSI

	select VMSPLIT_1G

	help

	  Support for Intel's IOP13XX (XScale) family of processors.
@@ -350,6 +356,7 @@ config ARCH_IXP4XX 
	select GENERIC_GPIO

	select GENERIC_TIME

	select GENERIC_CLOCKEVENTS

	select ZONE_DMA if PCI

	help

	  Support for Intel's IXP4XX (XScale) family of processors.
@@ -434,7 +441,7 @@ config ARCH_ORION5X 
	help

	  Support for the following Marvell Orion 5x series SoCs:

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

	  Orion-2 (5281).

	  Orion-2 (5281), Orion-1-90 (6183).



config ARCH_PNX4008

	bool "Philips Nexperia PNX4008 Mobile"
@@ -464,6 +471,7 @@ config ARCH_RPC 
	select HAVE_PATA_PLATFORM

	select ISA_DMA_API

	select NO_IOPORT

	select ARCH_SPARSEMEM_ENABLE

	help

	  On the Acorn Risc-PC, Linux can support the internal IDE disk and

	  CD-ROM interface, serial and parallel port, and the floppy drive.
@@ -471,9 +479,7 @@ config ARCH_RPC 
config ARCH_SA1100

	bool "SA1100-based"

	select ISA

	select ARCH_DISCONTIGMEM_ENABLE

	select ARCH_SPARSEMEM_ENABLE

	select ARCH_SELECT_MEMORY_MODEL

	select ARCH_MTD_XIP

	select GENERIC_GPIO

	select GENERIC_TIME
@@ -497,6 +503,7 @@ config ARCH_SHARK 
	bool "Shark"

	select ISA

	select ISA_DMA

	select ZONE_DMA

	select PCI

	help

	  Support for the StrongARM based Digital DNARD machine, also known
@@ -504,6 +511,8 @@ config ARCH_SHARK 


config ARCH_LH7A40X

	bool "Sharp LH7A40X"

	select ARCH_DISCONTIGMEM_ENABLE if !LH7A40X_CONTIGMEM

	select ARCH_SPARSEMEM_ENABLE if !LH7A40X_CONTIGMEM

	help

	  Say Y here for systems based on one of the Sharp LH7A40X

	  System on a Chip processors.  These CPUs include an ARM922T
@@ -515,7 +524,9 @@ config ARCH_DAVINCI 
	select GENERIC_TIME

	select GENERIC_CLOCKEVENTS

	select GENERIC_GPIO

	select ARCH_REQUIRE_GPIOLIB

	select HAVE_CLK

	select ZONE_DMA

	help

	  Support for TI's DaVinci platform.
@@ -734,6 +745,29 @@ config SMP 


	  If you don't know what to do here, say N.



choice

	prompt "Memory split"

	default VMSPLIT_3G

	help

	  Select the desired split between kernel and user memory.



	  If you are not absolutely sure what you are doing, leave this

	  option alone!



	config VMSPLIT_3G

		bool "3G/1G user/kernel split"

	config VMSPLIT_2G

		bool "2G/2G user/kernel split"

	config VMSPLIT_1G

		bool "1G/3G user/kernel split"

endchoice



config PAGE_OFFSET

	hex

	default 0x40000000 if VMSPLIT_1G

	default 0x80000000 if VMSPLIT_2G

	default 0xC0000000



config NR_CPUS

	int "Maximum number of CPUs (2-32)"

	range 2 32
@@ -815,20 +849,18 @@ config ARCH_FLATMEM_HAS_HOLES 
	default y

	depends on FLATMEM



# Discontigmem is deprecated

config ARCH_DISCONTIGMEM_ENABLE

	bool

	default (ARCH_LH7A40X && !LH7A40X_CONTIGMEM)

	help

	  Say Y to support efficient handling of discontiguous physical memory,

	  for architectures which are either NUMA (Non-Uniform Memory Access)

	  or have huge holes in the physical address space for other reasons.

	  See <file:Documentation/vm/numa> for more.



config ARCH_SPARSEMEM_ENABLE

	bool



config ARCH_SPARSEMEM_DEFAULT

	def_bool ARCH_SPARSEMEM_ENABLE



config ARCH_SELECT_MEMORY_MODEL

	bool

	def_bool ARCH_DISCONTIGMEM_ENABLE && ARCH_SPARSEMEM_ENABLE



config NODES_SHIFT

	int
@@ -845,7 +877,7 @@ config LEDS 
		   ARCH_LUBBOCK || MACH_MAINSTONE || ARCH_NETWINDER || \

		   ARCH_OMAP || ARCH_P720T || ARCH_PXA_IDP || \

		   ARCH_SA1100 || ARCH_SHARK || ARCH_VERSATILE || \

		   ARCH_AT91 || MACH_TRIZEPS4 || ARCH_DAVINCI || \

		   ARCH_AT91 || ARCH_DAVINCI || \

		   ARCH_KS8695 || MACH_RD88F5182

	help

	  If you say Y here, the LEDs on your machine will be used
@@ -1005,9 +1037,9 @@ config ATAGS_PROC 


endmenu



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

menu "CPU Power Management"



menu "CPU Frequency scaling"

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



source "drivers/cpufreq/Kconfig"
@@ -1047,10 +1079,12 @@ config CPU_FREQ_PXA 
	default y

	select CPU_FREQ_DEFAULT_GOV_USERSPACE



endmenu



endif



source "drivers/cpuidle/Kconfig"



endmenu



menu "Floating point emulation"



comment "At least one emulation must be selected"
@@ -1202,6 +1236,8 @@ source "drivers/power/Kconfig" 


source "drivers/hwmon/Kconfig"



source "drivers/thermal/Kconfig"



source "drivers/watchdog/Kconfig"



source "drivers/ssb/Kconfig"
@@ -1222,6 +1258,10 @@ source "drivers/usb/Kconfig" 


source "drivers/mmc/Kconfig"



source "drivers/memstick/Kconfig"



source "drivers/accessibility/Kconfig"



source "drivers/leds/Kconfig"



source "drivers/rtc/Kconfig"
@@ -1230,6 +1270,8 @@ source "drivers/dma/Kconfig" 


source "drivers/dca/Kconfig"



source "drivers/auxdisplay/Kconfig"



source "drivers/regulator/Kconfig"



source "drivers/uio/Kconfig"

arch/arm/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -47,7 +47,7 @@ comma = , 
# Note that GCC does not numerically define an architecture version

# macro, but instead defines a whole series of macros which makes

# testing for a specific architecture or later rather impossible.

arch-$(CONFIG_CPU_32v7)		:=-D__LINUX_ARM_ARCH__=7 $(call cc-option,-march=armv7a,-march=armv5t -Wa$(comma)-march=armv7a)

arch-$(CONFIG_CPU_32v7)		:=-D__LINUX_ARM_ARCH__=7 $(call cc-option,-march=armv7-a,-march=armv5t -Wa$(comma)-march=armv7-a)

arch-$(CONFIG_CPU_32v6)		:=-D__LINUX_ARM_ARCH__=6 $(call cc-option,-march=armv6,-march=armv5t -Wa$(comma)-march=armv6)

# Only override the compiler option if ARMv6. The ARMv6K extensions are

# always available in ARMv7

arch/arm/boot/compressed/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -76,7 +76,7 @@ KBUILD_CFLAGS = $(subst -pg, , $(ORIG_CFLAGS)) 
endif



EXTRA_CFLAGS  := -fpic -fno-builtin

EXTRA_AFLAGS  :=

EXTRA_AFLAGS  := -Wa,-march=all



# Supply ZRELADDR, INITRD_PHYS and PARAMS_PHYS to the decompressor via

# linker symbols.  We only define initrd_phys and params_phys if the

CRA Git | Maintained and supported by SUSTech CRA and CCSE