git.openwrt.org Git - openwrt/staging/981213.git/blob

   1 From 4c7f1a1c3d1bfd35b5a4089766ff0882d7b4ee0d Mon Sep 17 00:00:00 2001
   2 From: Phil Elwell <phil@raspberrypi.com>
   3 Date: Mon, 20 Apr 2020 13:41:10 +0100
   4 Subject: [PATCH] Revert "spi: spidev: Fix CS polarity if GPIO
   5  descriptors are used"
   6
   7 This reverts commit 83b2a8fe43bda0c11981ad6afa5dd0104d78be28.
   8 ---
   9  drivers/spi/spidev.c | 5 -----
  10  1 file changed, 5 deletions(-)
  11
  12 --- a/drivers/spi/spidev.c
  13 +++ b/drivers/spi/spidev.c
  14 @@ -399,7 +399,6 @@ spidev_ioctl(struct file *filp, unsigned
  15                 else
  16                         retval = get_user(tmp, (u32 __user *)arg);
  17                 if (retval == 0) {
  18 -                       struct spi_controller *ctlr = spi->controller;
  19                         u32     save = spi->mode;
  20
  21                         if (tmp & ~SPI_MODE_MASK) {
  22 @@ -407,10 +406,6 @@ spidev_ioctl(struct file *filp, unsigned
  23                                 break;
  24                         }
  25
  26 -                       if (ctlr->use_gpio_descriptors && ctlr->cs_gpiods &&
  27 -                           ctlr->cs_gpiods[spi->chip_select])
  28 -                               tmp |= SPI_CS_HIGH;
  29 -
  30                         tmp |= spi->mode & ~SPI_MODE_MASK;
  31                         spi->mode = (u16)tmp;
  32                         retval = spi_setup(spi);