aboutsummaryrefslogtreecommitdiffstats
path: root/include/asm-arm/arch-s3c2410
diff options
context:
space:
mode:
authorBen Dooks <ben-linux@fluff.org>2007-06-06 05:36:09 -0400
committerRussell King <rmk+kernel@arm.linux.org.uk>2007-06-11 04:09:31 -0400
commit5698bd28c67775c722dc1f4ab82e0041c1c740ea (patch)
treec9abe7032122bc466a0d056a7ae4d850d89c91fd /include/asm-arm/arch-s3c2410
parent55ba86bc6c33ce8b690fdf20ab485ef94cccd423 (diff)
[ARM] 4444/2: OSIRIS: CPLD suspend fix
Ensure the CPLD 8bit settings are preserved over a suspend/resume cycle as the CPU sends a hard-reset at resume time. Signed-off-by: Ben Dooks <ben-linux@fluff.org> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Diffstat (limited to 'include/asm-arm/arch-s3c2410')
-rw-r--r--include/asm-arm/arch-s3c2410/osiris-cpld.h5
1 files changed, 4 insertions, 1 deletions
diff --git a/include/asm-arm/arch-s3c2410/osiris-cpld.h b/include/asm-arm/arch-s3c2410/osiris-cpld.h
index a3253e979efe..229ab2351db6 100644
--- a/include/asm-arm/arch-s3c2410/osiris-cpld.h
+++ b/include/asm-arm/arch-s3c2410/osiris-cpld.h
@@ -1,6 +1,6 @@
1/* linux/include/asm-arm/arch-s3c2410/osiris-cpld.h 1/* linux/include/asm-arm/arch-s3c2410/osiris-cpld.h
2 * 2 *
3 * Copyright (c) 2005 Simtec Electronics 3 * Copyright 2005 Simtec Electronics
4 * http://www.simtec.co.uk/products/ 4 * http://www.simtec.co.uk/products/
5 * Ben Dooks <ben@simtec.co.uk> 5 * Ben Dooks <ben@simtec.co.uk>
6 * 6 *
@@ -19,9 +19,12 @@
19#define OSIRIS_CTRL0_NANDSEL (0x3) 19#define OSIRIS_CTRL0_NANDSEL (0x3)
20#define OSIRIS_CTRL0_BOOT_INT (1<<3) 20#define OSIRIS_CTRL0_BOOT_INT (1<<3)
21#define OSIRIS_CTRL0_PCMCIA (1<<4) 21#define OSIRIS_CTRL0_PCMCIA (1<<4)
22#define OSIRIS_CTRL0_FIX8 (1<<5)
22#define OSIRIS_CTRL0_PCMCIA_nWAIT (1<<6) 23#define OSIRIS_CTRL0_PCMCIA_nWAIT (1<<6)
23#define OSIRIS_CTRL0_PCMCIA_nIOIS16 (1<<7) 24#define OSIRIS_CTRL0_PCMCIA_nIOIS16 (1<<7)
24 25
26#define OSIRIS_CTRL1_FIX8 (1<<0)
27
25#define OSIRIS_ID_REVMASK (0x7) 28#define OSIRIS_ID_REVMASK (0x7)
26 29
27#endif /* __ASM_ARCH_OSIRISCPLD_H */ 30#endif /* __ASM_ARCH_OSIRISCPLD_H */