Skip to content

Commit d42bafd

Browse files
hundebollgregkh
authored andcommitted
spi: bcm2835: fix gpio cs level inversion
commit 5e31ba0 upstream. The work on improving gpio chip-select in spi core, and the following fixes, has caused the bcm2835 spi driver to use wrong levels. Fix this by simply removing level handling in the bcm2835 driver, and let the core do its work. Fixes: 3e5ec1d ("spi: Fix SPI_CS_HIGH setting when using native and GPIO CS") Cc: <stable@vger.kernel.org> Signed-off-by: Martin Hundebøll <martin@geanix.com> Link: https://lore.kernel.org/r/20201014090230.2706810-1-martin@geanix.com Signed-off-by: Mark Brown <broonie@kernel.org> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
1 parent 7ba48d2 commit d42bafd

1 file changed

Lines changed: 0 additions & 12 deletions

File tree

drivers/spi/spi-bcm2835.c

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1259,18 +1259,6 @@ static int bcm2835_spi_setup(struct spi_device *spi)
12591259
if (!chip)
12601260
return 0;
12611261

1262-
/*
1263-
* Retrieve the corresponding GPIO line used for CS.
1264-
* The inversion semantics will be handled by the GPIO core
1265-
* code, so we pass GPIOD_OUT_LOW for "unasserted" and
1266-
* the correct flag for inversion semantics. The SPI_CS_HIGH
1267-
* on spi->mode cannot be checked for polarity in this case
1268-
* as the flag use_gpio_descriptors enforces SPI_CS_HIGH.
1269-
*/
1270-
if (of_property_read_bool(spi->dev.of_node, "spi-cs-high"))
1271-
lflags = GPIO_ACTIVE_HIGH;
1272-
else
1273-
lflags = GPIO_ACTIVE_LOW;
12741262
spi->cs_gpiod = gpiochip_request_own_desc(chip, 8 - spi->chip_select,
12751263
DRV_NAME,
12761264
lflags,

0 commit comments

Comments
 (0)