Skip to content

Commit 68763b2

Browse files
committed
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
2 parents 85cc575 + 3588b1c commit 68763b2

File tree

3 files changed

+6
-3
lines changed

3 files changed

+6
-3
lines changed

drivers/spi/atmel-quadspi.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -235,8 +235,8 @@
235235
/**
236236
* struct atmel_qspi_pcal - Pad Calibration Clock Division
237237
* @pclk_rate: peripheral clock rate.
238-
* @pclkdiv: calibration clock division. The clock applied to the calibration
239-
* cell is divided by pclkdiv + 1.
238+
* @pclk_div: calibration clock division. The clock applied to the calibration
239+
* cell is divided by pclk_div + 1.
240240
*/
241241
struct atmel_qspi_pcal {
242242
u32 pclk_rate;

drivers/spi/spi-pxa2xx.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -399,7 +399,7 @@ static void lpss_ssp_cs_control(struct spi_device *spi, bool enable)
399399
lpss_ssp_select_cs(spi, config);
400400

401401
mask = LPSS_CS_CONTROL_CS_HIGH;
402-
__lpss_ssp_update_priv(drv_data, config->reg_cs_ctrl, mask, enable ? mask : 0);
402+
__lpss_ssp_update_priv(drv_data, config->reg_cs_ctrl, mask, enable ? 0 : mask);
403403
if (config->cs_clk_stays_gated) {
404404
/*
405405
* Changing CS alone when dynamic clock gating is on won't

drivers/spi/spi-sn-f-ospi.c

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -116,6 +116,9 @@ struct f_ospi {
116116

117117
static u32 f_ospi_get_dummy_cycle(const struct spi_mem_op *op)
118118
{
119+
if (!op->dummy.nbytes)
120+
return 0;
121+
119122
return (op->dummy.nbytes * 8) / op->dummy.buswidth;
120123
}
121124

0 commit comments

Comments
 (0)