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

torvalds · torvalds · commit c381c89de180 · 2024-03-07T12:21:18.000-08:00
Pull spi fix from Mark Brown:
 "One small fix for the newly added cs42l43 driver which would have
  caused it problems working in some system configurations by needlessly
  restricting chip select configurations"

* tag 'spi-fix-v6.8-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi:
  spi: cs42l43: Don't limit native CS to the first chip select
diff --git a/drivers/spi/spi-cs42l43.c b/drivers/spi/spi-cs42l43.c
@@ -148,8 +148,7 @@ static void cs42l43_set_cs(struct spi_device *spi, bool is_high)
 {
 	struct cs42l43_spi *priv = spi_controller_get_devdata(spi->controller);
 
-	if (spi_get_chipselect(spi, 0) == 0)
-		regmap_write(priv->regmap, CS42L43_SPI_CONFIG2, !is_high);
+	regmap_write(priv->regmap, CS42L43_SPI_CONFIG2, !is_high);
 }
 
 static int cs42l43_prepare_message(struct spi_controller *ctlr, struct spi_message *msg)

Original file line number	Diff line number	Diff line change
`@@ -148,8 +148,7 @@ static void cs42l43_set_cs(struct spi_device *spi, bool is_high)`
`148`	`148`	`{`
`149`	`149`	`struct cs42l43_spi *priv = spi_controller_get_devdata(spi->controller);`
`150`	`150`
`151`		`- if (spi_get_chipselect(spi, 0) == 0)`
`152`		`- regmap_write(priv->regmap, CS42L43_SPI_CONFIG2, !is_high);`
	`151`	`+ regmap_write(priv->regmap, CS42L43_SPI_CONFIG2, !is_high);`
`153`	`152`	`}`
`154`	`153`
`155`	`154`	`static int cs42l43_prepare_message(struct spi_controller ctlr, struct spi_message msg)`