spi: Zap SOFT_SPI (non-dm)

- Deadline for DM migration already passed by months.
- Sent couple of zap patches and
- No response on dm conversation
hence removed the driver.

Signed-off-by: Jagan Teki <jagan@amarulasolutions.com>
Reviewed-by: Simon Glass <sjg@chromium.org>

diff --git a/drivers/spi/Kconfig b/drivers/spi/Kconfig
index ff431a27efd44e27fbfd095dcbe9895122c38b83..d32858bedf5f9d47087085e2aca9650af0a57db6 100644 (file)
--- a/drivers/spi/Kconfig
+++ b/drivers/spi/Kconfig
@@ -286,6 +286,12 @@ config SPI_SIFIVE
 
          The SiFive SPI controller driver is found on various SiFive SoCs.
 
+config SOFT_SPI
+       bool "Soft SPI driver"
+       help
+        Enable Soft SPI driver. This driver is to use GPIO simulate
+        the SPI protocol.
+
 config SPI_SUNXI
        bool "Allwinner SoC SPI controllers"
        default ARCH_SUNXI
@@ -391,13 +397,6 @@ config ZYNQMP_GQSPI
 
 endif # if DM_SPI
 
-config SOFT_SPI
-       bool "Soft SPI driver"
-       depends on DM_SPI || (DEPRECATED && !DM_SPI)
-       help
-        Enable Soft SPI driver. This driver is to use GPIO simulate
-        the SPI protocol.
-
 config FSL_ESPI
        bool "Freescale eSPI driver"
        imply SPI_FLASH_BAR

diff --git a/drivers/spi/Makefile b/drivers/spi/Makefile
index 342776404a50f8ad48f4ff2a0f47b5e5f8f9afcc..54881a74124db14303572499a986f9d648f675ea 100644 (file)
--- a/drivers/spi/Makefile
+++ b/drivers/spi/Makefile
@@ -13,7 +13,6 @@ obj-$(CONFIG_TI_QSPI) += ti_qspi.o
 else
 obj-y += spi.o
 obj-$(CONFIG_SPI_MEM) += spi-mem-nodm.o
-obj-$(CONFIG_SOFT_SPI) += soft_spi_legacy.o
 endif
 
 obj-$(CONFIG_ALTERA_SPI) += altera_spi.o

diff --git a/drivers/spi/soft_spi_legacy.c b/drivers/spi/soft_spi_legacy.c
deleted file mode 100644 (file)
index cc5ab5f..0000000
--- a/drivers/spi/soft_spi_legacy.c
+++ /dev/null
@@ -1,168 +0,0 @@
-// SPDX-License-Identifier: GPL-2.0+
-/*
- * (C) Copyright 2002
- * Gerald Van Baren, Custom IDEAS, vanbaren@cideas.com.
- *
- * Influenced by code from:
- * Wolfgang Denk, DENX Software Engineering, wd@denx.de.
- */
-
-#include <common.h>
-#include <spi.h>
-
-#include <malloc.h>
-
-/*-----------------------------------------------------------------------
- * Definitions
- */
-
-#ifdef DEBUG_SPI
-#define PRINTD(fmt,args...)    printf (fmt ,##args)
-#else
-#define PRINTD(fmt,args...)
-#endif
-
-struct soft_spi_slave {
-       struct spi_slave slave;
-       unsigned int mode;
-};
-
-static inline struct soft_spi_slave *to_soft_spi(struct spi_slave *slave)
-{
-       return container_of(slave, struct soft_spi_slave, slave);
-}
-
-/*=====================================================================*/
-/*                         Public Functions                            */
-/*=====================================================================*/
-
-struct spi_slave *spi_setup_slave(unsigned int bus, unsigned int cs,
-               unsigned int max_hz, unsigned int mode)
-{
-       struct soft_spi_slave *ss;
-
-       if (!spi_cs_is_valid(bus, cs))
-               return NULL;
-
-       ss = spi_alloc_slave(struct soft_spi_slave, bus, cs);
-       if (!ss)
-               return NULL;
-
-       ss->mode = mode;
-
-       /* TODO: Use max_hz to limit the SCK rate */
-
-       return &ss->slave;
-}
-
-void spi_free_slave(struct spi_slave *slave)
-{
-       struct soft_spi_slave *ss = to_soft_spi(slave);
-
-       free(ss);
-}
-
-int spi_claim_bus(struct spi_slave *slave)
-{
-#ifdef CONFIG_SYS_IMMR
-       volatile immap_t *immr = (immap_t *)CONFIG_SYS_IMMR;
-#endif
-       struct soft_spi_slave *ss = to_soft_spi(slave);
-
-       /*
-        * Make sure the SPI clock is in idle state as defined for
-        * this slave.
-        */
-       if (ss->mode & SPI_CPOL)
-               SPI_SCL(1);
-       else
-               SPI_SCL(0);
-
-       return 0;
-}
-
-void spi_release_bus(struct spi_slave *slave)
-{
-       /* Nothing to do */
-}
-
-/*-----------------------------------------------------------------------
- * SPI transfer
- *
- * This writes "bitlen" bits out the SPI MOSI port and simultaneously clocks
- * "bitlen" bits in the SPI MISO port.  That's just the way SPI works.
- *
- * The source of the outgoing bits is the "dout" parameter and the
- * destination of the input bits is the "din" parameter.  Note that "dout"
- * and "din" can point to the same memory location, in which case the
- * input data overwrites the output data (since both are buffered by
- * temporary variables, this is OK).
- */
-int  spi_xfer(struct spi_slave *slave, unsigned int bitlen,
-               const void *dout, void *din, unsigned long flags)
-{
-#ifdef CONFIG_SYS_IMMR
-       volatile immap_t *immr = (immap_t *)CONFIG_SYS_IMMR;
-#endif
-       struct soft_spi_slave *ss = to_soft_spi(slave);
-       uchar           tmpdin  = 0;
-       uchar           tmpdout = 0;
-       const u8        *txd = dout;
-       u8              *rxd = din;
-       int             cpol = ss->mode & SPI_CPOL;
-       int             cpha = ss->mode & SPI_CPHA;
-       unsigned int    j;
-
-       PRINTD("spi_xfer: slave %u:%u dout %08X din %08X bitlen %u\n",
-               slave->bus, slave->cs, *(uint *)txd, *(uint *)rxd, bitlen);
-
-       if (flags & SPI_XFER_BEGIN)
-               spi_cs_activate(slave);
-
-       for(j = 0; j < bitlen; j++) {
-               /*
-                * Check if it is time to work on a new byte.
-                */
-               if ((j % 8) == 0) {
-                       if (txd)
-                               tmpdout = *txd++;
-                       else
-                               tmpdout = 0;
-                       if(j != 0) {
-                               if (rxd)
-                                       *rxd++ = tmpdin;
-                       }
-                       tmpdin  = 0;
-               }
-
-               if (!cpha)
-                       SPI_SCL(!cpol);
-               SPI_SDA(tmpdout & 0x80);
-               SPI_DELAY;
-               if (cpha)
-                       SPI_SCL(!cpol);
-               else
-                       SPI_SCL(cpol);
-               tmpdin  <<= 1;
-               tmpdin  |= SPI_READ;
-               tmpdout <<= 1;
-               SPI_DELAY;
-               if (cpha)
-                       SPI_SCL(cpol);
-       }
-       /*
-        * If the number of bits isn't a multiple of 8, shift the last
-        * bits over to left-justify them.  Then store the last byte
-        * read in.
-        */
-       if (rxd) {
-               if ((bitlen % 8) != 0)
-                       tmpdin <<= 8 - (bitlen % 8);
-               *rxd++ = tmpdin;
-       }
-
-       if (flags & SPI_XFER_END)
-               spi_cs_deactivate(slave);
-
-       return(0);
-}