spi: Zap armada100_spi.c and env

armada100_spi.c and related env is zapping becuase
of "no DM conversion".

Cc: Ajay Bhargav <ajay.bhargav@einfochips.com>
Signed-off-by: Jagan Teki <jagan@openedev.com>

diff --git a/configs/gplugd_defconfig b/configs/gplugd_defconfig
index 59c9fdffacf034ba913f54619cdfa41bdf47bd23..3d98f8d7eba2ce5b175a0aa5b830d2f17b866e03 100644 (file)
--- a/configs/gplugd_defconfig
+++ b/configs/gplugd_defconfig
@@ -4,9 +4,7 @@ CONFIG_IDENT_STRING="\nMarvell-gplugD"
 CONFIG_BOOTDELAY=3
 # CONFIG_DISPLAY_BOARDINFO is not set
 # CONFIG_CMD_IMLS is not set
-CONFIG_CMD_ASKENV=y
 # CONFIG_CMD_FLASH is not set
-CONFIG_CMD_SF=y
 CONFIG_CMD_I2C=y
 CONFIG_CMD_USB=y
 # CONFIG_CMD_FPGA is not set
@@ -16,9 +14,6 @@ CONFIG_CMD_MII=y
 CONFIG_CMD_PING=y
 CONFIG_CMD_EXT2=y
 CONFIG_CMD_FAT=y
-CONFIG_SPI_FLASH=y
-CONFIG_SPI_FLASH_ATMEL=y
-CONFIG_SPI_FLASH_MACRONIX=y
 CONFIG_SYS_NS16550=y
 CONFIG_USB=y
 CONFIG_USB_STORAGE=y

diff --git a/drivers/spi/Makefile b/drivers/spi/Makefile
index 70d2e49a965542300bbfb62ef05f64935310b063..c1ce1580a2b49ca3e9cc26a76e654e78c62149a8 100644 (file)
--- a/drivers/spi/Makefile
+++ b/drivers/spi/Makefile
@@ -16,7 +16,6 @@ obj-$(CONFIG_SOFT_SPI) += soft_spi_legacy.o
 endif
 
 obj-$(CONFIG_ALTERA_SPI) += altera_spi.o
-obj-$(CONFIG_ARMADA100_SPI) += armada100_spi.o
 obj-$(CONFIG_ATH79_SPI) += ath79_spi.o
 obj-$(CONFIG_ATMEL_DATAFLASH_SPI) += atmel_dataflash_spi.o
 obj-$(CONFIG_ATMEL_SPI) += atmel_spi.o

diff --git a/drivers/spi/armada100_spi.c b/drivers/spi/armada100_spi.c
deleted file mode 100644 (file)
index 53aaf95..0000000
--- a/drivers/spi/armada100_spi.c
+++ /dev/null
@@ -1,203 +0,0 @@
-/*
- * (C) Copyright 2011
- * eInfochips Ltd. <www.einfochips.com>
- * Written-by: Ajay Bhargav <ajay.bhargav@einfochips.com>
- *
- * (C) Copyright 2009
- * Marvell Semiconductor <www.marvell.com>
- * Based on SSP driver
- * Written-by: Lei Wen <leiwen@marvell.com>
- *
- * SPDX-License-Identifier:    GPL-2.0+
- */
-
-
-#include <common.h>
-#include <malloc.h>
-#include <spi.h>
-
-#include <asm/io.h>
-#include <asm/arch/spi.h>
-#include <asm/gpio.h>
-
-#define to_armd_spi_slave(s)   container_of(s, struct armd_spi_slave, slave)
-
-struct armd_spi_slave {
-       struct spi_slave slave;
-       struct ssp_reg *spi_reg;
-       u32 cr0, cr1;
-       u32 int_cr1;
-       u32 clear_sr;
-       const void *tx;
-       void *rx;
-       int gpio_cs_inverted;
-};
-
-static int spi_armd_write(struct armd_spi_slave *pss)
-{
-       int wait_timeout = SSP_FLUSH_NUM;
-       while (--wait_timeout && !(readl(&pss->spi_reg->sssr) & SSSR_TNF))
-               ;
-       if (!wait_timeout) {
-               debug("%s: timeout error\n", __func__);
-               return -1;
-       }
-
-       if (pss->tx != NULL) {
-               writel(*(u8 *)pss->tx, &pss->spi_reg->ssdr);
-               ++pss->tx;
-       } else {
-               writel(0, &pss->spi_reg->ssdr);
-       }
-       return 0;
-}
-
-static int spi_armd_read(struct armd_spi_slave *pss)
-{
-       int wait_timeout = SSP_FLUSH_NUM;
-       while (--wait_timeout && !(readl(&pss->spi_reg->sssr) & SSSR_RNE))
-               ;
-       if (!wait_timeout) {
-               debug("%s: timeout error\n", __func__);
-               return -1;
-       }
-
-       if (pss->rx != NULL) {
-               *(u8 *)pss->rx = readl(&pss->spi_reg->ssdr);
-               ++pss->rx;
-       } else {
-               readl(&pss->spi_reg->ssdr);
-       }
-       return 0;
-}
-
-static int spi_armd_flush(struct armd_spi_slave *pss)
-{
-       unsigned long limit = SSP_FLUSH_NUM;
-
-       do {
-               while (readl(&pss->spi_reg->sssr) & SSSR_RNE)
-                       readl(&pss->spi_reg->ssdr);
-       } while ((readl(&pss->spi_reg->sssr) & SSSR_BSY) && limit--);
-
-       writel(SSSR_ROR, &pss->spi_reg->sssr);
-
-       return limit;
-}
-
-void spi_cs_activate(struct spi_slave *slave)
-{
-       struct armd_spi_slave *pss = to_armd_spi_slave(slave);
-
-       gpio_set_value(slave->cs, pss->gpio_cs_inverted);
-}
-
-void spi_cs_deactivate(struct spi_slave *slave)
-{
-       struct armd_spi_slave *pss = to_armd_spi_slave(slave);
-
-       gpio_set_value(slave->cs, !pss->gpio_cs_inverted);
-}
-
-struct spi_slave *spi_setup_slave(unsigned int bus, unsigned int cs,
-               unsigned int max_hz, unsigned int mode)
-{
-       struct armd_spi_slave *pss;
-
-       pss = spi_alloc_slave(struct armd_spi_slave, bus, cs);
-       if (!pss)
-               return NULL;
-
-       pss->spi_reg = (struct ssp_reg *)SSP_REG_BASE(CONFIG_SYS_SSP_PORT);
-
-       pss->cr0 = SSCR0_MOTO | SSCR0_DATASIZE(DEFAULT_WORD_LEN) | SSCR0_SSE;
-
-       pss->cr1 = (SSCR1_RXTRESH(RX_THRESH_DEF) & SSCR1_RFT) |
-               (SSCR1_TXTRESH(TX_THRESH_DEF) & SSCR1_TFT);
-       pss->cr1 &= ~(SSCR1_SPO | SSCR1_SPH);
-       pss->cr1 |= (((mode & SPI_CPHA) != 0) ? SSCR1_SPH : 0)
-               | (((mode & SPI_CPOL) != 0) ? SSCR1_SPO : 0);
-
-       pss->int_cr1 = SSCR1_TIE | SSCR1_RIE | SSCR1_TINTE;
-       pss->clear_sr = SSSR_ROR | SSSR_TINT;
-
-       pss->gpio_cs_inverted = mode & SPI_CS_HIGH;
-       gpio_set_value(cs, !pss->gpio_cs_inverted);
-
-       return &pss->slave;
-}
-
-void spi_free_slave(struct spi_slave *slave)
-{
-       struct armd_spi_slave *pss = to_armd_spi_slave(slave);
-
-       free(pss);
-}
-
-int spi_claim_bus(struct spi_slave *slave)
-{
-       struct armd_spi_slave *pss = to_armd_spi_slave(slave);
-
-       debug("%s: bus:%i cs:%i\n", __func__, slave->bus, slave->cs);
-       if (spi_armd_flush(pss) == 0)
-               return -1;
-
-       return 0;
-}
-
-void spi_release_bus(struct spi_slave *slave)
-{
-}
-
-int spi_xfer(struct spi_slave *slave, unsigned int bitlen, const void *dout,
-               void *din, unsigned long flags)
-{
-       struct armd_spi_slave *pss = to_armd_spi_slave(slave);
-       uint bytes = bitlen / 8;
-       unsigned long limit;
-       int ret = 0;
-
-       if (bitlen == 0)
-               goto done;
-
-       /* we can only do 8 bit transfers */
-       if (bitlen % 8) {
-               flags |= SPI_XFER_END;
-               goto done;
-       }
-
-       pss->tx = dout;
-       pss->rx = din;
-
-       if (flags & SPI_XFER_BEGIN) {
-               spi_cs_activate(slave);
-               writel(pss->cr1 | pss->int_cr1, &pss->spi_reg->sscr1);
-               writel(TIMEOUT_DEF, &pss->spi_reg->ssto);
-               writel(pss->cr0, &pss->spi_reg->sscr0);
-       }
-
-       while (bytes--) {
-               limit = SSP_FLUSH_NUM;
-               ret = spi_armd_write(pss);
-               if (ret)
-                       break;
-
-               while ((readl(&pss->spi_reg->sssr) & SSSR_BSY) && limit--)
-                       udelay(1);
-
-               ret = spi_armd_read(pss);
-               if (ret)
-                       break;
-       }
-
- done:
-       if (flags & SPI_XFER_END) {
-               /* Stop SSP */
-               writel(pss->clear_sr, &pss->spi_reg->sssr);
-               clrbits_le32(&pss->spi_reg->sscr1, pss->int_cr1);
-               writel(0, &pss->spi_reg->ssto);
-               spi_cs_deactivate(slave);
-       }
-
-       return ret;
-}

diff --git a/include/configs/gplugd.h b/include/configs/gplugd.h
index c1b43fd0fedbd4287862f50b694686f0d1dfa216..92e211713cb78fa9317e63343bf492ca5d2b4627 100644 (file)
--- a/include/configs/gplugd.h
+++ b/include/configs/gplugd.h
@@ -72,11 +72,6 @@
 /* GPIO Configuration for PHY */
 #define CONFIG_SYS_GPIO_PHY_RST                104     /* GPIO104 */
 
-/* SPI Support */
-#define CONFIG_ARMADA100_SPI
-#define CONFIG_ENV_SPI_CS              110
-#define CONFIG_SYS_SSP_PORT            2
-
 /* Flash Support */
 
 /*
@@ -95,10 +90,8 @@
 /*
  * Environment variables configurations
  */
-#define CONFIG_ENV_IS_IN_SPI_FLASH
-#define CONFIG_ENV_SECT_SIZE           0x4000
+#define CONFIG_ENV_IS_NOWHERE
 #define CONFIG_ENV_SIZE                        0x4000
-#define CONFIG_ENV_OFFSET              0x07C000
 
 #ifdef CONFIG_CMD_USB
 #define CONFIG_USB_EHCI

diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt
index 339c6fdfc9838e6aa75ee1a77a40376c59c07f15..6d614c62ccf251f3d3ed41257b8ae470ea133719 100644 (file)
--- a/scripts/config_whitelist.txt
+++ b/scripts/config_whitelist.txt
@@ -176,7 +176,6 @@ CONFIG_ARIA_FPGA
 CONFIG_ARM926EJS
 CONFIG_ARMADA100
 CONFIG_ARMADA100_FEC
-CONFIG_ARMADA100_SPI
 CONFIG_ARMADA168
 CONFIG_ARMADA_39X
 CONFIG_ARMCORTEXA9