minix/u-boot
1
0
Fork 0
mirror of https://github.com/Stichting-MINIX-Research-Foundation/u-boot.git synced 2025-09-13 05:55:02 -04:00
Code Issues Packages Projects Releases Wiki Activity

s3c24x0: Update NAND driver to new API.

Browse Source 
Signed-off-by: Scott Wood <scottwood@freescale.com>
This commit is contained in:
Scott Wood 2008-08-13 17:04:30 -05:00
parent aa5f75f20d
commit 1a23a197c8
1 changed files with 31 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

58
cpu/arm920t/s3c24x0/nand.c
View File

@ -31,6 +31,7 @@
#include <nand.h> #include <nand.h>
#include <s3c2410.h> #include <s3c2410.h>
#include <asm/io.h>
#define __REGb(x) (*(volatile unsigned char *)(x)) #define __REGb(x) (*(volatile unsigned char *)(x))
#define __REGi(x) (*(volatile unsigned int *)(x)) #define __REGi(x) (*(volatile unsigned int *)(x))
@ -54,34 +55,33 @@
#define S3C2410_NFCONF_TWRPH0(x) ((x)<<4) #define S3C2410_NFCONF_TWRPH0(x) ((x)<<4)
#define S3C2410_NFCONF_TWRPH1(x) ((x)<<0) #define S3C2410_NFCONF_TWRPH1(x) ((x)<<0)
static void s3c2410_hwcontrol(struct mtd_info *mtd, int cmd) #define S3C2410_ADDR_NALE 4
#define S3C2410_ADDR_NCLE 8
static void s3c2410_hwcontrol(struct mtd_info *mtd, int cmd, unsigned int ctrl)
{ {
struct nand_chip *chip = mtd->priv; struct nand_chip *chip = mtd->priv;
DEBUGN("hwcontrol(): 0x%02x: ", cmd); DEBUGN("hwcontrol(): 0x%02x 0x%02x\n", cmd, ctrl);
switch (cmd) { if (ctrl & NAND_CTRL_CHANGE) {
case NAND_CTL_SETNCE: ulong IO_ADDR_W = NF_BASE;
if (!(ctrl & NAND_CLE))
IO_ADDR_W |= S3C2410_ADDR_NCLE;
if (!(ctrl & NAND_ALE))
IO_ADDR_W |= S3C2410_ADDR_NALE;
chip->IO_ADDR_W = (void *)IO_ADDR_W;
if (ctrl & NAND_NCE)
NFCONF &= ~S3C2410_NFCONF_nFCE; NFCONF &= ~S3C2410_NFCONF_nFCE;
DEBUGN("NFCONF=0x%08x\n", NFCONF); else
break;
case NAND_CTL_CLRNCE:
NFCONF |= S3C2410_NFCONF_nFCE; NFCONF |= S3C2410_NFCONF_nFCE;
DEBUGN("NFCONF=0x%08x\n", NFCONF);
break;
case NAND_CTL_SETALE:
chip->IO_ADDR_W = NF_BASE + 0x8;
DEBUGN("SETALE\n");
break;
case NAND_CTL_SETCLE:
chip->IO_ADDR_W = NF_BASE + 0x4;
DEBUGN("SETCLE\n");
break;
default:
chip->IO_ADDR_W = NF_BASE + 0xc;
break;
} }
return;
if (cmd != NAND_CMD_NONE)
writeb(cmd, chip->IO_ADDR_W);
} }
static int s3c2410_dev_ready(struct mtd_info *mtd) static int s3c2410_dev_ready(struct mtd_info *mtd)
@ -93,7 +93,7 @@ static int s3c2410_dev_ready(struct mtd_info *mtd)
#ifdef CONFIG_S3C2410_NAND_HWECC #ifdef CONFIG_S3C2410_NAND_HWECC
void s3c2410_nand_enable_hwecc(struct mtd_info *mtd, int mode) void s3c2410_nand_enable_hwecc(struct mtd_info *mtd, int mode)
{ {
DEBUGN("s3c2410_nand_enable_hwecc(%p, %d)\n", mtd ,mode); DEBUGN("s3c2410_nand_enable_hwecc(%p, %d)\n", mtd, mode);
NFCONF |= S3C2410_NFCONF_INITECC; NFCONF |= S3C2410_NFCONF_INITECC;
} }
@ -143,23 +143,23 @@ int board_nand_init(struct nand_chip *nand)
NFCONF = cfg; NFCONF = cfg;
/* initialize nand_chip data structure */ /* initialize nand_chip data structure */
nand->IO_ADDR_R = nand->IO_ADDR_W = 0x4e00000c; nand->IO_ADDR_R = nand->IO_ADDR_W = (void *)0x4e00000c;
/* read_buf and write_buf are default */ /* read_buf and write_buf are default */
/* read_byte and write_byte are default */ /* read_byte and write_byte are default */
/* hwcontrol always must be implemented */ /* hwcontrol always must be implemented */
nand->hwcontrol = s3c2410_hwcontrol; nand->cmd_ctrl = s3c2410_hwcontrol;
nand->dev_ready = s3c2410_dev_ready; nand->dev_ready = s3c2410_dev_ready;
#ifdef CONFIG_S3C2410_NAND_HWECC #ifdef CONFIG_S3C2410_NAND_HWECC
nand->enable_hwecc = s3c2410_nand_enable_hwecc; nand->ecc.hwctl = s3c2410_nand_enable_hwecc;
nand->calculate_ecc = s3c2410_nand_calculate_ecc; nand->ecc.calculate = s3c2410_nand_calculate_ecc;
nand->correct_data = s3c2410_nand_correct_data; nand->ecc.correct = s3c2410_nand_correct_data;
nand->eccmode = NAND_ECC_HW3_512; nand->ecc.mode = NAND_ECC_HW3_512;
#else #else
nand->eccmode = NAND_ECC_SOFT; nand->ecc.mode = NAND_ECC_SOFT;
#endif #endif
#ifdef CONFIG_S3C2410_NAND_BBT #ifdef CONFIG_S3C2410_NAND_BBT