1
0
Fork 0
mirror of synced 2025-03-06 20:59:54 +01:00

spi: Fixes for v6.14

A small collection of driver specific fixes, none standing out in
 particular.
 -----BEGIN PGP SIGNATURE-----
 
 iQEzBAABCgAdFiEEreZoqmdXGLWf4p/qJNaLcl1Uh9AFAmeuQCAACgkQJNaLcl1U
 h9CCVAf/Rr150avak+/UYx7qVw6mQxKSNhElT3FccHZv8hOj0jlQhwXYS/o9dbzJ
 fHua5LNXW9eOjj7O4It0VxW0TNT51cw/kkBPF0qZOfd4BkLF2sulU9LiKVgE+6D6
 //NFOiRn5pXpAa0MXkiRouHxvJzPt+793oY9xE9pxYunBUww+cVk4bqMUmCl8ZmW
 oWrF3x9YjIc55WAep6C/5dcQ7kHFwV1xiZa/0kTsmQvngaCMIjUSmtY2IPc+3NxV
 a7yMNBs8AV784O3613WWHewiWEpzYCHt8ibqCqXrZn3U/8Tg7bTdIwKy5I9+WdEr
 R1NFw5XdpUoeIQxMvmfo83VHrF9O2Q==
 =W2sb
 -----END PGP SIGNATURE-----

Merge tag 'spi-fix-v6.14-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi

Pull spi fixes from Mark Brown:
 "A small collection of driver specific fixes, none standing out in
  particular"

* tag 'spi-fix-v6.14-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi:
  spi: sn-f-ospi: Fix division by zero
  spi: pxa2xx: Fix regression when toggling chip select on LPSS devices
  spi: atmel-quadspi: Fix warning in doc-comment
This commit is contained in:
Linus Torvalds 2025-02-13 13:13:37 -08:00
commit 68763b29e0
3 changed files with 6 additions and 3 deletions

View file

@ -235,8 +235,8 @@
/**
* struct atmel_qspi_pcal - Pad Calibration Clock Division
* @pclk_rate: peripheral clock rate.
* @pclkdiv: calibration clock division. The clock applied to the calibration
* cell is divided by pclkdiv + 1.
* @pclk_div: calibration clock division. The clock applied to the calibration
* cell is divided by pclk_div + 1.
*/
struct atmel_qspi_pcal {
u32 pclk_rate;

View file

@ -399,7 +399,7 @@ static void lpss_ssp_cs_control(struct spi_device *spi, bool enable)
lpss_ssp_select_cs(spi, config);
mask = LPSS_CS_CONTROL_CS_HIGH;
__lpss_ssp_update_priv(drv_data, config->reg_cs_ctrl, mask, enable ? mask : 0);
__lpss_ssp_update_priv(drv_data, config->reg_cs_ctrl, mask, enable ? 0 : mask);
if (config->cs_clk_stays_gated) {
/*
* Changing CS alone when dynamic clock gating is on won't

View file

@ -116,6 +116,9 @@ struct f_ospi {
static u32 f_ospi_get_dummy_cycle(const struct spi_mem_op *op)
{
if (!op->dummy.nbytes)
return 0;
return (op->dummy.nbytes * 8) / op->dummy.buswidth;
}