Re: [U-Boot] [PATCH] spi: atcspi200: Drop non-dm code

[Jagan Teki]

On Wed, Mar 7, 2018 at 10:33 AM, Jagan Teki  wrote:
> Boards adp-ae3xx_defconfig, nx25-ae250_defconfig
> already enabled DM_SPI, so non-dm code make no use
> of it hence droped.
>
> Signed-off-by: Jagan Teki 

Applied to u-boot-spi/master
___
U-Boot mailing list
U-Boot@lists.denx.de
https://lists.denx.de/listinfo/u-boot

[U-Boot] [PATCH] spi: atcspi200: Drop non-dm code

[Jagan Teki]

Boards adp-ae3xx_defconfig, nx25-ae250_defconfig
already enabled DM_SPI, so non-dm code make no use
of it hence droped.

Signed-off-by: Jagan Teki 
---
 drivers/spi/Kconfig | 14 
 drivers/spi/atcspi200_spi.c | 87 -
 2 files changed, 7 insertions(+), 94 deletions(-)

diff --git a/drivers/spi/Kconfig b/drivers/spi/Kconfig
index 56c337f664..2f231fc12b 100644
--- a/drivers/spi/Kconfig
+++ b/drivers/spi/Kconfig
@@ -23,6 +23,13 @@ config ALTERA_SPI
  IP core. Please find details on the "Embedded Peripherals IP
  User Guide" of Altera.
 
+config ATCSPI200_SPI
+   bool "Andestech ATCSPI200 SPI driver"
+   help
+ Enable the Andestech ATCSPI200 SPI driver. This driver can be
+ used to access the SPI flash on AE3XX and AE250 platforms embedding
+ this Andestech IP core.
+
 config ATH79_SPI
bool "Atheros SPI driver"
depends on ARCH_ATH79
@@ -239,13 +246,6 @@ config FSL_QSPI
  used to access the SPI NOR flash on platforms embedding this
  Freescale IP core.
 
-config ATCSPI200_SPI
-   bool "Andestech ATCSPI200 SPI driver"
-   help
- Enable the Andestech ATCSPI200 SPI driver. This driver can be
- used to access the SPI flash on AE3XX and AE250 platforms embedding
- this Andestech IP core.
-
 config DAVINCI_SPI
bool "Davinci & Keystone SPI driver"
depends on ARCH_DAVINCI || ARCH_KEYSTONE
diff --git a/drivers/spi/atcspi200_spi.c b/drivers/spi/atcspi200_spi.c
index 5b2e9d6264..bc08914b9e 100644
--- a/drivers/spi/atcspi200_spi.c
+++ b/drivers/spi/atcspi200_spi.c
@@ -75,9 +75,6 @@ struct atcspi200_spi_regs {
 };
 
 struct nds_spi_slave {
-#ifndef CONFIG_DM_SPI
-   struct spi_slave slave;
-#endif
volatile struct atcspi200_spi_regs *regs;
int to;
unsigned intfreq;
@@ -286,89 +283,6 @@ static int __atcspi200_spi_xfer(struct nds_spi_slave *ns,
return ret;
 }
 
-#ifndef CONFIG_DM_SPI
-#define to_nds_spi_slave(s) container_of(s, struct nds_spi_slave, slave)
-struct spi_slave *spi_setup_slave(unsigned int bus, unsigned int cs,
-   unsigned int max_hz, unsigned int mode)
-{
-   struct nds_spi_slave *ns;
-
-   if (!spi_cs_is_valid(bus, cs))
-   return NULL;
-
-   ns = spi_alloc_slave(struct nds_spi_slave, bus, cs);
-   if (!ns)
-   return NULL;
-
-   switch (bus) {
-   case SPI0_BUS:
-   ns->regs = (struct atcspi200_spi_regs *)SPI0_BASE;
-   break;
-
-   case SPI1_BUS:
-   ns->regs = (struct atcspi200_spi_regs *)SPI1_BASE;
-   break;
-
-   default:
-   return NULL;
-   }
-
-   ns->freq= max_hz;
-   ns->mode = mode;
-   ns->to = SPI_TIMEOUT;
-   ns->max_transfer_length = MAX_TRANSFER_LEN;
-   ns->slave.max_write_size = MAX_TRANSFER_LEN;
-
-   return >slave;
-}
-
-void spi_free_slave(struct spi_slave *slave)
-{
-   struct nds_spi_slave *ns = to_nds_spi_slave(slave);
-   free(ns);
-}
-
-void spi_init(void)
-{
-   /* do nothing */
-}
-
-int spi_claim_bus(struct spi_slave *slave)
-{
-   struct nds_spi_slave *ns = to_nds_spi_slave(slave);
-   return __atcspi200_spi_claim_bus(ns);
-}
-
-void spi_release_bus(struct spi_slave *slave)
-{
-   struct nds_spi_slave *ns = to_nds_spi_slave(slave);
-   __atcspi200_spi_release_bus(ns);
-}
-
-int spi_xfer(struct spi_slave *slave, unsigned int bitlen, const void 
*data_out,
-   void *data_in, unsigned long flags)
-{
-   struct nds_spi_slave *ns = to_nds_spi_slave(slave);
-   return __atcspi200_spi_xfer(ns, bitlen, data_out, data_in, flags);
-}
-
-int spi_cs_is_valid(unsigned int bus, unsigned int cs)
-{
-   return bus == 0 && cs < NSPI_MAX_CS_NUM;
-}
-
-void spi_cs_activate(struct spi_slave *slave)
-{
-   struct nds_spi_slave *ns = to_nds_spi_slave(slave);
-   __atcspi200_spi_start(ns);
-}
-
-void spi_cs_deactivate(struct spi_slave *slave)
-{
-   struct nds_spi_slave *ns = to_nds_spi_slave(slave);
-   __atcspi200_spi_stop(ns);
-}
-#else
 static int atcspi200_spi_set_speed(struct udevice *bus, uint max_hz)
 {
struct nds_spi_slave *ns = dev_get_priv(bus);
@@ -496,4 +410,3 @@ U_BOOT_DRIVER(atcspi200_spi) = {
.priv_auto_alloc_size = sizeof(struct nds_spi_slave),
.probe = atcspi200_spi_probe,
 };
-#endif
-- 
2.14.3

___
U-Boot mailing list
U-Boot@lists.denx.de
https://lists.denx.de/listinfo/u-boot