diff options
| -rw-r--r-- | drivers/mtd/nand/tmio_nand.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/mtd/nand/tmio_nand.c b/drivers/mtd/nand/tmio_nand.c index cbab654b03c8..edb1e322113d 100644 --- a/drivers/mtd/nand/tmio_nand.c +++ b/drivers/mtd/nand/tmio_nand.c | |||
| @@ -109,7 +109,7 @@ struct tmio_nand { | |||
| 109 | 109 | ||
| 110 | void __iomem *ccr; | 110 | void __iomem *ccr; |
| 111 | void __iomem *fcr; | 111 | void __iomem *fcr; |
| 112 | unsigned long fcr_phys; | 112 | unsigned long fcr_base; |
| 113 | 113 | ||
| 114 | unsigned int irq; | 114 | unsigned int irq; |
| 115 | 115 | ||
| @@ -316,8 +316,8 @@ static int tmio_hw_init(struct platform_device *dev, struct tmio_nand *tmio) | |||
| 316 | tmio_iowrite8(0x81, tmio->ccr + CCR_ICC); | 316 | tmio_iowrite8(0x81, tmio->ccr + CCR_ICC); |
| 317 | 317 | ||
| 318 | /* (10h)BaseAddress 0x1000 spba.spba2 */ | 318 | /* (10h)BaseAddress 0x1000 spba.spba2 */ |
| 319 | tmio_iowrite16(tmio->fcr_phys, tmio->ccr + CCR_BASE); | 319 | tmio_iowrite16(tmio->fcr_base, tmio->ccr + CCR_BASE); |
| 320 | tmio_iowrite16(tmio->fcr_phys >> 16, tmio->ccr + CCR_BASE + 16); | 320 | tmio_iowrite16(tmio->fcr_base >> 16, tmio->ccr + CCR_BASE + 2); |
| 321 | 321 | ||
| 322 | /* (04h)Command Register I/O spcmd */ | 322 | /* (04h)Command Register I/O spcmd */ |
| 323 | tmio_iowrite8(0x02, tmio->ccr + CCR_COMMAND); | 323 | tmio_iowrite8(0x02, tmio->ccr + CCR_COMMAND); |
| @@ -395,7 +395,7 @@ static int tmio_probe(struct platform_device *dev) | |||
| 395 | goto err_iomap_ccr; | 395 | goto err_iomap_ccr; |
| 396 | } | 396 | } |
| 397 | 397 | ||
| 398 | tmio->fcr_phys = (unsigned long)fcr->start; | 398 | tmio->fcr_base = fcr->start & 0xfffff; |
| 399 | tmio->fcr = ioremap(fcr->start, fcr->end - fcr->start + 1); | 399 | tmio->fcr = ioremap(fcr->start, fcr->end - fcr->start + 1); |
| 400 | if (!tmio->fcr) { | 400 | if (!tmio->fcr) { |
| 401 | retval = -EIO; | 401 | retval = -EIO; |
