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

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

Merge master.kernel.org:/home/rmk/linux-2.6-arm 

* master.kernel.org:/home/rmk/linux-2.6-arm: (28 commits)
  [ARM] 5562/2: at91: add gpio button support for at91sam9g20ek
  [ARM] 5563/1: at91: at91sam9rlek lcd interface correction
  [ARM] 5565/2: Use PAGE_SIZE and RO_DATA() in link script
  [ARM] 5560/1: Avoid buffer overrun in case of an invalid IRQ
  [ARM] GTA02: build fixes (s3c2410_nand_set usage)
  [ARM] MINI2440: Add missing flash_bbt flat to NAND
  [ARM] s3c2410_defconfig: add MINI2440 machine to build
  [ARM] S3C: Fix S3C24XX build to not include s3c64xx IIS devices
  [ARM] S3C24XX: Fix missing s3c_iis_device.
  [ARM] MINI2440: remove duplicated #include
  [ARM] S3C24XX: Fix spi-bus configuration build errors
  OMAP: Fix IOMEM macro for assembly
  [ARM] S3C: Remove unused CONFIG_DEBUG_S3C_PORT
  [ARM] S3C24XX: Fix use of CONFIG_S3C24XX_PWM
  OMAP2/3: Initialize gpio debounce register
  OMAP: IOMMU: function flush_iotlb_page is not flushing correct entry
  OMAP3: RX51: Use OneNAND sync read / write
  OMAP2/3: gpmc-onenand: correct use of async timings
  OMAP3: DMA: Enable idlemodes for DMA OCP
  OMAP3: SRAM size fix for HS/EMU devices
  ...
parents aa221cb6 59c5fe6d

MAINTAINERS

+43 −0
Original line number Original line Diff line number Diff line
@@ -867,12 +867,22 @@ M: alex@shark-linux.de 
W:	http://www.shark-linux.de/shark.html

W:	http://www.shark-linux.de/shark.html

S:	Maintained

S:	Maintained





ARM/SAMSUNG ARM ARCHITECTURES

P:	Ben Dooks

M:	ben-linux@fluff.org

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

W:	http://www.fluff.org/ben/linux/

S:	Maintained

F:	arch/arm/plat-s3c/

F:	arch/arm/plat-s3c24xx/



ARM/S3C2410 ARM ARCHITECTURE

ARM/S3C2410 ARM ARCHITECTURE

P:	Ben Dooks

P:	Ben Dooks

M:	ben-linux@fluff.org

M:	ben-linux@fluff.org

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

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

W:	http://www.fluff.org/ben/linux/

W:	http://www.fluff.org/ben/linux/

S:	Maintained

S:	Maintained

F:	arch/arm/mach-s3c2410/





ARM/S3C2440 ARM ARCHITECTURE

ARM/S3C2440 ARM ARCHITECTURE

P:	Ben Dooks

P:	Ben Dooks
@@ -880,6 +890,39 @@ M: ben-linux@fluff.org 
L:	linux-arm-kernel@lists.arm.linux.org.uk	(subscribers-only)

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

W:	http://www.fluff.org/ben/linux/

W:	http://www.fluff.org/ben/linux/

S:	Maintained

S:	Maintained

F:	arch/arm/mach-s3c2440/



ARM/S3C2442 ARM ARCHITECTURE

P:	Ben Dooks

M:	ben-linux@fluff.org

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

W:	http://www.fluff.org/ben/linux/

S:	Maintained

F:	arch/arm/mach-s3c2442/



ARM/S3C2443 ARM ARCHITECTURE

P:	Ben Dooks

M:	ben-linux@fluff.org

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

W:	http://www.fluff.org/ben/linux/

S:	Maintained

F:	arch/arm/mach-s3c2443/



ARM/S3C6400 ARM ARCHITECTURE

P:	Ben Dooks

M:	ben-linux@fluff.org

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

W:	http://www.fluff.org/ben/linux/

S:	Maintained

F:	arch/arm/mach-s3c6400/



ARM/S3C6410 ARM ARCHITECTURE

P:	Ben Dooks

M:	ben-linux@fluff.org

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

W:	http://www.fluff.org/ben/linux/

S:	Maintained

F:	arch/arm/mach-s3c6410/





ARM/TECHNOLOGIC SYSTEMS TS7250 MACHINE SUPPORT

ARM/TECHNOLOGIC SYSTEMS TS7250 MACHINE SUPPORT

P:	Lennert Buytenhek

P:	Lennert Buytenhek

arch/arm/Kconfig.debug

+0 −8
Original line number Original line Diff line number Diff line
@@ -99,14 +99,6 @@ config DEBUG_CLPS711X_UART2 
	  output to the second serial port on these devices.  Saying N will

	  output to the second serial port on these devices.  Saying N will

	  cause the debug messages to appear on the first serial port.

	  cause the debug messages to appear on the first serial port.





config DEBUG_S3C_PORT

	depends on DEBUG_LL && PLAT_S3C

	bool "Kernel low-level debugging messages via S3C UART"

	help

	  Say Y here if you want debug print routines to go to one of the

	  S3C internal UARTs. The chosen UART must have been configured

	  before it is used.



config DEBUG_S3C_UART

config DEBUG_S3C_UART

	depends on PLAT_S3C

	depends on PLAT_S3C

	int "S3C UART to use for low-level debug"

	int "S3C UART to use for low-level debug"

arch/arm/configs/s3c2410_defconfig

+1 −1
Original line number Original line Diff line number Diff line
@@ -260,6 +260,7 @@ CONFIG_MACH_NEXCODER_2440=y 
CONFIG_SMDK2440_CPU2440=y

CONFIG_SMDK2440_CPU2440=y

CONFIG_MACH_AT2440EVB=y

CONFIG_MACH_AT2440EVB=y

CONFIG_CPU_S3C2442=y

CONFIG_CPU_S3C2442=y

CONFIG_MACH_MINI2440=y





#

#

# S3C2442 Machines

# S3C2442 Machines
@@ -2298,7 +2299,6 @@ CONFIG_DEBUG_ERRORS=y 
# CONFIG_DEBUG_STACK_USAGE is not set

# CONFIG_DEBUG_STACK_USAGE is not set

CONFIG_DEBUG_LL=y

CONFIG_DEBUG_LL=y

# CONFIG_DEBUG_ICEDCC is not set

# CONFIG_DEBUG_ICEDCC is not set

CONFIG_DEBUG_S3C_PORT=y

CONFIG_DEBUG_S3C_UART=0

CONFIG_DEBUG_S3C_UART=0





#

#

arch/arm/configs/s3c6400_defconfig

+0 −1
Original line number Original line Diff line number Diff line
@@ -816,7 +816,6 @@ CONFIG_DEBUG_ERRORS=y 
# CONFIG_DEBUG_STACK_USAGE is not set

# CONFIG_DEBUG_STACK_USAGE is not set

CONFIG_DEBUG_LL=y

CONFIG_DEBUG_LL=y

# CONFIG_DEBUG_ICEDCC is not set

# CONFIG_DEBUG_ICEDCC is not set

CONFIG_DEBUG_S3C_PORT=y

CONFIG_DEBUG_S3C_UART=0

CONFIG_DEBUG_S3C_UART=0





#

#

arch/arm/configs/tct_hammer_defconfig

+0 −1
Original line number Original line Diff line number Diff line
@@ -857,7 +857,6 @@ CONFIG_DEBUG_ERRORS=y 
# CONFIG_DEBUG_STACK_USAGE is not set

# CONFIG_DEBUG_STACK_USAGE is not set

CONFIG_DEBUG_LL=y

CONFIG_DEBUG_LL=y

# CONFIG_DEBUG_ICEDCC is not set

# CONFIG_DEBUG_ICEDCC is not set

# CONFIG_DEBUG_S3C_PORT is not set

CONFIG_DEBUG_S3C_UART=0

CONFIG_DEBUG_S3C_UART=0





#

#