Skip to content

Commit

Permalink
mxc_nand: disable sp_en bit only once
Browse files Browse the repository at this point in the history
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
  • Loading branch information
Sascha Hauer committed Nov 12, 2009
1 parent 9467114 commit f06368f
Showing 1 changed file with 3 additions and 12 deletions.
15 changes: 3 additions & 12 deletions drivers/mtd/nand/mxc_nand.c
Original file line number Diff line number Diff line change
Expand Up @@ -274,16 +274,10 @@ static void send_page(struct mtd_info *mtd, unsigned int ops)
static void send_read_id(struct mxc_nand_host *host)
{
struct nand_chip *this = &host->nand;
uint16_t tmp;

/* NANDFC buffer 0 is used for device ID output */
writew(0x0, host->regs + NFC_BUF_ADDR);

/* Read ID into main buffer */
tmp = readw(host->regs + NFC_CONFIG1);
tmp &= ~NFC_SP_EN;
writew(tmp, host->regs + NFC_CONFIG1);

writew(NFC_ID, host->regs + NFC_CONFIG2);

/* Wait for operation to complete */
Expand All @@ -307,7 +301,7 @@ static uint16_t get_dev_status(struct mxc_nand_host *host)
{
void __iomem *main_buf = host->main_area1;
uint32_t store;
uint16_t ret, tmp;
uint16_t ret;
/* Issue status request to NAND device */

/* store the main area1 first word, later do recovery */
Expand All @@ -316,11 +310,6 @@ static uint16_t get_dev_status(struct mxc_nand_host *host)
* corruption of read/write buffer on status requests. */
writew(1, host->regs + NFC_BUF_ADDR);

/* Read status into main buffer */
tmp = readw(host->regs + NFC_CONFIG1);
tmp &= ~NFC_SP_EN;
writew(tmp, host->regs + NFC_CONFIG1);

writew(NFC_STATUS, host->regs + NFC_CONFIG2);

/* Wait for operation to complete */
Expand Down Expand Up @@ -739,8 +728,10 @@ static int __init mxcnd_probe(struct platform_device *pdev)
} else
BUG();

/* disable interrupt and spare enable */
tmp = readw(host->regs + NFC_CONFIG1);
tmp |= NFC_INT_MSK;
tmp &= ~NFC_SP_EN;
writew(tmp, host->regs + NFC_CONFIG1);

init_waitqueue_head(&host->irq_waitq);
Expand Down

0 comments on commit f06368f

Please sign in to comment.