Skip to content

Commit

Permalink
spi: spi-nxp-fspi: move the register operation after the clock enable
Browse files Browse the repository at this point in the history
[ Upstream commit f422316 ]

Move the register operation after the clock enable, otherwise system
will stuck when this driver probe.

Fixes: 71d8056 ("spi: spi-nxp-fspi: fix fspi panic by unexpected interrupts")
Signed-off-by: Haibo Chen <haibo.chen@nxp.com>
Link: https://lore.kernel.org/r/1623317073-25158-1-git-send-email-haibo.chen@nxp.com
Signed-off-by: Mark Brown <broonie@kernel.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>
  • Loading branch information
Haibo Chen authored and Sasha Levin committed Jun 30, 2021
1 parent 82fde4c commit 0869bd2
Showing 1 changed file with 5 additions and 6 deletions.
11 changes: 5 additions & 6 deletions drivers/spi/spi-nxp-fspi.c
Expand Up @@ -1033,12 +1033,6 @@ static int nxp_fspi_probe(struct platform_device *pdev)
goto err_put_ctrl;
}

/* Clear potential interrupts */
reg = fspi_readl(f, f->iobase + FSPI_INTR);
if (reg)
fspi_writel(f, reg, f->iobase + FSPI_INTR);


/* find the resources - controller memory mapped space */
if (is_acpi_node(f->dev->fwnode))
res = platform_get_resource(pdev, IORESOURCE_MEM, 1);
Expand Down Expand Up @@ -1076,6 +1070,11 @@ static int nxp_fspi_probe(struct platform_device *pdev)
}
}

/* Clear potential interrupts */
reg = fspi_readl(f, f->iobase + FSPI_INTR);
if (reg)
fspi_writel(f, reg, f->iobase + FSPI_INTR);

/* find the irq */
ret = platform_get_irq(pdev, 0);
if (ret < 0)
Expand Down

0 comments on commit 0869bd2

Please sign in to comment.