[PATCH] ARM: 2676/1: S3C2440 - NAND register additions

Patch from Ben Dooks

Add the register definitions for the s3c2440 NAND controller
to the s3c2410 NAND register definitions

Signed-off-by: Ben Dooks
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>

authored by

Ben Dooks and committed by
Russell King
9dabf9da 70489c88

+41 -3
+41 -3
include/asm-arm/arch-s3c2410/regs-nand.h
··· 1 /* linux/include/asm-arm/arch-s3c2410/regs-nand.h 2 * 3 - * Copyright (c) 2004 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 clock register definitions 11 * 12 * Changelog: 13 * 18-Aug-2004 BJD Copied file from 2.4 and updated 14 */ 15 16 #ifndef __ASM_ARM_REGS_NAND ··· 27 #define S3C2410_NFSTAT S3C2410_NFREG(0x10) 28 #define S3C2410_NFECC S3C2410_NFREG(0x14) 29 30 #define S3C2410_NFCONF_EN (1<<15) 31 #define S3C2410_NFCONF_512BYTE (1<<14) 32 #define S3C2410_NFCONF_4STEP (1<<13) ··· 54 55 #define S3C2410_NFSTAT_BUSY (1<<0) 56 57 - /* think ECC can only be 8bit read? */ 58 59 #endif /* __ASM_ARM_REGS_NAND */ 60
··· 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 * Changelog: 13 * 18-Aug-2004 BJD Copied file from 2.4 and updated 14 + * 01-May-2005 BJD Added definitions for s3c2440 controller 15 */ 16 17 #ifndef __ASM_ARM_REGS_NAND ··· 26 #define S3C2410_NFSTAT S3C2410_NFREG(0x10) 27 #define S3C2410_NFECC S3C2410_NFREG(0x14) 28 29 + #define S3C2440_NFCONT S3C2410_NFREG(0x04) 30 + #define S3C2440_NFCMD S3C2410_NFREG(0x08) 31 + #define S3C2440_NFADDR S3C2410_NFREG(0x0C) 32 + #define S3C2440_NFDATA S3C2410_NFREG(0x10) 33 + #define S3C2440_NFECCD0 S3C2410_NFREG(0x14) 34 + #define S3C2440_NFECCD1 S3C2410_NFREG(0x18) 35 + #define S3C2440_NFECCD S3C2410_NFREG(0x1C) 36 + #define S3C2440_NFSTAT S3C2410_NFREG(0x20) 37 + #define S3C2440_NFESTAT0 S3C2410_NFREG(0x24) 38 + #define S3C2440_NFESTAT1 S3C2410_NFREG(0x28) 39 + #define S3C2440_NFMECC0 S3C2410_NFREG(0x2C) 40 + #define S3C2440_NFMECC1 S3C2410_NFREG(0x30) 41 + #define S3C2440_NFSECC S3C2410_NFREG(0x34) 42 + #define S3C2440_NFSBLK S3C2410_NFREG(0x38) 43 + #define S3C2440_NFEBLK S3C2410_NFREG(0x3C) 44 + 45 #define S3C2410_NFCONF_EN (1<<15) 46 #define S3C2410_NFCONF_512BYTE (1<<14) 47 #define S3C2410_NFCONF_4STEP (1<<13) ··· 37 38 #define S3C2410_NFSTAT_BUSY (1<<0) 39 40 + #define S3C2440_NFCONF_BUSWIDTH_8 (0<<0) 41 + #define S3C2440_NFCONF_BUSWIDTH_16 (1<<0) 42 + #define S3C2440_NFCONF_ADVFLASH (1<<3) 43 + #define S3C2440_NFCONF_TACLS(x) ((x)<<12) 44 + #define S3C2440_NFCONF_TWRPH0(x) ((x)<<8) 45 + #define S3C2440_NFCONF_TWRPH1(x) ((x)<<4) 46 + 47 + #define S3C2440_NFCONT_LOCKTIGHT (1<<13) 48 + #define S3C2440_NFCONT_SOFTLOCK (1<<12) 49 + #define S3C2440_NFCONT_ILLEGALACC_EN (1<<10) 50 + #define S3C2440_NFCONT_RNBINT_EN (1<<9) 51 + #define S3C2440_NFCONT_RN_FALLING (1<<8) 52 + #define S3C2440_NFCONT_SPARE_ECCLOCK (1<<6) 53 + #define S3C2440_NFCONT_MAIN_ECCLOCK (1<<5) 54 + #define S3C2440_NFCONT_INITECC (1<<4) 55 + #define S3C2440_NFCONT_nFCE (1<<1) 56 + #define S3C2440_NFCONT_ENABLE (1<<0) 57 + 58 + #define S3C2440_NFSTAT_READY (1<<0) 59 + #define S3C2440_NFSTAT_nCE (1<<1) 60 + #define S3C2440_NFSTAT_RnB_CHANGE (1<<2) 61 + #define S3C2440_NFSTAT_ILLEGAL_ACCESS (1<<3) 62 63 #endif /* __ASM_ARM_REGS_NAND */ 64