Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7aaf28ac authored by Sascha Hauer's avatar Sascha Hauer Committed by David Woodhouse
Browse files

mxc_nand: factor out a check_int function 



Signed-off-by: default avatarSascha Hauer <s.hauer@pengutronix.de>
Signed-off-by: default avatarDavid Woodhouse <David.Woodhouse@intel.com>
parent 5f97304e

drivers/mtd/nand/mxc_nand.c

+19 −13
Original line number Original line Diff line number Diff line
@@ -122,6 +122,7 @@ struct mxc_nand_host { 
	void			(*send_page)(struct mtd_info *, unsigned int);

	void			(*send_page)(struct mtd_info *, unsigned int);

	void			(*send_read_id)(struct mxc_nand_host *);

	void			(*send_read_id)(struct mxc_nand_host *);

	uint16_t		(*get_dev_status)(struct mxc_nand_host *);

	uint16_t		(*get_dev_status)(struct mxc_nand_host *);

	int			(*check_int)(struct mxc_nand_host *);

};

};





/* OOB placement block for use with hardware ecc generation */

/* OOB placement block for use with hardware ecc generation */
@@ -181,34 +182,38 @@ static irqreturn_t mxc_nfc_irq(int irq, void *dev_id) 
	return IRQ_HANDLED;

	return IRQ_HANDLED;

}

}





static int check_int_v1_v2(struct mxc_nand_host *host)

{

	uint32_t tmp;



	tmp = readw(host->regs + NFC_CONFIG2);

	if (!(tmp & NFC_INT))

		return 0;



	writew(tmp & ~NFC_INT, NFC_CONFIG2);



	return 1;

}



/* This function polls the NANDFC to wait for the basic operation to

/* This function polls the NANDFC to wait for the basic operation to

 * complete by checking the INT bit of config2 register.

 * complete by checking the INT bit of config2 register.

 */

 */

static void wait_op_done(struct mxc_nand_host *host, int useirq)

static void wait_op_done(struct mxc_nand_host *host, int useirq)

{

{

	uint16_t tmp;

	int max_retries = 8000;

	int max_retries = 8000;





	if (useirq) {

	if (useirq) {

		if ((readw(host->regs + NFC_CONFIG2) & NFC_INT) == 0) {

		if (!host->check_int(host)) {





			enable_irq(host->irq);

			enable_irq(host->irq);





			wait_event(host->irq_waitq,

			wait_event(host->irq_waitq, host->check_int(host));

				readw(host->regs + NFC_CONFIG2) & NFC_INT);



			tmp = readw(host->regs + NFC_CONFIG2);

			tmp  &= ~NFC_INT;

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

		}

		}

	} else {

	} else {

		while (max_retries-- > 0) {

		while (max_retries-- > 0) {

			if (readw(host->regs + NFC_CONFIG2) & NFC_INT) {

			if (host->check_int(host))

				tmp = readw(host->regs + NFC_CONFIG2);

				tmp  &= ~NFC_INT;

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

				break;

				break;

			}



			udelay(1);

			udelay(1);

		}

		}

		if (max_retries < 0)

		if (max_retries < 0)
@@ -774,6 +779,7 @@ static int __init mxcnd_probe(struct platform_device *pdev) 
		host->send_page = send_page_v1_v2;

		host->send_page = send_page_v1_v2;

		host->send_read_id = send_read_id_v1_v2;

		host->send_read_id = send_read_id_v1_v2;

		host->get_dev_status = get_dev_status_v1_v2;

		host->get_dev_status = get_dev_status_v1_v2;

		host->check_int = check_int_v1_v2;

	}

	}





	if (nfc_is_v21()) {

	if (nfc_is_v21()) {