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

Commit 14421862 authored by Haibo Chen's avatar Haibo Chen Committed by Sasha Levin
Browse files

spi: spi-nxp-fspi: move the register operation after the clock enable 



[ Upstream commit f422316c8e9d3c4aff3c56549dfb44a677d02f14 ]

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

Fixes: 71d80563b076 ("spi: spi-nxp-fspi: fix fspi panic by unexpected interrupts")
Signed-off-by: default avatarHaibo Chen <haibo.chen@nxp.com>
Link: https://lore.kernel.org/r/1623317073-25158-1-git-send-email-haibo.chen@nxp.com


Signed-off-by: default avatarMark Brown <broonie@kernel.org>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent 7bc73260

drivers/spi/spi-nxp-fspi.c

+5 −6
Original line number Diff line number Diff line
@@ -975,12 +975,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 */

	res = platform_get_resource_byname(pdev, IORESOURCE_MEM, "fspi_mmap");

	f->ahb_addr = devm_ioremap_resource(dev, res);
@@ -1012,6 +1006,11 @@ 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 irq */

	ret = platform_get_irq(pdev, 0);

	if (ret < 0)