diff options
Diffstat (limited to 'drivers/mtd')
-rw-r--r-- | drivers/mtd/nand/mxc_nand.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/drivers/mtd/nand/mxc_nand.c b/drivers/mtd/nand/mxc_nand.c index 325645c60488..f981a1f054d6 100644 --- a/drivers/mtd/nand/mxc_nand.c +++ b/drivers/mtd/nand/mxc_nand.c | |||
@@ -165,7 +165,7 @@ static irqreturn_t mxc_nfc_irq(int irq, void *dev_id) | |||
165 | * complete by checking the INT bit of config2 register. | 165 | * complete by checking the INT bit of config2 register. |
166 | */ | 166 | */ |
167 | static void wait_op_done(struct mxc_nand_host *host, int max_retries, | 167 | static void wait_op_done(struct mxc_nand_host *host, int max_retries, |
168 | uint16_t param, int useirq) | 168 | int useirq) |
169 | { | 169 | { |
170 | uint32_t tmp; | 170 | uint32_t tmp; |
171 | 171 | ||
@@ -194,8 +194,8 @@ static void wait_op_done(struct mxc_nand_host *host, int max_retries, | |||
194 | udelay(1); | 194 | udelay(1); |
195 | } | 195 | } |
196 | if (max_retries < 0) | 196 | if (max_retries < 0) |
197 | DEBUG(MTD_DEBUG_LEVEL0, "%s(%d): INT not set\n", | 197 | DEBUG(MTD_DEBUG_LEVEL0, "%s: INT not set\n", |
198 | __func__, param); | 198 | __func__); |
199 | } | 199 | } |
200 | } | 200 | } |
201 | 201 | ||
@@ -209,7 +209,7 @@ static void send_cmd(struct mxc_nand_host *host, uint16_t cmd, int useirq) | |||
209 | writew(NFC_CMD, host->regs + NFC_CONFIG2); | 209 | writew(NFC_CMD, host->regs + NFC_CONFIG2); |
210 | 210 | ||
211 | /* Wait for operation to complete */ | 211 | /* Wait for operation to complete */ |
212 | wait_op_done(host, TROP_US_DELAY, cmd, useirq); | 212 | wait_op_done(host, TROP_US_DELAY, useirq); |
213 | } | 213 | } |
214 | 214 | ||
215 | /* This function sends an address (or partial address) to the | 215 | /* This function sends an address (or partial address) to the |
@@ -223,7 +223,7 @@ static void send_addr(struct mxc_nand_host *host, uint16_t addr, int islast) | |||
223 | writew(NFC_ADDR, host->regs + NFC_CONFIG2); | 223 | writew(NFC_ADDR, host->regs + NFC_CONFIG2); |
224 | 224 | ||
225 | /* Wait for operation to complete */ | 225 | /* Wait for operation to complete */ |
226 | wait_op_done(host, TROP_US_DELAY, addr, islast); | 226 | wait_op_done(host, TROP_US_DELAY, islast); |
227 | } | 227 | } |
228 | 228 | ||
229 | static void send_page(struct mxc_nand_host *host, uint8_t buf_id, | 229 | static void send_page(struct mxc_nand_host *host, uint8_t buf_id, |
@@ -247,7 +247,7 @@ static void send_page(struct mxc_nand_host *host, uint8_t buf_id, | |||
247 | writew(ops, host->regs + NFC_CONFIG2); | 247 | writew(ops, host->regs + NFC_CONFIG2); |
248 | 248 | ||
249 | /* Wait for operation to complete */ | 249 | /* Wait for operation to complete */ |
250 | wait_op_done(host, TROP_US_DELAY, spare_only, true); | 250 | wait_op_done(host, TROP_US_DELAY, true); |
251 | } | 251 | } |
252 | 252 | ||
253 | /* Request the NANDFC to perform a read of the NAND device ID. */ | 253 | /* Request the NANDFC to perform a read of the NAND device ID. */ |
@@ -267,7 +267,7 @@ static void send_read_id(struct mxc_nand_host *host) | |||
267 | writew(NFC_ID, host->regs + NFC_CONFIG2); | 267 | writew(NFC_ID, host->regs + NFC_CONFIG2); |
268 | 268 | ||
269 | /* Wait for operation to complete */ | 269 | /* Wait for operation to complete */ |
270 | wait_op_done(host, TROP_US_DELAY, 0, true); | 270 | wait_op_done(host, TROP_US_DELAY, true); |
271 | 271 | ||
272 | if (this->options & NAND_BUSWIDTH_16) { | 272 | if (this->options & NAND_BUSWIDTH_16) { |
273 | void __iomem *main_buf = host->regs + MAIN_AREA0; | 273 | void __iomem *main_buf = host->regs + MAIN_AREA0; |
@@ -303,7 +303,7 @@ static uint16_t get_dev_status(struct mxc_nand_host *host) | |||
303 | writew(NFC_STATUS, host->regs + NFC_CONFIG2); | 303 | writew(NFC_STATUS, host->regs + NFC_CONFIG2); |
304 | 304 | ||
305 | /* Wait for operation to complete */ | 305 | /* Wait for operation to complete */ |
306 | wait_op_done(host, TROP_US_DELAY, 0, true); | 306 | wait_op_done(host, TROP_US_DELAY, true); |
307 | 307 | ||
308 | /* Status is placed in first word of main buffer */ | 308 | /* Status is placed in first word of main buffer */ |
309 | /* get status, then recovery area 1 data */ | 309 | /* get status, then recovery area 1 data */ |