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

Commit 00c04db9 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:
  [ARM] 4872/1: Replaces buggy macro in S3C2410 irq include
  [ARM] 4870/1: fix signal return code when enable CONFIG_OABI_COMPAT
  [ARM] 4869/1: ARM: OMAP: Fix compile for mcbsp
  [ARM] 4865/1: Register the F75375 device in the GLAN Tank platform code
  [ARM] 4864/1: Enable write buffer coalescing on IOP
  [ARM] 4863/1: AT91: CAP9 USART definitions for early debug
  [ARM] 4861/1: AT91: Update maintainer email address (again)
  ARM: OMAP1: Fix typo in OMAP1 MPU clock source initialization
  ARM: OMAP: Fix DMA CLINK mask, clear spurious interrupt
  ARM: OMAP: Fix chain_a_transfer return value
  ARM: OMAP: Fix missing makefile options
  ARM: OMAP: Fix GPIO IRQ unmask
  ARM: OMAP: Fix clockevent support for hrtimers
parents 6a25a6c1 2a1bf8b7

MAINTAINERS

+1 −1
Original line number Diff line number Diff line
@@ -452,7 +452,7 @@ S: Maintained 


ARM/ATMEL AT91RM9200 ARM ARCHITECTURE

P:      Andrew Victor

M:      andrew@sanpeople.com

M:      linux@maxim.org.za

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

W:      http://maxim.org.za/at91_26.html

S:      Maintained

arch/arm/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -469,6 +469,7 @@ config ARCH_OMAP 
	bool "TI OMAP"

	select GENERIC_GPIO

	select GENERIC_TIME

	select GENERIC_CLOCKEVENTS

	help

	  Support for TI's OMAP platform (OMAP1 and OMAP2).

arch/arm/kernel/signal.c

+2 −2
Original line number Diff line number Diff line
@@ -26,8 +26,8 @@ 
/*

 * For ARM syscalls, we encode the syscall number into the instruction.

 */

#define SWI_SYS_SIGRETURN	(0xef000000|(__NR_sigreturn))

#define SWI_SYS_RT_SIGRETURN	(0xef000000|(__NR_rt_sigreturn))

#define SWI_SYS_SIGRETURN	(0xef000000|(__NR_sigreturn)|(__NR_OABI_SYSCALL_BASE))

#define SWI_SYS_RT_SIGRETURN	(0xef000000|(__NR_rt_sigreturn)|(__NR_OABI_SYSCALL_BASE))



/*

 * With EABI, the syscall number has to be loaded into r7.

arch/arm/mach-iop32x/glantank.c

+12 −0
Original line number Diff line number Diff line
@@ -14,8 +14,10 @@ 


#include <linux/mm.h>

#include <linux/init.h>

#include <linux/f75375s.h>

#include <linux/kernel.h>

#include <linux/pci.h>

#include <linux/pm.h>

#include <linux/string.h>

#include <linux/slab.h>

#include <linux/serial_core.h>
@@ -167,11 +169,21 @@ static struct platform_device glantank_serial_device = { 
	.resource	= &glantank_uart_resource,

};



static struct f75375s_platform_data glantank_f75375s = {

	.pwm		= { 255, 255 },

	.pwm_enable	= { 0, 0 },

};



static struct i2c_board_info __initdata glantank_i2c_devices[] = {

	{

		I2C_BOARD_INFO("rtc-rs5c372", 0x32),

		.type = "rs5c372a",

	},

	{

		I2C_BOARD_INFO("f75375", 0x2e),

		.type = "f75375",

		.platform_data = &glantank_f75375s,

	},

};



static void glantank_power_off(void)

arch/arm/mach-omap1/time.c

+10 −2
Original line number Diff line number Diff line
@@ -132,6 +132,13 @@ static inline void omap_mpu_timer_start(int nr, unsigned long load_val, 
	timer->cntl = timerflags;

}



static inline void omap_mpu_timer_stop(int nr)

{

	volatile omap_mpu_timer_regs_t* timer = omap_mpu_timer_base(nr);



	timer->cntl &= ~MPU_TIMER_ST;

}



/*

 * ---------------------------------------------------------------------------

 * MPU timer 1 ... count down to zero, interrupt, reload
@@ -152,6 +159,7 @@ static void omap_mpu_set_mode(enum clock_event_mode mode, 
		omap_mpu_set_autoreset(0);

		break;

	case CLOCK_EVT_MODE_ONESHOT:

		omap_mpu_timer_stop(0);

		omap_mpu_remove_autoreset(0);

		break;

	case CLOCK_EVT_MODE_UNUSED:
@@ -163,7 +171,7 @@ static void omap_mpu_set_mode(enum clock_event_mode mode, 


static struct clock_event_device clockevent_mpu_timer1 = {

	.name		= "mpu_timer1",

	.features       = CLOCK_EVT_FEAT_PERIODIC, CLOCK_EVT_FEAT_ONESHOT,

	.features       = CLOCK_EVT_FEAT_PERIODIC | CLOCK_EVT_FEAT_ONESHOT,

	.shift		= 32,

	.set_next_event	= omap_mpu_set_next_event,

	.set_mode	= omap_mpu_set_mode,