diff options
| author | Marc Singer <elf@buici.com> | 2006-05-16 11:41:27 +0100 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2006-06-18 16:16:44 +0100 |
| commit | 2295196c30ea686389519f699f0ccbfbc5c3b94c (patch) | |
| tree | 312918803ae8ec19276d7fd6ba1bcfbcdb31ecbf /include/asm-arm/arch-lh7a40x/hardware.h | |
| parent | 427abfa28afedffadfca9dd8b067eb6d36bac53f (diff) | |
| download | kernel_samsung_aries-2295196c30ea686389519f699f0ccbfbc5c3b94c.zip kernel_samsung_aries-2295196c30ea686389519f699f0ccbfbc5c3b94c.tar.gz kernel_samsung_aries-2295196c30ea686389519f699f0ccbfbc5c3b94c.tar.bz2 | |
[ARM] 3400/1: lpd7a40x: platform headers update
Patch from Marc Singer
Updates to the lpd7a40x platform headers. Includes support for new
architecture, lpd7a400.
Signed-off-by: Marc Singer <elf@buici.com>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Diffstat (limited to 'include/asm-arm/arch-lh7a40x/hardware.h')
| -rw-r--r-- | include/asm-arm/arch-lh7a40x/hardware.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/include/asm-arm/arch-lh7a40x/hardware.h b/include/asm-arm/arch-lh7a40x/hardware.h index aeb07c1..e9ff74f 100644 --- a/include/asm-arm/arch-lh7a40x/hardware.h +++ b/include/asm-arm/arch-lh7a40x/hardware.h @@ -13,6 +13,8 @@ #ifndef __ASM_ARCH_HARDWARE_H #define __ASM_ARCH_HARDWARE_H +#include <asm/sizes.h> /* Added for the sake of amba-clcd driver */ + #define io_p2v(x) (0xf0000000 | (((x) & 0xfff00000) >> 4) | ((x) & 0x0000ffff)) #define io_v2p(x) ( (((x) & 0x0fff0000) << 4) | ((x) & 0x0000ffff)) @@ -53,6 +55,8 @@ typedef struct { volatile u8 offset[4096]; } __regbase8; #endif +#define MASK_AND_SET(v,m,s) (v) = ((v)&~(m))|(s) + #include "registers.h" #endif /* _ASM_ARCH_HARDWARE_H */ |