diff options
author | Tony Lindgren <tony@atomide.com> | 2009-08-28 13:50:34 -0400 |
---|---|---|
committer | Tony Lindgren <tony@atomide.com> | 2009-08-28 13:50:34 -0400 |
commit | 6175556fdc0a66ce5f1831e22892fac6f28fc2ec (patch) | |
tree | 668273f5aef38e7df62d9a04987705ffc3e7f52a /drivers/mtd | |
parent | 941132606c7611246d2034cb7b01f9270c2d1ede (diff) |
OMAP: Rename OMAP_MPUIO_BASE to OMAP1_MPUIO_BASE
Rename OMAP_MPUIO_BASE to OMAP1_MPUIO_BASE
Signed-off-by: Tony Lindgren <tony@atomide.com>
Diffstat (limited to 'drivers/mtd')
-rw-r--r-- | drivers/mtd/nand/ams-delta.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/mtd/nand/ams-delta.c b/drivers/mtd/nand/ams-delta.c index 782994ead0e8..005b91f096f2 100644 --- a/drivers/mtd/nand/ams-delta.c +++ b/drivers/mtd/nand/ams-delta.c | |||
@@ -63,7 +63,7 @@ static void ams_delta_write_byte(struct mtd_info *mtd, u_char byte) | |||
63 | { | 63 | { |
64 | struct nand_chip *this = mtd->priv; | 64 | struct nand_chip *this = mtd->priv; |
65 | 65 | ||
66 | omap_writew(0, (OMAP_MPUIO_BASE + OMAP_MPUIO_IO_CNTL)); | 66 | omap_writew(0, (OMAP1_MPUIO_BASE + OMAP_MPUIO_IO_CNTL)); |
67 | omap_writew(byte, this->IO_ADDR_W); | 67 | omap_writew(byte, this->IO_ADDR_W); |
68 | ams_delta_latch2_write(AMS_DELTA_LATCH2_NAND_NWE, 0); | 68 | ams_delta_latch2_write(AMS_DELTA_LATCH2_NAND_NWE, 0); |
69 | ndelay(40); | 69 | ndelay(40); |
@@ -78,7 +78,7 @@ static u_char ams_delta_read_byte(struct mtd_info *mtd) | |||
78 | 78 | ||
79 | ams_delta_latch2_write(AMS_DELTA_LATCH2_NAND_NRE, 0); | 79 | ams_delta_latch2_write(AMS_DELTA_LATCH2_NAND_NRE, 0); |
80 | ndelay(40); | 80 | ndelay(40); |
81 | omap_writew(~0, (OMAP_MPUIO_BASE + OMAP_MPUIO_IO_CNTL)); | 81 | omap_writew(~0, (OMAP1_MPUIO_BASE + OMAP_MPUIO_IO_CNTL)); |
82 | res = omap_readw(this->IO_ADDR_R); | 82 | res = omap_readw(this->IO_ADDR_R); |
83 | ams_delta_latch2_write(AMS_DELTA_LATCH2_NAND_NRE, | 83 | ams_delta_latch2_write(AMS_DELTA_LATCH2_NAND_NRE, |
84 | AMS_DELTA_LATCH2_NAND_NRE); | 84 | AMS_DELTA_LATCH2_NAND_NRE); |
@@ -178,8 +178,8 @@ static int __init ams_delta_init(void) | |||
178 | ams_delta_mtd->priv = this; | 178 | ams_delta_mtd->priv = this; |
179 | 179 | ||
180 | /* Set address of NAND IO lines */ | 180 | /* Set address of NAND IO lines */ |
181 | this->IO_ADDR_R = (OMAP_MPUIO_BASE + OMAP_MPUIO_INPUT_LATCH); | 181 | this->IO_ADDR_R = (OMAP1_MPUIO_BASE + OMAP_MPUIO_INPUT_LATCH); |
182 | this->IO_ADDR_W = (OMAP_MPUIO_BASE + OMAP_MPUIO_OUTPUT); | 182 | this->IO_ADDR_W = (OMAP1_MPUIO_BASE + OMAP_MPUIO_OUTPUT); |
183 | this->read_byte = ams_delta_read_byte; | 183 | this->read_byte = ams_delta_read_byte; |
184 | this->write_buf = ams_delta_write_buf; | 184 | this->write_buf = ams_delta_write_buf; |
185 | this->read_buf = ams_delta_read_buf; | 185 | this->read_buf = ams_delta_read_buf; |