Commit 6ae85d6d 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] 5460/1: Orion: reduce namespace pollution
  [ARM] 5458/1: pcmcia: pxa2xx-sharpsl: check if we do have Scoop config
  [ARM] 5457/1: mach-imx gpio buildfix
  [ARM] 5456/1: add sys_preadv and sys_pwritev
  [ARM] pxa/pcm990: start external GPIOs immediately after built-in ones
  [ARM] pxa/palm27x: General fix for Palm27x aSoC driver
  [ARM] pxa/mioa701: use GPIO95 as AC97 reset line
  [ARM] pxa: merge AC97 platform data structures
  [ARM] pxa/magician: remove un-necessary #include of pxa-regs.h and hardware.h
parents d72cd3a9 fdd8b079

arch/arm/include/asm/unistd.h

+2 −0
Original line number Diff line number Diff line
@@ -387,6 +387,8 @@ 
#define __NR_dup3			(__NR_SYSCALL_BASE+358)

#define __NR_pipe2			(__NR_SYSCALL_BASE+359)

#define __NR_inotify_init1		(__NR_SYSCALL_BASE+360)

#define __NR_preadv			(__NR_SYSCALL_BASE+361)

#define __NR_pwritev			(__NR_SYSCALL_BASE+362)



/*

 * The following SWIs are ARM private.

arch/arm/kernel/calls.S

+2 −0
Original line number Diff line number Diff line
@@ -370,6 +370,8 @@ 
		CALL(sys_dup3)

		CALL(sys_pipe2)

/* 360 */	CALL(sys_inotify_init1)

		CALL(sys_preadv)

		CALL(sys_pwritev)

#ifndef syscalls_counted

.equ syscalls_padding, ((NR_syscalls + 3) & ~3) - NR_syscalls

#define syscalls_counted

arch/arm/mach-imx/include/mach/gpio.h

+1 −0
Original line number Diff line number Diff line 
#ifndef _IMX_GPIO_H



#include <linux/kernel.h>

#include <mach/hardware.h>

#include <mach/imx-regs.h>



#define IMX_GPIO_ALLOC_MODE_NORMAL	0

arch/arm/mach-kirkwood/common.c

+1 −0
Original line number Diff line number Diff line
@@ -23,6 +23,7 @@ 
#include <asm/mach/map.h>

#include <asm/mach/time.h>

#include <mach/kirkwood.h>

#include <mach/bridge-regs.h>

#include <plat/cache-feroceon-l2.h>

#include <plat/ehci-orion.h>

#include <plat/mvsdio.h>

arch/arm/mach-kirkwood/include/mach/bridge-regs.h

0 → 100644
+42 −0
Original line number Diff line number Diff line 
/*

 * arch/arm/mach-kirkwood/include/mach/bridge-regs.h

 *

 * Mbus-L to Mbus Bridge Registers

 *

 * This file is licensed under the terms of the GNU General Public

 * License version 2.  This program is licensed "as is" without any

 * warranty of any kind, whether express or implied.

 */



#ifndef __ASM_ARCH_BRIDGE_REGS_H

#define __ASM_ARCH_BRIDGE_REGS_H



#include <mach/kirkwood.h>



#define CPU_CONTROL		(BRIDGE_VIRT_BASE | 0x0104)

#define CPU_RESET		0x00000002



#define RSTOUTn_MASK		(BRIDGE_VIRT_BASE | 0x0108)

#define SOFT_RESET_OUT_EN	0x00000004



#define SYSTEM_SOFT_RESET	(BRIDGE_VIRT_BASE | 0x010c)

#define SOFT_RESET		0x00000001



#define BRIDGE_CAUSE		(BRIDGE_VIRT_BASE | 0x0110)

#define BRIDGE_MASK		(BRIDGE_VIRT_BASE | 0x0114)

#define BRIDGE_INT_TIMER0	0x0002

#define BRIDGE_INT_TIMER1	0x0004

#define BRIDGE_INT_TIMER1_CLR	(~0x0004)



#define IRQ_VIRT_BASE		(BRIDGE_VIRT_BASE | 0x0200)

#define IRQ_CAUSE_LOW_OFF	0x0000

#define IRQ_MASK_LOW_OFF	0x0004

#define IRQ_CAUSE_HIGH_OFF	0x0010

#define IRQ_MASK_HIGH_OFF	0x0014



#define TIMER_VIRT_BASE		(BRIDGE_VIRT_BASE | 0x0300)



#define L2_CONFIG_REG		(BRIDGE_VIRT_BASE | 0x0128)

#define L2_WRITETHROUGH		0x00000010



#endif

CRA Git | Maintained and supported by SUSTech CRA and CCSE