Mirrors/u-boot
2
0
Fork 0
mirror of https://github.com/AsahiLinux/u-boot synced 2024-11-11 07:34:31 +00:00
Code Issues Projects Releases Packages Wiki Activity

MPC8360ERDK: adapt NAND interface for the re-written FSL NAND UPM driver

Browse source 
This patch is based on the following patch sent a few minutes ago:
"NAND FSL UPM: driver re-write using the hwcontrol callback"
It is untested, of course. Anton, could you please give it a try.

Signed-off-by: Wolfgang Grandegger <wg@grandegger.com>
Acked-by: Anton Vorontsov <avorontsov@ru.mvista.com>
This commit is contained in:
Wolfgang Grandegger 2008-06-05 13:02:30 +02:00 committed by Wolfgang Denk
parent 96026d42fa
commit b4fe1a7109
1 changed files with 22 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
board/freescale/mpc8360erdk/nand.c
View file

@ -39,6 +39,24 @@ static const u32 upm_array[] = {
0xfffffc00, 0xfffffc00, 0xfffffc00, 0xfffffc01, /* Words 60 to 63 */ 0xfffffc00, 0xfffffc00, 0xfffffc00, 0xfffffc01, /* Words 60 to 63 */
}; };
static void upm_setup(struct fsl_upm *upm)
{
int i;
/* write upm array */
out_be32(upm->mxmr, MxMR_OP_WARR);
for (i = 0; i < 64; i++) {
out_be32(upm->mdr, upm_array[i]);
out_8(upm->io_addr, 0x0);
}
/* normal operation */
out_be32(upm->mxmr, MxMR_OP_NORM);
while (in_be32(upm->mxmr) != MxMR_OP_NORM)
eieio();
}
static int dev_ready(void) static int dev_ready(void)
{ {
if (in_be32(&im->qepio.ioport[4].pdat) & 0x00002000) { if (in_be32(&im->qepio.ioport[4].pdat) & 0x00002000) {
@ -52,10 +70,9 @@ static int dev_ready(void)
static struct fsl_upm_nand fun = { static struct fsl_upm_nand fun = {
.upm = { .upm = {
.array = upm_array,
.io_addr = (void *)CFG_NAND_BASE, .io_addr = (void *)CFG_NAND_BASE,
}, },
.width = 1, .width = 8,
.upm_cmd_offset = 8, .upm_cmd_offset = 8,
.upm_addr_offset = 16, .upm_addr_offset = 16,
.dev_ready = dev_ready, .dev_ready = dev_ready,
@ -68,5 +85,8 @@ int board_nand_init(struct nand_chip *nand)
fun.upm.mxmr = &im->lbus.mamr; fun.upm.mxmr = &im->lbus.mamr;
fun.upm.mdr = &im->lbus.mdr; fun.upm.mdr = &im->lbus.mdr;
fun.upm.mar = &im->lbus.mar; fun.upm.mar = &im->lbus.mar;
upm_setup(&fun.upm);
return fsl_upm_nand_init(nand, &fun); return fsl_upm_nand_init(nand, &fun);
} }