spi: Remove obsolete spi_base_setup_slave_fdt

0efc024 ("spi_flash: Add spi_flash_probe_fdt() to locate SPI by FDT
node") added a helper function spi_base_setup_slave_fdt to to set up a
SPI slave from a given FDT blob. The only user was the exynos SPI
driver.

But commit 73186c9 ("dm: exynos: Convert SPI to driver model") removed
the use of this function, hence rendering it obsolete.

Remove this function, as well as the CONFIG_OF_SPI option, which guarded
only this function.

Reviewed-by: Simon Glass <sjg@chromium.org>
Reviewed-by: Jagan Teki <jagan@openedev.com>
Signed-off-by: Mario Six <mario.six@gdsys.cc>

diff --git a/drivers/spi/spi.c b/drivers/spi/spi.c
index dea8dcda5b08bd0875aa98551376184f08fc2735..45e73d28e40a8f6adc45712f839274ef34c9e68d 100644 (file)
--- a/drivers/spi/spi.c
+++ b/drivers/spi/spi.c
@@ -39,23 +39,3 @@ void *spi_do_alloc_slave(int offset, int size, unsigned int bus,
 
        return ptr;
 }
-
-#ifdef CONFIG_OF_SPI
-struct spi_slave *spi_base_setup_slave_fdt(const void *blob, int busnum,
-                                          int node)
-{
-       int cs, max_hz, mode = 0;
-
-       cs = fdtdec_get_int(blob, node, "reg", -1);
-       max_hz = fdtdec_get_int(blob, node, "spi-max-frequency", 100000);
-       if (fdtdec_get_bool(blob, node, "spi-cpol"))
-               mode |= SPI_CPOL;
-       if (fdtdec_get_bool(blob, node, "spi-cpha"))
-               mode |= SPI_CPHA;
-       if (fdtdec_get_bool(blob, node, "spi-cs-high"))
-               mode |= SPI_CS_HIGH;
-       if (fdtdec_get_bool(blob, node, "spi-half-duplex"))
-               mode |= SPI_PREAMBLE;
-       return spi_setup_slave(busnum, cs, max_hz, mode);
-}
-#endif

diff --git a/include/spi.h b/include/spi.h
index 5a7df1c7063610a71f2d08e4c1a75ce2b8777aed..b2a80a5609603a72d87278f5ff25f2f218e36cf2 100644 (file)
--- a/include/spi.h
+++ b/include/spi.h
@@ -330,20 +330,6 @@ static inline int spi_w8r8(struct spi_slave *slave, unsigned char byte)
  */
 struct spi_slave *spi_setup_slave_fdt(const void *blob, int slave_node,
                                      int spi_node);
-
-/**
- * spi_base_setup_slave_fdt() - helper function to set up a SPI slace
- *
- * This decodes SPI properties from the slave node to determine the
- * chip select and SPI parameters.
- *
- * @blob:      Device tree blob
- * @busnum:    Bus number to use
- * @node:      Device tree node for the SPI bus
- */
-struct spi_slave *spi_base_setup_slave_fdt(const void *blob, int busnum,
-                                          int node);
-
 #ifdef CONFIG_DM_SPI
 
 /**

diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt
index a27dc4fc3822f1d8f406b8229bab39832a76cdca..6704745305fd01e504759bc872401b10480b131f 100644 (file)
--- a/scripts/config_whitelist.txt
+++ b/scripts/config_whitelist.txt
@@ -1554,7 +1554,6 @@ CONFIG_NUM_PAMU
 CONFIG_ODROID_REV_AIN
 CONFIG_OFF_PADCONF
 CONFIG_OF_
-CONFIG_OF_SPI
 CONFIG_OF_SPI_FLASH
 CONFIG_OF_STDOUT_PATH
 CONFIG_OMAP_EHCI_PHY1_RESET_GPIO