UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

spi: Fixes for v5.13 

A couple of small, driver specific fixes that arrived in the past few
 weeks.
 -----BEGIN PGP SIGNATURE-----
 
 iQEzBAABCgAdFiEEreZoqmdXGLWf4p/qJNaLcl1Uh9AFAmDTaWwACgkQJNaLcl1U
 h9AfXAf/VzP5O52cY6BahJ+Z+NQ+NXoLenmBs8ouQTHLBDyWWXPfXbJw+0VHOC5C
 vpdgsNFFkoEqDTA/E7FKQWNR2Pnl2Um3kRHf2ZuTTHk10cRewD23O5sv1zQkBNgx
 hDqaR6d8QeYkNt5l1utMx6xolHZMkRYv2jOUPfj+pcB7Y2RA/0/qyk8BQKF9oqc1
 m3m0PF9X3oDfbJ1/coxZtWsrnIdtuz/ITxdggSHBI566pGAJKBB+RHSaNTG2tCp0
 I1ogwrCp0yU9hcUtHl2DW546BvSSh/00vvtJr4KYFeb2UKzSo1eBDA16vKsj9BQP
 buFL+rblKz2UxwYrL+Uzmoji3b1hsQ==
 =GcX9
 -----END PGP SIGNATURE-----

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
This commit is contained in:
Linus Torvalds 2021-06-23 11:29:15 -07:00
parent 7266f2030e f422316c8e
commit 7426cedc7d
2 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
drivers/spi/spi-nxp-fspi.c
View File

@ -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)

5
drivers/spi/spi-tegra20-slink.c
View File

@ -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);