ramips: remove useless cs gpio code for rt2800 SPI driver
authorShiji Yang <yangshiji66@qq.com>
Mon, 7 Oct 2024 15:21:16 +0000 (23:21 +0800)
committerHauke Mehrtens <hauke@hauke-m.de>
Sat, 12 Oct 2024 20:04:03 +0000 (22:04 +0200)
The SPI driver framework can handle it automatically in
spi.c:spi_setup():spi_set_cs():gpiod_set_value_cansleep().

Signed-off-by: Shiji Yang <yangshiji66@qq.com>
Link: https://github.com/openwrt/openwrt/pull/16636
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
target/linux/ramips/patches-6.6/821-SPI-ralink-add-Ralink-SoC-spi-driver.patch

index 6760d9f56cfcbc18afe5fc8ba7ef31b5304b3b40..318039fb4cd48ad8a51d9867034f74151df8afa8 100644 (file)
@@ -41,7 +41,7 @@ Acked-by: John Crispin <blogic@openwrt.org>
  obj-$(CONFIG_SPI_SC18IS602)           += spi-sc18is602.o
 --- /dev/null
 +++ b/drivers/spi/spi-rt2880.c
-@@ -0,0 +1,535 @@
+@@ -0,0 +1,519 @@
 +/*
 + * spi-rt2880.c -- Ralink RT288x/RT305x SPI controller driver
 + *
@@ -66,7 +66,6 @@ Acked-by: John Crispin <blogic@openwrt.org>
 +#include <linux/reset.h>
 +#include <linux/spi/spi.h>
 +#include <linux/platform_device.h>
-+#include <linux/gpio.h>
 +
 +#define DRIVER_NAME                   "spi-rt2880"
 +
@@ -333,18 +332,6 @@ Acked-by: John Crispin <blogic@openwrt.org>
 +      return err;
 +}
 +
-+/* copy from spi.c */
-+static void spi_set_cs(struct spi_device *spi, bool enable)
-+{
-+      if (spi->mode & SPI_CS_HIGH)
-+              enable = !enable;
-+
-+      if (spi->cs_gpiod)
-+              gpiod_set_value(spi->cs_gpiod, !enable);
-+      else if (spi->master->set_cs)
-+              spi->master->set_cs(spi, !enable);
-+}
-+
 +static int rt2880_spi_setup(struct spi_device *spi)
 +{
 +      struct spi_master *master = spi->master;
@@ -401,9 +388,6 @@ Acked-by: John Crispin <blogic@openwrt.org>
 +      if (reg != old_reg)
 +              rt2880_spi_write(rs, arbit_off, reg);
 +
-+      /* deselected the spi device */
-+      spi_set_cs(spi, false);
-+
 +      rt2880_dump_reg(master);
 +
 +      return 0;