Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

spi: mchp-pci1xxxx: Fix improper implementation of disabling chip select lines

Hardware does not have support to disable individual chip select lines.
Disable all chip select lines by using SPI_FORCE_CE bit.

Fixes: 1cc0cbea7167 ("spi: microchip: pci1xxxx: Add driver for SPI controller of PCI1XXXX PCIe switch")
Signed-off-by: Tharun Kumar P <tharunkumar.pasumarthi@microchip.com>
Link: https://lore.kernel.org/r/20230404171613.1336093-4-tharunkumar.pasumarthi@microchip.com
Signed-off-by: Mark Brown <broonie@kernel.org>

authored by

Tharun Kumar P and committed by
Mark Brown
45d2af82 4266d216

+5 -12
+5 -12
drivers/spi/spi-pci1xxxx.c
··· 114 114 115 115 /* Set the DEV_SEL bits of the SPI_MST_CTL_REG */ 116 116 regval = readl(par->reg_base + SPI_MST_CTL_REG_OFFSET(p->hw_inst)); 117 - if (enable) { 117 + if (!enable) { 118 + regval |= SPI_FORCE_CE; 118 119 regval &= ~SPI_MST_CTL_DEVSEL_MASK; 119 120 regval |= (spi_get_chipselect(spi, 0) << 25); 120 - writel(regval, 121 - par->reg_base + SPI_MST_CTL_REG_OFFSET(p->hw_inst)); 122 121 } else { 123 - regval &= ~(spi_get_chipselect(spi, 0) << 25); 124 - writel(regval, 125 - par->reg_base + SPI_MST_CTL_REG_OFFSET(p->hw_inst)); 126 - 122 + regval &= ~SPI_FORCE_CE; 127 123 } 124 + writel(regval, par->reg_base + SPI_MST_CTL_REG_OFFSET(p->hw_inst)); 128 125 } 129 126 130 127 static u8 pci1xxxx_get_clock_div(u32 hz) ··· 196 199 else 197 200 regval &= ~SPI_MST_CTL_MODE_SEL; 198 201 199 - regval |= ((clkdiv << 5) | SPI_FORCE_CE); 202 + regval |= (clkdiv << 5); 200 203 regval &= ~SPI_MST_CTL_CMD_LEN_MASK; 201 204 regval |= (len << 8); 202 205 writel(regval, par->reg_base + ··· 220 223 } 221 224 } 222 225 } 223 - 224 - regval = readl(par->reg_base + SPI_MST_CTL_REG_OFFSET(p->hw_inst)); 225 - regval &= ~SPI_FORCE_CE; 226 - writel(regval, par->reg_base + SPI_MST_CTL_REG_OFFSET(p->hw_inst)); 227 226 p->spi_xfer_in_progress = false; 228 227 229 228 return 0;