lkml.org 
[lkml]   [2010]   [Jun]   [18]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
Date
From
SubjectRe: [PATCH 4/5] mtd: mxc_nand fixups
[added Ivo to Cc]

On Fri, Jun 18, 2010 at 07:01:34PM +0200, John Ogness wrote:
> This patch reverts the driver to enabling/disabling the NFC interrupt
> mask rather than enabling/disabling the system interrupt. This cleans
> up the driver so that it doesn't rely on interrupts being disabled
> within the interrupt handler.

This behaviour was introduced in
a47bfd2eb66837653dc3b42541dfe4283dd41251 mxc_nand: support i.MX21

I guess this won't work on i.MX21.

Sascha

>
> The patch is against linux-next 20100618.
>
> Signed-off-by: John Ogness <john.ogness@linutronix.de>
> ---
> drivers/mtd/nand/mxc_nand.c | 11 ++++++++---
> 1 file changed, 8 insertions(+), 3 deletions(-)
>
> Index: linux-next-20100618/drivers/mtd/nand/mxc_nand.c
> ===================================================================
> --- linux-next-20100618.orig/drivers/mtd/nand/mxc_nand.c
> +++ linux-next-20100618/drivers/mtd/nand/mxc_nand.c
> @@ -173,8 +173,11 @@ static const char *part_probes[] = { "Re
> static irqreturn_t mxc_nfc_irq(int irq, void *dev_id)
> {
> struct mxc_nand_host *host = dev_id;
> + uint16_t tmp;
>
> - disable_irq_nosync(irq);
> + tmp = readw(host->regs + NFC_CONFIG1);
> + tmp |= NFC_INT_MSK; /* disable NFC interrupts */
> + writew(tmp, host->regs + NFC_CONFIG1);
>
> wake_up(&host->irq_waitq);
>
> @@ -192,7 +195,9 @@ static void wait_op_done(struct mxc_nand
> if (useirq) {
> if ((readw(host->regs + NFC_CONFIG2) & NFC_INT) == 0) {
>
> - enable_irq(host->irq);
> + tmp = readw(host->regs + NFC_CONFIG1);
> + tmp &= ~NFC_INT_MSK; /* enable NFC interrupts */
> + writew(tmp, host->regs + NFC_CONFIG1);
>
> wait_event(host->irq_waitq,
> readw(host->regs + NFC_CONFIG2) & NFC_INT);
> @@ -846,7 +851,7 @@ static int __init mxcnd_probe(struct pla
>
> host->irq = platform_get_irq(pdev, 0);
>
> - err = request_irq(host->irq, mxc_nfc_irq, IRQF_DISABLED, DRIVER_NAME, host);
> + err = request_irq(host->irq, mxc_nfc_irq, 0, DRIVER_NAME, host);
> if (err)
> goto eirq;
>
>

--
Pengutronix e.K. | |
Industrial Linux Solutions | http://www.pengutronix.de/ |
Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0 |
Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 |


\
 
 \ /
  Last update: 2010-06-18 22:57    [W:0.056 / U:0.088 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site