]> git.dujemihanovic.xyz Git - u-boot.git/commitdiff
spi: Zap sh_spi driver
authorJagan Teki <jagan@amarulasolutions.com>
Mon, 25 May 2020 18:53:51 +0000 (00:23 +0530)
committerJagan Teki <jagan@amarulasolutions.com>
Mon, 1 Jun 2020 12:25:24 +0000 (17:55 +0530)
sh_spi driver is deprecated, no active updates and
no board user, hence dropped the same.

Cc: Marek Vasut <marex@denx.de>
Cc: Tom Rini <trini@konsulko.com>
Signed-off-by: Jagan Teki <jagan@amarulasolutions.com>
drivers/spi/Kconfig
drivers/spi/Makefile
drivers/spi/sh_spi.c [deleted file]
drivers/spi/sh_spi.h [deleted file]

index f8b1d154dabdacb36e78dd3cd216f2a2638247da..59415209ee4ac4071f1a26120e379b4efa71eda8 100644 (file)
@@ -406,13 +406,6 @@ config DAVINCI_SPI
        help
          Enable the Davinci SPI driver
 
-config SH_SPI
-       bool "SuperH SPI driver"
-       depends on DEPRECATED
-       help
-         Enable the SuperH SPI controller driver. This driver can be used
-         on various SuperH SoCs, such as SH7757.
-
 config SH_QSPI
        bool "Renesas Quad SPI driver"
        help
index 6441694c8d86045b969cb1eb6487be7585419359..342776404a50f8ad48f4ff2a0f47b5e5f8f9afcc 100644 (file)
@@ -52,7 +52,6 @@ obj-$(CONFIG_ROCKCHIP_SPI) += rk_spi.o
 obj-$(CONFIG_SANDBOX_SPI) += sandbox_spi.o
 obj-$(CONFIG_SPI_SIFIVE) += spi-sifive.o
 obj-$(CONFIG_SPI_SUNXI) += spi-sunxi.o
-obj-$(CONFIG_SH_SPI) += sh_spi.o
 obj-$(CONFIG_SH_QSPI) += sh_qspi.o
 obj-$(CONFIG_STM32_QSPI) += stm32_qspi.o
 obj-$(CONFIG_STM32_SPI) += stm32_spi.o
diff --git a/drivers/spi/sh_spi.c b/drivers/spi/sh_spi.c
deleted file mode 100644 (file)
index 4ecfe60..0000000
+++ /dev/null
@@ -1,250 +0,0 @@
-// SPDX-License-Identifier: GPL-2.0
-/*
- * SH SPI driver
- *
- * Copyright (C) 2011-2012 Renesas Solutions Corp.
- */
-
-#include <common.h>
-#include <console.h>
-#include <malloc.h>
-#include <spi.h>
-#include <asm/io.h>
-#include <linux/delay.h>
-#include "sh_spi.h"
-
-static void sh_spi_write(unsigned long data, unsigned long *reg)
-{
-       writel(data, reg);
-}
-
-static unsigned long sh_spi_read(unsigned long *reg)
-{
-       return readl(reg);
-}
-
-static void sh_spi_set_bit(unsigned long val, unsigned long *reg)
-{
-       unsigned long tmp;
-
-       tmp = sh_spi_read(reg);
-       tmp |= val;
-       sh_spi_write(tmp, reg);
-}
-
-static void sh_spi_clear_bit(unsigned long val, unsigned long *reg)
-{
-       unsigned long tmp;
-
-       tmp = sh_spi_read(reg);
-       tmp &= ~val;
-       sh_spi_write(tmp, reg);
-}
-
-static void clear_fifo(struct sh_spi *ss)
-{
-       sh_spi_set_bit(SH_SPI_RSTF, &ss->regs->cr2);
-       sh_spi_clear_bit(SH_SPI_RSTF, &ss->regs->cr2);
-}
-
-static int recvbuf_wait(struct sh_spi *ss)
-{
-       while (sh_spi_read(&ss->regs->cr1) & SH_SPI_RBE) {
-               if (ctrlc())
-                       return 1;
-               udelay(10);
-       }
-       return 0;
-}
-
-static int write_fifo_empty_wait(struct sh_spi *ss)
-{
-       while (!(sh_spi_read(&ss->regs->cr1) & SH_SPI_TBE)) {
-               if (ctrlc())
-                       return 1;
-               udelay(10);
-       }
-       return 0;
-}
-
-static void sh_spi_set_cs(struct sh_spi *ss, unsigned int cs)
-{
-       unsigned long val = 0;
-
-       if (cs & 0x01)
-               val |= SH_SPI_SSS0;
-       if (cs & 0x02)
-               val |= SH_SPI_SSS1;
-
-       sh_spi_clear_bit(SH_SPI_SSS0 | SH_SPI_SSS1, &ss->regs->cr4);
-       sh_spi_set_bit(val, &ss->regs->cr4);
-}
-
-struct spi_slave *spi_setup_slave(unsigned int bus, unsigned int cs,
-               unsigned int max_hz, unsigned int mode)
-{
-       struct sh_spi *ss;
-
-       if (!spi_cs_is_valid(bus, cs))
-               return NULL;
-
-       ss = spi_alloc_slave(struct sh_spi, bus, cs);
-       if (!ss)
-               return NULL;
-
-       ss->regs = (struct sh_spi_regs *)CONFIG_SH_SPI_BASE;
-
-       /* SPI sycle stop */
-       sh_spi_write(0xfe, &ss->regs->cr1);
-       /* CR1 init */
-       sh_spi_write(0x00, &ss->regs->cr1);
-       /* CR3 init */
-       sh_spi_write(0x00, &ss->regs->cr3);
-       sh_spi_set_cs(ss, cs);
-
-       clear_fifo(ss);
-
-       /* 1/8 clock */
-       sh_spi_write(sh_spi_read(&ss->regs->cr2) | 0x07, &ss->regs->cr2);
-       udelay(10);
-
-       return &ss->slave;
-}
-
-void spi_free_slave(struct spi_slave *slave)
-{
-       struct sh_spi *spi = to_sh_spi(slave);
-
-       free(spi);
-}
-
-int spi_claim_bus(struct spi_slave *slave)
-{
-       return 0;
-}
-
-void spi_release_bus(struct spi_slave *slave)
-{
-       struct sh_spi *ss = to_sh_spi(slave);
-
-       sh_spi_write(sh_spi_read(&ss->regs->cr1) &
-               ~(SH_SPI_SSA | SH_SPI_SSDB | SH_SPI_SSD), &ss->regs->cr1);
-}
-
-static int sh_spi_send(struct sh_spi *ss, const unsigned char *tx_data,
-                       unsigned int len, unsigned long flags)
-{
-       int i, cur_len, ret = 0;
-       int remain = (int)len;
-
-       if (len >= SH_SPI_FIFO_SIZE)
-               sh_spi_set_bit(SH_SPI_SSA, &ss->regs->cr1);
-
-       while (remain > 0) {
-               cur_len = (remain < SH_SPI_FIFO_SIZE) ?
-                               remain : SH_SPI_FIFO_SIZE;
-               for (i = 0; i < cur_len &&
-                       !(sh_spi_read(&ss->regs->cr4) & SH_SPI_WPABRT) &&
-                       !(sh_spi_read(&ss->regs->cr1) & SH_SPI_TBF);
-                               i++)
-                       sh_spi_write(tx_data[i], &ss->regs->tbr_rbr);
-
-               cur_len = i;
-
-               if (sh_spi_read(&ss->regs->cr4) & SH_SPI_WPABRT) {
-                       /* Abort the transaction */
-                       flags |= SPI_XFER_END;
-                       sh_spi_set_bit(SH_SPI_WPABRT, &ss->regs->cr4);
-                       ret = 1;
-                       break;
-               }
-
-               remain -= cur_len;
-               tx_data += cur_len;
-
-               if (remain > 0)
-                       write_fifo_empty_wait(ss);
-       }
-
-       if (flags & SPI_XFER_END) {
-               sh_spi_clear_bit(SH_SPI_SSD | SH_SPI_SSDB, &ss->regs->cr1);
-               sh_spi_set_bit(SH_SPI_SSA, &ss->regs->cr1);
-               udelay(100);
-               write_fifo_empty_wait(ss);
-       }
-
-       return ret;
-}
-
-static int sh_spi_receive(struct sh_spi *ss, unsigned char *rx_data,
-                         unsigned int len, unsigned long flags)
-{
-       int i;
-
-       if (len > SH_SPI_MAX_BYTE)
-               sh_spi_write(SH_SPI_MAX_BYTE, &ss->regs->cr3);
-       else
-               sh_spi_write(len, &ss->regs->cr3);
-
-       sh_spi_clear_bit(SH_SPI_SSD | SH_SPI_SSDB, &ss->regs->cr1);
-       sh_spi_set_bit(SH_SPI_SSA, &ss->regs->cr1);
-
-       for (i = 0; i < len; i++) {
-               if (recvbuf_wait(ss))
-                       return 0;
-
-               rx_data[i] = (unsigned char)sh_spi_read(&ss->regs->tbr_rbr);
-       }
-       sh_spi_write(0, &ss->regs->cr3);
-
-       return 0;
-}
-
-int  spi_xfer(struct spi_slave *slave, unsigned int bitlen, const void *dout,
-               void *din, unsigned long flags)
-{
-       struct sh_spi *ss = to_sh_spi(slave);
-       const unsigned char *tx_data = dout;
-       unsigned char *rx_data = din;
-       unsigned int len = bitlen / 8;
-       int ret = 0;
-
-       if (flags & SPI_XFER_BEGIN)
-               sh_spi_write(sh_spi_read(&ss->regs->cr1) & ~SH_SPI_SSA,
-                               &ss->regs->cr1);
-
-       if (tx_data)
-               ret = sh_spi_send(ss, tx_data, len, flags);
-
-       if (ret == 0 && rx_data)
-               ret = sh_spi_receive(ss, rx_data, len, flags);
-
-       if (flags & SPI_XFER_END) {
-               sh_spi_set_bit(SH_SPI_SSD, &ss->regs->cr1);
-               udelay(100);
-
-               sh_spi_clear_bit(SH_SPI_SSA | SH_SPI_SSDB | SH_SPI_SSD,
-                                &ss->regs->cr1);
-               clear_fifo(ss);
-       }
-
-       return ret;
-}
-
-int  spi_cs_is_valid(unsigned int bus, unsigned int cs)
-{
-       if (!bus && cs < SH_SPI_NUM_CS)
-               return 1;
-       else
-               return 0;
-}
-
-void spi_cs_activate(struct spi_slave *slave)
-{
-
-}
-
-void spi_cs_deactivate(struct spi_slave *slave)
-{
-
-}
diff --git a/drivers/spi/sh_spi.h b/drivers/spi/sh_spi.h
deleted file mode 100644 (file)
index 33a4630..0000000
+++ /dev/null
@@ -1,67 +0,0 @@
-/* SPDX-License-Identifier: GPL-2.0 */
-/*
- * SH SPI driver
- *
- * Copyright (C) 2011 Renesas Solutions Corp.
- */
-
-#ifndef __SH_SPI_H__
-#define __SH_SPI_H__
-
-#include <spi.h>
-
-struct sh_spi_regs {
-       unsigned long tbr_rbr;
-       unsigned long resv1;
-       unsigned long cr1;
-       unsigned long resv2;
-       unsigned long cr2;
-       unsigned long resv3;
-       unsigned long cr3;
-       unsigned long resv4;
-       unsigned long cr4;
-};
-
-/* CR1 */
-#define SH_SPI_TBE     0x80
-#define SH_SPI_TBF     0x40
-#define SH_SPI_RBE     0x20
-#define SH_SPI_RBF     0x10
-#define SH_SPI_PFONRD  0x08
-#define SH_SPI_SSDB    0x04
-#define SH_SPI_SSD     0x02
-#define SH_SPI_SSA     0x01
-
-/* CR2 */
-#define SH_SPI_RSTF    0x80
-#define SH_SPI_LOOPBK  0x40
-#define SH_SPI_CPOL    0x20
-#define SH_SPI_CPHA    0x10
-#define SH_SPI_L1M0    0x08
-
-/* CR3 */
-#define SH_SPI_MAX_BYTE        0xFF
-
-/* CR4 */
-#define SH_SPI_TBEI    0x80
-#define SH_SPI_TBFI    0x40
-#define SH_SPI_RBEI    0x20
-#define SH_SPI_RBFI    0x10
-#define SH_SPI_SSS1    0x08
-#define SH_SPI_WPABRT  0x04
-#define SH_SPI_SSS0    0x01
-
-#define SH_SPI_FIFO_SIZE       32
-#define SH_SPI_NUM_CS          4
-
-struct sh_spi {
-       struct spi_slave        slave;
-       struct sh_spi_regs      *regs;
-};
-
-static inline struct sh_spi *to_sh_spi(struct spi_slave *slave)
-{
-       return container_of(slave, struct sh_spi, slave);
-}
-
-#endif