target/linux/bcm27xx/patches-6.1/950-0227-spi-Force-CS_HIGH-if-GPIO-descriptors-are-used.patch

   1 From 51a164a0654895d930acb4e3bd096f7bf54c058b Mon Sep 17 00:00:00 2001
   2 From: Phil Elwell <phil@raspberrypi.com>
   3 Date: Fri, 17 Apr 2020 10:46:19 +0100
   4 Subject: [PATCH] spi: Force CS_HIGH if GPIO descriptors are used
   5
   6 Commit f3186dd87669 ("spi: Optionally use GPIO descriptors for CS GPIOs")
   7 amended of_spi_parse_dt() to always set SPI_CS_HIGH for SPI slaves whose
   8 Chip Select is defined by a "cs-gpios" devicetree property.
   9
  10 This change breaks drivers whose probe functions set the mode field of
  11 the spi_device because in doing so they clear the SPI_CS_HIGH flag.
  12
  13 Fix by setting SPI_CS_HIGH in spi_setup (under the same conditions as
  14 in of_spi_parse_dt()).
  15
  16 See also: 83b2a8fe43bd ("spi: spidev: Fix CS polarity if GPIO descriptors are used")
  17
  18 Fixes: f3186dd87669 ("spi: Optionally use GPIO descriptors for CS GPIOs")
  19 Signed-off-by: Phil Elwell <phil@raspberrypi.com>
  20
  21 SQUASH: spi: Demote SPI_CS_HIGH warning to KERN_DEBUG
  22
  23 This warning is unavoidable from a client's perspective and
  24 doesn't indicate anything wrong (just surprising).
  25
  26 SQUASH with "spi: use_gpio_descriptor fixup moved to spi_setup"
  27
  28 Signed-off-by: Phil Elwell <phil@raspberrypi.com>
  29 ---
  30  drivers/spi/spi.c | 9 +++++++++
  31  1 file changed, 9 insertions(+)
  32
  33 --- a/drivers/spi/spi.c
  34 +++ b/drivers/spi/spi.c
  35 @@ -3633,6 +3633,7 @@ static int __spi_validate_bits_per_word(
  36   */
  37  int spi_setup(struct spi_device *spi)
  38  {
  39 +       struct spi_controller *ctlr = spi->controller;
  40         unsigned        bad_bits, ugly_bits;
  41         int             status = 0;
  42
  43 @@ -3653,6 +3654,14 @@ int spi_setup(struct spi_device *spi)
  44                 (SPI_TX_DUAL | SPI_TX_QUAD | SPI_TX_OCTAL |
  45                  SPI_RX_DUAL | SPI_RX_QUAD | SPI_RX_OCTAL)))
  46                 return -EINVAL;
  47 +
  48 +       if (ctlr->use_gpio_descriptors && ctlr->cs_gpiods &&
  49 +           ctlr->cs_gpiods[spi->chip_select] && !(spi->mode & SPI_CS_HIGH)) {
  50 +               dev_dbg(&spi->dev,
  51 +                       "setup: forcing CS_HIGH (use_gpio_descriptors)\n");
  52 +               spi->mode |= SPI_CS_HIGH;
  53 +       }
  54 +
  55         /*
  56          * Help drivers fail *cleanly* when they need options
  57          * that aren't supported with their current controller.