Commit 7426cedc authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'spi-fix-v5.13-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi 

Pull spi fixes from Mark Brown:
 "A couple of small, driver specific fixes that arrived in the past few
  weeks"

* tag 'spi-fix-v5.13-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi:
  spi: spi-nxp-fspi: move the register operation after the clock enable
  spi: tegra20-slink: Ensure SPI controller reset is deasserted
parents 7266f203 f422316c

drivers/spi/spi-nxp-fspi.c

+5 −6
Original line number Diff line number Diff line
@@ -1124,12 +1124,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);
@@ -1167,6 +1161,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)

drivers/spi/spi-tegra20-slink.c

+5 −0
Original line number Diff line number Diff line
@@ -1118,6 +1118,11 @@ static int tegra_slink_probe(struct platform_device *pdev) 
		pm_runtime_put_noidle(&pdev->dev);

		goto exit_pm_disable;

	}



	reset_control_assert(tspi->rst);

	udelay(2);

	reset_control_deassert(tspi->rst);



	tspi->def_command_reg  = SLINK_M_S;

	tspi->def_command2_reg = SLINK_CS_ACTIVE_BETWEEN;

	tegra_slink_writel(tspi, tspi->def_command_reg, SLINK_COMMAND);