| From 4c7f1a1c3d1bfd35b5a4089766ff0882d7b4ee0d Mon Sep 17 00:00:00 2001 |
| From: Phil Elwell <phil@raspberrypi.com> |
| Date: Mon, 20 Apr 2020 13:41:10 +0100 |
| Subject: [PATCH] Revert "spi: spidev: Fix CS polarity if GPIO |
| descriptors are used" |
| |
| This reverts commit 83b2a8fe43bda0c11981ad6afa5dd0104d78be28. |
| --- |
| drivers/spi/spidev.c | 5 ----- |
| 1 file changed, 5 deletions(-) |
| |
| --- a/drivers/spi/spidev.c |
| +++ b/drivers/spi/spidev.c |
| @@ -410,7 +410,6 @@ spidev_ioctl(struct file *filp, unsigned |
| else |
| retval = get_user(tmp, (u32 __user *)arg); |
| if (retval == 0) { |
| - struct spi_controller *ctlr = spi->controller; |
| u32 save = spi->mode; |
| |
| if (tmp & ~SPI_MODE_MASK) { |
| @@ -418,10 +417,6 @@ spidev_ioctl(struct file *filp, unsigned |
| break; |
| } |
| |
| - if (ctlr->use_gpio_descriptors && ctlr->cs_gpiods && |
| - ctlr->cs_gpiods[spi->chip_select]) |
| - tmp |= SPI_CS_HIGH; |
| - |
| tmp |= spi->mode & ~SPI_MODE_MASK; |
| spi->mode = (u16)tmp; |
| retval = spi_setup(spi); |