Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9f6883fc authored by Martin Hundebøll's avatar Martin Hundebøll Committed by Greg Kroah-Hartman
Browse files

spi: bcm2835: fix gpio cs level inversion 



commit 5e31ba0c0543a04483b53151eb5b7413efece94c 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: 3e5ec1db8bfe ("spi: Fix SPI_CS_HIGH setting when using native and GPIO CS")
Cc: <stable@vger.kernel.org>
Signed-off-by: default avatarMartin Hundebøll <martin@geanix.com>
Link: https://lore.kernel.org/r/20201014090230.2706810-1-martin@geanix.com


Signed-off-by: default avatarMark Brown <broonie@kernel.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent f352cca8

drivers/spi/spi-bcm2835.c

+0 −12
Original line number Diff line number Diff line
@@ -1245,18 +1245,6 @@ static int bcm2835_spi_setup(struct spi_device *spi) 
	if (!chip)

		return 0;



	/*

	 * Retrieve the corresponding GPIO line used for CS.

	 * The inversion semantics will be handled by the GPIO core

	 * code, so we pass GPIOS_OUT_LOW for "unasserted" and

	 * the correct flag for inversion semantics. The SPI_CS_HIGH

	 * on spi->mode cannot be checked for polarity in this case

	 * as the flag use_gpio_descriptors enforces SPI_CS_HIGH.

	 */

	if (of_property_read_bool(spi->dev.of_node, "spi-cs-high"))

		lflags = GPIO_ACTIVE_HIGH;

	else

		lflags = GPIO_ACTIVE_LOW;

	spi->cs_gpiod = gpiochip_request_own_desc(chip, 8 - spi->chip_select,

						  DRV_NAME,

						  lflags,