diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-06-14 15:06:49 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-06-14 15:06:49 -0700 |
| commit | f701737deb59654dd62e15d5dc379f387cf86c6d (patch) | |
| tree | b9073b7d4b43bc3d39c2ba1ddc76a1d0698073de /include/asm-arm/arch-s3c2410/osiris-cpld.h | |
| parent | eedab661a51966c454e38c17266a531aa58b4a98 (diff) | |
| parent | 6c1640d52b9b7355cd777c4f08bc930ac96d905b (diff) | |
Merge master.kernel.org:/home/rmk/linux-2.6-arm
* master.kernel.org:/home/rmk/linux-2.6-arm:
[ARM] 4445/1: ANUBIS: Fix CPLD registers
[ARM] 4444/2: OSIRIS: CPLD suspend fix
[ARM] 4443/1: OSIRIS: Add watchdog device to machine devices
[ARM] 4442/1: OSIRIS: Fix CPLD register definitions
[ARM] VFP: fix section mismatch error
Diffstat (limited to 'include/asm-arm/arch-s3c2410/osiris-cpld.h')
| -rw-r--r-- | include/asm-arm/arch-s3c2410/osiris-cpld.h | 19 |
1 files changed, 12 insertions, 7 deletions
diff --git a/include/asm-arm/arch-s3c2410/osiris-cpld.h b/include/asm-arm/arch-s3c2410/osiris-cpld.h index 3b6498468d6..229ab2351db 100644 --- a/include/asm-arm/arch-s3c2410/osiris-cpld.h +++ b/include/asm-arm/arch-s3c2410/osiris-cpld.h @@ -1,6 +1,6 @@ /* linux/include/asm-arm/arch-s3c2410/osiris-cpld.h * - * Copyright (c) 2005 Simtec Electronics + * Copyright 2005 Simtec Electronics * http://www.simtec.co.uk/products/ * Ben Dooks <ben@simtec.co.uk> * @@ -14,12 +14,17 @@ #ifndef __ASM_ARCH_OSIRISCPLD_H #define __ASM_ARCH_OSIRISCPLD_H -/* CTRL1 - NAND WP control */ +/* CTRL0 - NAND WP control */ -#define OSIRIS_CTRL1_NANDSEL (0x3) -#define OSIRIS_CTRL1_BOOT_INT (1<<3) -#define OSIRIS_CTRL1_PCMCIA (1<<4) -#define OSIRIS_CTRL1_PCMCIA_nWAIT (1<<6) -#define OSIRIS_CTRL1_PCMCIA_nIOIS16 (1<<7) +#define OSIRIS_CTRL0_NANDSEL (0x3) +#define OSIRIS_CTRL0_BOOT_INT (1<<3) +#define OSIRIS_CTRL0_PCMCIA (1<<4) +#define OSIRIS_CTRL0_FIX8 (1<<5) +#define OSIRIS_CTRL0_PCMCIA_nWAIT (1<<6) +#define OSIRIS_CTRL0_PCMCIA_nIOIS16 (1<<7) + +#define OSIRIS_CTRL1_FIX8 (1<<0) + +#define OSIRIS_ID_REVMASK (0x7) #endif /* __ASM_ARCH_OSIRISCPLD_H */ |