Commit 68763b29 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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
parents 85cc5751 3588b1c0

drivers/spi/atmel-quadspi.c

+2 −2
Original line number Diff line number Diff line
@@ -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;

drivers/spi/spi-pxa2xx.c

+1 −1
Original line number Diff line number Diff line
@@ -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

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

+3 −0
Original line number Diff line number Diff line
@@ -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;

}