1 files changed, 0 insertions, 123 deletions
diff --git a/include/asm-arm/arch-s3c2410/regs-nand.h b/include/asm-arm/arch-s3c2410/regs-nand.h
deleted file mode 100644
index b824d371ae0..00000000000
--- a/include/asm-arm/arch-s3c2410/regs-nand.h
+++ /dev/null
@@ -1,123 +0,0 @@
-/* linux/include/asm-arm/arch-s3c2410/regs-nand.h
- *
- * Copyright (c) 2004,2005 Simtec Electronics <linux@simtec.co.uk>
- *                    http://www.simtec.co.uk/products/SWLINUX/
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2 as
- * published by the Free Software Foundation.
- *
- * S3C2410 NAND register definitions
-*/
-#ifndef __ASM_ARM_REGS_NAND
-#define __ASM_ARM_REGS_NAND "$Id: nand.h,v 1.3 2003/12/09 11:36:29 ben Exp $"
-#define S3C2410_NFREG(x) (x)
-#define S3C2410_NFCONF  S3C2410_NFREG(0x00)
-#define S3C2410_NFCMD   S3C2410_NFREG(0x04)
-#define S3C2410_NFADDR  S3C2410_NFREG(0x08)
-#define S3C2410_NFDATA  S3C2410_NFREG(0x0C)
-#define S3C2410_NFSTAT  S3C2410_NFREG(0x10)
-#define S3C2410_NFECC   S3C2410_NFREG(0x14)
-#define S3C2440_NFCONT   S3C2410_NFREG(0x04)
-#define S3C2440_NFCMD    S3C2410_NFREG(0x08)
-#define S3C2440_NFADDR   S3C2410_NFREG(0x0C)
-#define S3C2440_NFDATA   S3C2410_NFREG(0x10)
-#define S3C2440_NFECCD0  S3C2410_NFREG(0x14)
-#define S3C2440_NFECCD1  S3C2410_NFREG(0x18)
-#define S3C2440_NFECCD   S3C2410_NFREG(0x1C)
-#define S3C2440_NFSTAT   S3C2410_NFREG(0x20)
-#define S3C2440_NFESTAT0 S3C2410_NFREG(0x24)
-#define S3C2440_NFESTAT1 S3C2410_NFREG(0x28)
-#define S3C2440_NFMECC0  S3C2410_NFREG(0x2C)
-#define S3C2440_NFMECC1  S3C2410_NFREG(0x30)
-#define S3C2440_NFSECC   S3C24E10_NFREG(0x34)
-#define S3C2440_NFSBLK   S3C2410_NFREG(0x38)
-#define S3C2440_NFEBLK   S3C2410_NFREG(0x3C)
-#define S3C2412_NFSBLK          S3C2410_NFREG(0x20)
-#define S3C2412_NFEBLK          S3C2410_NFREG(0x24)
-#define S3C2412_NFSTAT          S3C2410_NFREG(0x28)
-#define S3C2412_NFMECC_ERR0     S3C2410_NFREG(0x2C)
-#define S3C2412_NFMECC_ERR1     S3C2410_NFREG(0x30)
-#define S3C2412_NFMECC0         S3C2410_NFREG(0x34)
-#define S3C2412_NFMECC1         S3C2410_NFREG(0x38)
-#define S3C2412_NFSECC          S3C2410_NFREG(0x3C)
-#define S3C2410_NFCONF_EN          (1<<15)
-#define S3C2410_NFCONF_512BYTE     (1<<14)
-#define S3C2410_NFCONF_4STEP       (1<<13)
-#define S3C2410_NFCONF_INITECC     (1<<12)
-#define S3C2410_NFCONF_nFCE        (1<<11)
-#define S3C2410_NFCONF_TACLS(x)    ((x)<<8)
-#define S3C2410_NFCONF_TWRPH0(x)   ((x)<<4)
-#define S3C2410_NFCONF_TWRPH1(x)   ((x)<<0)
-#define S3C2410_NFSTAT_BUSY        (1<<0)
-#define S3C2440_NFCONF_BUSWIDTH_8       (0<<0)
-#define S3C2440_NFCONF_BUSWIDTH_16      (1<<0)
-#define S3C2440_NFCONF_ADVFLASH         (1<<3)
-#define S3C2440_NFCONF_TACLS(x)         ((x)<<12)
-#define S3C2440_NFCONF_TWRPH0(x)        ((x)<<8)
-#define S3C2440_NFCONF_TWRPH1(x)        ((x)<<4)
-#define S3C2440_NFCONT_LOCKTIGHT        (1<<13)
-#define S3C2440_NFCONT_SOFTLOCK         (1<<12)
-#define S3C2440_NFCONT_ILLEGALACC_EN    (1<<10)
-#define S3C2440_NFCONT_RNBINT_EN        (1<<9)
-#define S3C2440_NFCONT_RN_FALLING       (1<<8)
-#define S3C2440_NFCONT_SPARE_ECCLOCK    (1<<6)
-#define S3C2440_NFCONT_MAIN_ECCLOCK     (1<<5)
-#define S3C2440_NFCONT_INITECC          (1<<4)
-#define S3C2440_NFCONT_nFCE             (1<<1)
-#define S3C2440_NFCONT_ENABLE           (1<<0)
-#define S3C2440_NFSTAT_READY            (1<<0)
-#define S3C2440_NFSTAT_nCE              (1<<1)
-#define S3C2440_NFSTAT_RnB_CHANGE       (1<<2)
-#define S3C2440_NFSTAT_ILLEGAL_ACCESS   (1<<3)
-#define S3C2412_NFCONF_NANDBOOT         (1<<31)
-#define S3C2412_NFCONF_ECCCLKCON        (1<<30)
-#define S3C2412_NFCONF_ECC_MLC          (1<<24)
-#define S3C2412_NFCONF_TACLS_MASK       (7<<12) /* 1 extra bit of Tacls */
-#define S3C2412_NFCONT_ECC4_DIRWR       (1<<18)
-#define S3C2412_NFCONT_LOCKTIGHT        (1<<17)
-#define S3C2412_NFCONT_SOFTLOCK         (1<<16)
-#define S3C2412_NFCONT_ECC4_ENCINT      (1<<13)
-#define S3C2412_NFCONT_ECC4_DECINT      (1<<12)
-#define S3C2412_NFCONT_MAIN_ECC_LOCK    (1<<7)
-#define S3C2412_NFCONT_INIT_MAIN_ECC    (1<<5)
-#define S3C2412_NFCONT_nFCE1            (1<<2)
-#define S3C2412_NFCONT_nFCE0            (1<<1)
-#define S3C2412_NFSTAT_ECC_ENCDONE      (1<<7)
-#define S3C2412_NFSTAT_ECC_DECDONE      (1<<6)
-#define S3C2412_NFSTAT_ILLEGAL_ACCESS   (1<<5)
-#define S3C2412_NFSTAT_RnB_CHANGE       (1<<4)
-#define S3C2412_NFSTAT_nFCE1            (1<<3)
-#define S3C2412_NFSTAT_nFCE0            (1<<2)
-#define S3C2412_NFSTAT_Res1             (1<<1)
-#define S3C2412_NFSTAT_READY            (1<<0)
-#define S3C2412_NFECCERR_SERRDATA(x)    (((x) >> 21) & 0xf)
-#define S3C2412_NFECCERR_SERRBIT(x)     (((x) >> 18) & 0x7)
-#define S3C2412_NFECCERR_MERRDATA(x)    (((x) >> 7) & 0x3ff)
-#define S3C2412_NFECCERR_MERRBIT(x)     (((x) >> 4) & 0x7)
-#define S3C2412_NFECCERR_SPARE_ERR(x)   (((x) >> 2) & 0x3)
-#define S3C2412_NFECCERR_MAIN_ERR(x)    (((x) >> 2) & 0x3)
-#define S3C2412_NFECCERR_NONE           (0)
-#define S3C2412_NFECCERR_1BIT           (1)
-#define S3C2412_NFECCERR_MULTIBIT       (2)
-#define S3C2412_NFECCERR_ECCAREA        (3)
-#endif /* __ASM_ARM_REGS_NAND */

diff --git a/include/asm-arm/arch-s3c2410/regs-nand.h b/include/asm-arm/arch-s3c2410/regs-nand.h deleted file mode 100644 index b824d371ae0..00000000000 --- a/include/asm-arm/arch-s3c2410/regs-nand.h +++ /dev/null
@@ -1,123 +0,0 @@
1	/* linux/include/asm-arm/arch-s3c2410/regs-nand.h
2	*
3	* Copyright (c) 2004,2005 Simtec Electronics <linux@simtec.co.uk>
4	* http://www.simtec.co.uk/products/SWLINUX/
5	*
6	* This program is free software; you can redistribute it and/or modify
7	* it under the terms of the GNU General Public License version 2 as
8	* published by the Free Software Foundation.
9	*
10	* S3C2410 NAND register definitions
11	*/
12
13	#ifndef __ASM_ARM_REGS_NAND
14	#define __ASM_ARM_REGS_NAND "$Id: nand.h,v 1.3 2003/12/09 11:36:29 ben Exp $"
15
16
17	#define S3C2410_NFREG(x) (x)
18
19	#define S3C2410_NFCONF S3C2410_NFREG(0x00)
20	#define S3C2410_NFCMD S3C2410_NFREG(0x04)
21	#define S3C2410_NFADDR S3C2410_NFREG(0x08)
22	#define S3C2410_NFDATA S3C2410_NFREG(0x0C)
23	#define S3C2410_NFSTAT S3C2410_NFREG(0x10)
24	#define S3C2410_NFECC S3C2410_NFREG(0x14)
25
26	#define S3C2440_NFCONT S3C2410_NFREG(0x04)
27	#define S3C2440_NFCMD S3C2410_NFREG(0x08)
28	#define S3C2440_NFADDR S3C2410_NFREG(0x0C)
29	#define S3C2440_NFDATA S3C2410_NFREG(0x10)
30	#define S3C2440_NFECCD0 S3C2410_NFREG(0x14)
31	#define S3C2440_NFECCD1 S3C2410_NFREG(0x18)
32	#define S3C2440_NFECCD S3C2410_NFREG(0x1C)
33	#define S3C2440_NFSTAT S3C2410_NFREG(0x20)
34	#define S3C2440_NFESTAT0 S3C2410_NFREG(0x24)
35	#define S3C2440_NFESTAT1 S3C2410_NFREG(0x28)
36	#define S3C2440_NFMECC0 S3C2410_NFREG(0x2C)
37	#define S3C2440_NFMECC1 S3C2410_NFREG(0x30)
38	#define S3C2440_NFSECC S3C24E10_NFREG(0x34)
39	#define S3C2440_NFSBLK S3C2410_NFREG(0x38)
40	#define S3C2440_NFEBLK S3C2410_NFREG(0x3C)
41
42	#define S3C2412_NFSBLK S3C2410_NFREG(0x20)
43	#define S3C2412_NFEBLK S3C2410_NFREG(0x24)
44	#define S3C2412_NFSTAT S3C2410_NFREG(0x28)
45	#define S3C2412_NFMECC_ERR0 S3C2410_NFREG(0x2C)
46	#define S3C2412_NFMECC_ERR1 S3C2410_NFREG(0x30)
47	#define S3C2412_NFMECC0 S3C2410_NFREG(0x34)
48	#define S3C2412_NFMECC1 S3C2410_NFREG(0x38)
49	#define S3C2412_NFSECC S3C2410_NFREG(0x3C)
50
51	#define S3C2410_NFCONF_EN (1<<15)
52	#define S3C2410_NFCONF_512BYTE (1<<14)
53	#define S3C2410_NFCONF_4STEP (1<<13)
54	#define S3C2410_NFCONF_INITECC (1<<12)
55	#define S3C2410_NFCONF_nFCE (1<<11)
56	#define S3C2410_NFCONF_TACLS(x) ((x)<<8)
57	#define S3C2410_NFCONF_TWRPH0(x) ((x)<<4)
58	#define S3C2410_NFCONF_TWRPH1(x) ((x)<<0)
59
60	#define S3C2410_NFSTAT_BUSY (1<<0)
61
62	#define S3C2440_NFCONF_BUSWIDTH_8 (0<<0)
63	#define S3C2440_NFCONF_BUSWIDTH_16 (1<<0)
64	#define S3C2440_NFCONF_ADVFLASH (1<<3)
65	#define S3C2440_NFCONF_TACLS(x) ((x)<<12)
66	#define S3C2440_NFCONF_TWRPH0(x) ((x)<<8)
67	#define S3C2440_NFCONF_TWRPH1(x) ((x)<<4)
68
69	#define S3C2440_NFCONT_LOCKTIGHT (1<<13)
70	#define S3C2440_NFCONT_SOFTLOCK (1<<12)
71	#define S3C2440_NFCONT_ILLEGALACC_EN (1<<10)
72	#define S3C2440_NFCONT_RNBINT_EN (1<<9)
73	#define S3C2440_NFCONT_RN_FALLING (1<<8)
74	#define S3C2440_NFCONT_SPARE_ECCLOCK (1<<6)
75	#define S3C2440_NFCONT_MAIN_ECCLOCK (1<<5)
76	#define S3C2440_NFCONT_INITECC (1<<4)
77	#define S3C2440_NFCONT_nFCE (1<<1)
78	#define S3C2440_NFCONT_ENABLE (1<<0)
79
80	#define S3C2440_NFSTAT_READY (1<<0)
81	#define S3C2440_NFSTAT_nCE (1<<1)
82	#define S3C2440_NFSTAT_RnB_CHANGE (1<<2)
83	#define S3C2440_NFSTAT_ILLEGAL_ACCESS (1<<3)
84
85	#define S3C2412_NFCONF_NANDBOOT (1<<31)
86	#define S3C2412_NFCONF_ECCCLKCON (1<<30)
87	#define S3C2412_NFCONF_ECC_MLC (1<<24)
88	#define S3C2412_NFCONF_TACLS_MASK (7<<12) /* 1 extra bit of Tacls */
89
90	#define S3C2412_NFCONT_ECC4_DIRWR (1<<18)
91	#define S3C2412_NFCONT_LOCKTIGHT (1<<17)
92	#define S3C2412_NFCONT_SOFTLOCK (1<<16)
93	#define S3C2412_NFCONT_ECC4_ENCINT (1<<13)
94	#define S3C2412_NFCONT_ECC4_DECINT (1<<12)
95	#define S3C2412_NFCONT_MAIN_ECC_LOCK (1<<7)
96	#define S3C2412_NFCONT_INIT_MAIN_ECC (1<<5)
97	#define S3C2412_NFCONT_nFCE1 (1<<2)
98	#define S3C2412_NFCONT_nFCE0 (1<<1)
99
100	#define S3C2412_NFSTAT_ECC_ENCDONE (1<<7)
101	#define S3C2412_NFSTAT_ECC_DECDONE (1<<6)
102	#define S3C2412_NFSTAT_ILLEGAL_ACCESS (1<<5)
103	#define S3C2412_NFSTAT_RnB_CHANGE (1<<4)
104	#define S3C2412_NFSTAT_nFCE1 (1<<3)
105	#define S3C2412_NFSTAT_nFCE0 (1<<2)
106	#define S3C2412_NFSTAT_Res1 (1<<1)
107	#define S3C2412_NFSTAT_READY (1<<0)
108
109	#define S3C2412_NFECCERR_SERRDATA(x) (((x) >> 21) & 0xf)
110	#define S3C2412_NFECCERR_SERRBIT(x) (((x) >> 18) & 0x7)
111	#define S3C2412_NFECCERR_MERRDATA(x) (((x) >> 7) & 0x3ff)
112	#define S3C2412_NFECCERR_MERRBIT(x) (((x) >> 4) & 0x7)
113	#define S3C2412_NFECCERR_SPARE_ERR(x) (((x) >> 2) & 0x3)
114	#define S3C2412_NFECCERR_MAIN_ERR(x) (((x) >> 2) & 0x3)
115	#define S3C2412_NFECCERR_NONE (0)
116	#define S3C2412_NFECCERR_1BIT (1)
117	#define S3C2412_NFECCERR_MULTIBIT (2)
118	#define S3C2412_NFECCERR_ECCAREA (3)
119
120
121
122	#endif /* __ASM_ARM_REGS_NAND */
123