From: Christoph Hellwig <hch@lst.de>
To: Yoshinori Sato <ysato@users.sourceforge.jp>,
Rich Felker <dalias@libc.org>, Arnd Bergmann <arnd@arndb.de>,
Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Cc: Laurent Pinchart <laurent.pinchart@ideasonboard.com>,
Kieran Bingham <kieran.bingham+renesas@ideasonboard.com>,
Geert Uytterhoeven <geert+renesas@glider.be>,
linux-kernel@vger.kernel.org, linux-watchdog@vger.kernel.org,
devicetree@vger.kernel.org, linux-arch@vger.kernel.org,
dmaengine@vger.kernel.org, dri-devel@lists.freedesktop.org,
linux-renesas-soc@vger.kernel.org, linux-i2c@vger.kernel.org,
linux-input@vger.kernel.org, linux-media@vger.kernel.org,
linux-mmc@vger.kernel.org, linux-mtd@lists.infradead.org,
netdev@vger.kernel.org, linux-gpio@vger.kernel.org,
linux-rtc@vger.kernel.org, linux-spi@vger.kernel.org,
linux-serial@vger.kernel.org, linux-usb@vger.kernel.org,
linux-fbdev@vger.kernel.org, alsa-devel@alsa-project.org,
linux-sh@vger.kernel.org
Subject: [PATCH 16/22] spi: remove spi-sh-sci
Date: Fri, 13 Jan 2023 07:23:33 +0100 [thread overview]
Message-ID: <20230113062339.1909087-17-hch@lst.de> (raw)
In-Reply-To: <20230113062339.1909087-1-hch@lst.de>
Now that arch/sh is removed this driver is dead code.
Signed-off-by: Christoph Hellwig <hch@lst.de>
---
drivers/spi/Kconfig | 7 --
drivers/spi/Makefile | 1 -
drivers/spi/spi-sh-sci.c | 197 ---------------------------------------
3 files changed, 205 deletions(-)
delete mode 100644 drivers/spi/spi-sh-sci.c
diff --git a/drivers/spi/Kconfig b/drivers/spi/Kconfig
index 7508dcef909c78..76f3bc6f8c81fc 100644
--- a/drivers/spi/Kconfig
+++ b/drivers/spi/Kconfig
@@ -882,13 +882,6 @@ config SPI_SH_MSIOF
help
SPI driver for SuperH and SH Mobile MSIOF blocks.
-config SPI_SH_SCI
- tristate "SuperH SCI SPI controller"
- depends on SUPERH
- select SPI_BITBANG
- help
- SPI driver for SuperH SCI blocks.
-
config SPI_SH_HSPI
tristate "SuperH HSPI controller"
depends on ARCH_RENESAS || COMPILE_TEST
diff --git a/drivers/spi/Makefile b/drivers/spi/Makefile
index 342a7eb5181c9b..27d877440c6539 100644
--- a/drivers/spi/Makefile
+++ b/drivers/spi/Makefile
@@ -118,7 +118,6 @@ obj-$(CONFIG_SPI_S3C64XX) += spi-s3c64xx.o
obj-$(CONFIG_SPI_SC18IS602) += spi-sc18is602.o
obj-$(CONFIG_SPI_SH_HSPI) += spi-sh-hspi.o
obj-$(CONFIG_SPI_SH_MSIOF) += spi-sh-msiof.o
-obj-$(CONFIG_SPI_SH_SCI) += spi-sh-sci.o
obj-$(CONFIG_SPI_SIFIVE) += spi-sifive.o
obj-$(CONFIG_SPI_SLAVE_MT27XX) += spi-slave-mt27xx.o
obj-$(CONFIG_SPI_SN_F_OSPI) += spi-sn-f-ospi.o
diff --git a/drivers/spi/spi-sh-sci.c b/drivers/spi/spi-sh-sci.c
deleted file mode 100644
index 8f30531e141867..00000000000000
--- a/drivers/spi/spi-sh-sci.c
+++ /dev/null
@@ -1,197 +0,0 @@
-// SPDX-License-Identifier: GPL-2.0-only
-/*
- * SH SCI SPI interface
- *
- * Copyright (c) 2008 Magnus Damm
- *
- * Based on S3C24XX GPIO based SPI driver, which is:
- * Copyright (c) 2006 Ben Dooks
- * Copyright (c) 2006 Simtec Electronics
- */
-
-#include <linux/kernel.h>
-#include <linux/delay.h>
-#include <linux/spinlock.h>
-#include <linux/platform_device.h>
-
-#include <linux/spi/spi.h>
-#include <linux/spi/spi_bitbang.h>
-#include <linux/module.h>
-
-#include <asm/spi.h>
-#include <asm/io.h>
-
-struct sh_sci_spi {
- struct spi_bitbang bitbang;
-
- void __iomem *membase;
- unsigned char val;
- struct sh_spi_info *info;
- struct platform_device *dev;
-};
-
-#define SCSPTR(sp) (sp->membase + 0x1c)
-#define PIN_SCK (1 << 2)
-#define PIN_TXD (1 << 0)
-#define PIN_RXD PIN_TXD
-#define PIN_INIT ((1 << 1) | (1 << 3) | PIN_SCK | PIN_TXD)
-
-static inline void setbits(struct sh_sci_spi *sp, int bits, int on)
-{
- /*
- * We are the only user of SCSPTR so no locking is required.
- * Reading bit 2 and 0 in SCSPTR gives pin state as input.
- * Writing the same bits sets the output value.
- * This makes regular read-modify-write difficult so we
- * use sp->val to keep track of the latest register value.
- */
-
- if (on)
- sp->val |= bits;
- else
- sp->val &= ~bits;
-
- iowrite8(sp->val, SCSPTR(sp));
-}
-
-static inline void setsck(struct spi_device *dev, int on)
-{
- setbits(spi_master_get_devdata(dev->master), PIN_SCK, on);
-}
-
-static inline void setmosi(struct spi_device *dev, int on)
-{
- setbits(spi_master_get_devdata(dev->master), PIN_TXD, on);
-}
-
-static inline u32 getmiso(struct spi_device *dev)
-{
- struct sh_sci_spi *sp = spi_master_get_devdata(dev->master);
-
- return (ioread8(SCSPTR(sp)) & PIN_RXD) ? 1 : 0;
-}
-
-#define spidelay(x) ndelay(x)
-
-#include "spi-bitbang-txrx.h"
-
-static u32 sh_sci_spi_txrx_mode0(struct spi_device *spi,
- unsigned nsecs, u32 word, u8 bits,
- unsigned flags)
-{
- return bitbang_txrx_be_cpha0(spi, nsecs, 0, flags, word, bits);
-}
-
-static u32 sh_sci_spi_txrx_mode1(struct spi_device *spi,
- unsigned nsecs, u32 word, u8 bits,
- unsigned flags)
-{
- return bitbang_txrx_be_cpha1(spi, nsecs, 0, flags, word, bits);
-}
-
-static u32 sh_sci_spi_txrx_mode2(struct spi_device *spi,
- unsigned nsecs, u32 word, u8 bits,
- unsigned flags)
-{
- return bitbang_txrx_be_cpha0(spi, nsecs, 1, flags, word, bits);
-}
-
-static u32 sh_sci_spi_txrx_mode3(struct spi_device *spi,
- unsigned nsecs, u32 word, u8 bits,
- unsigned flags)
-{
- return bitbang_txrx_be_cpha1(spi, nsecs, 1, flags, word, bits);
-}
-
-static void sh_sci_spi_chipselect(struct spi_device *dev, int value)
-{
- struct sh_sci_spi *sp = spi_master_get_devdata(dev->master);
-
- if (sp->info->chip_select)
- (sp->info->chip_select)(sp->info, dev->chip_select, value);
-}
-
-static int sh_sci_spi_probe(struct platform_device *dev)
-{
- struct resource *r;
- struct spi_master *master;
- struct sh_sci_spi *sp;
- int ret;
-
- master = spi_alloc_master(&dev->dev, sizeof(struct sh_sci_spi));
- if (master == NULL) {
- dev_err(&dev->dev, "failed to allocate spi master\n");
- ret = -ENOMEM;
- goto err0;
- }
-
- sp = spi_master_get_devdata(master);
-
- platform_set_drvdata(dev, sp);
- sp->info = dev_get_platdata(&dev->dev);
- if (!sp->info) {
- dev_err(&dev->dev, "platform data is missing\n");
- ret = -ENOENT;
- goto err1;
- }
-
- /* setup spi bitbang adaptor */
- sp->bitbang.master = master;
- sp->bitbang.master->bus_num = sp->info->bus_num;
- sp->bitbang.master->num_chipselect = sp->info->num_chipselect;
- sp->bitbang.chipselect = sh_sci_spi_chipselect;
-
- sp->bitbang.txrx_word[SPI_MODE_0] = sh_sci_spi_txrx_mode0;
- sp->bitbang.txrx_word[SPI_MODE_1] = sh_sci_spi_txrx_mode1;
- sp->bitbang.txrx_word[SPI_MODE_2] = sh_sci_spi_txrx_mode2;
- sp->bitbang.txrx_word[SPI_MODE_3] = sh_sci_spi_txrx_mode3;
-
- r = platform_get_resource(dev, IORESOURCE_MEM, 0);
- if (r == NULL) {
- ret = -ENOENT;
- goto err1;
- }
- sp->membase = ioremap(r->start, resource_size(r));
- if (!sp->membase) {
- ret = -ENXIO;
- goto err1;
- }
- sp->val = ioread8(SCSPTR(sp));
- setbits(sp, PIN_INIT, 1);
-
- ret = spi_bitbang_start(&sp->bitbang);
- if (!ret)
- return 0;
-
- setbits(sp, PIN_INIT, 0);
- iounmap(sp->membase);
- err1:
- spi_master_put(sp->bitbang.master);
- err0:
- return ret;
-}
-
-static int sh_sci_spi_remove(struct platform_device *dev)
-{
- struct sh_sci_spi *sp = platform_get_drvdata(dev);
-
- spi_bitbang_stop(&sp->bitbang);
- setbits(sp, PIN_INIT, 0);
- iounmap(sp->membase);
- spi_master_put(sp->bitbang.master);
- return 0;
-}
-
-static struct platform_driver sh_sci_spi_drv = {
- .probe = sh_sci_spi_probe,
- .remove = sh_sci_spi_remove,
- .driver = {
- .name = "spi_sh_sci",
- },
-};
-module_platform_driver(sh_sci_spi_drv);
-
-MODULE_DESCRIPTION("SH SCI SPI Driver");
-MODULE_AUTHOR("Magnus Damm <damm@opensource.se>");
-MODULE_LICENSE("GPL");
-MODULE_ALIAS("platform:spi_sh_sci");
--
2.39.0
next prev parent reply other threads:[~2023-01-13 6:30 UTC|newest]
Thread overview: 80+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-01-13 6:23 remove arch/sh Christoph Hellwig
2023-01-13 6:23 ` [PATCH 01/22] gpu/drm: remove the shmobile drm driver Christoph Hellwig
2023-01-13 7:46 ` Laurent Pinchart
2023-01-13 7:55 ` Laurent Pinchart
2023-01-13 8:19 ` Geert Uytterhoeven
2023-02-03 7:15 ` Christoph Hellwig
2023-02-03 13:49 ` Laurent Pinchart
2023-02-03 13:53 ` Geert Uytterhoeven
2023-01-13 6:23 ` [PATCH 02/22] usb: remove the dead USB_OHCI_SH option Christoph Hellwig
2023-01-13 7:12 ` Greg Kroah-Hartman
2023-01-13 7:14 ` Christoph Hellwig
2023-01-15 0:55 ` Rob Landley
2023-02-03 7:15 ` Christoph Hellwig
2023-02-03 7:25 ` Greg Kroah-Hartman
2023-01-13 8:59 ` Geert Uytterhoeven
2023-01-13 6:23 ` [PATCH 04/22] sound: remove sound/sh Christoph Hellwig
2023-01-13 16:18 ` Takashi Iwai
2023-01-13 6:23 ` [PATCH 05/22] sound: remove sh-specific sounds/soc/sh drivers Christoph Hellwig
2023-01-17 22:52 ` Kuninori Morimoto
2023-01-13 6:23 ` [PATCH 06/22] watchdog: remove the shwdt driver Christoph Hellwig
2023-01-13 14:00 ` Guenter Roeck
2023-01-13 6:23 ` [PATCH 07/22] cpufreq: remove the sh-cpufreq driver Christoph Hellwig
2023-01-13 6:23 ` [PATCH 08/22] dmaengine: remove the shdmac driver Christoph Hellwig
2023-01-13 6:23 ` [PATCH 09/22] i2c: remove i2c-sh7760 Christoph Hellwig
2023-01-13 6:23 ` [PATCH 10/22] input: remove sh_keysc Christoph Hellwig
2023-01-13 8:28 ` Geert Uytterhoeven
2023-01-13 6:23 ` [PATCH 11/22] mtd/nand: remove sh_flctl Christoph Hellwig
2023-01-13 8:30 ` Geert Uytterhoeven
2023-01-13 10:06 ` Arnd Bergmann
2023-01-13 6:23 ` [PATCH 12/22] net/ethernet/8390: remove stnic Christoph Hellwig
2023-01-13 6:23 ` [PATCH 15/22] spi: remove spi-sh Christoph Hellwig
2023-01-13 6:23 ` Christoph Hellwig [this message]
2023-01-13 8:50 ` [PATCH 16/22] spi: remove spi-sh-sci Geert Uytterhoeven
2023-01-13 6:23 ` [PATCH 17/22] spi: remove spi-jcore Christoph Hellwig
2023-01-13 6:23 ` [PATCH 18/22] usb: remove ehci-sh Christoph Hellwig
2023-01-13 6:23 ` [PATCH 19/22] fbdev: remove sh7760fb Christoph Hellwig
2023-01-13 8:53 ` Geert Uytterhoeven
2023-01-13 6:23 ` [PATCH 20/22] media: remove sh_vou Christoph Hellwig
2023-01-13 8:01 ` Laurent Pinchart
2023-01-13 9:05 ` Hans Verkuil
2023-01-13 6:23 ` [PATCH 21/22] drivers: platform: remove is_sh_early_platform_device Christoph Hellwig
2023-01-13 6:23 ` [PATCH 22/22] drivers: platform: remove early_platform_cleanup Christoph Hellwig
2023-01-13 8:09 ` remove arch/sh John Paul Adrian Glaubitz
2023-01-13 8:26 ` Geert Uytterhoeven
2023-01-13 8:52 ` John Paul Adrian Glaubitz
2023-01-13 19:11 ` Rob Landley
2023-01-13 19:05 ` John Paul Adrian Glaubitz
2023-01-13 23:32 ` Rob Landley
2023-01-16 7:14 ` Christoph Hellwig
2023-01-16 7:13 ` Christoph Hellwig
2023-01-16 8:52 ` John Paul Adrian Glaubitz
2023-02-03 7:14 ` Christoph Hellwig
2023-02-03 8:24 ` John Paul Adrian Glaubitz
2023-02-03 8:30 ` Christoph Hellwig
2023-02-03 10:29 ` John Paul Adrian Glaubitz
2023-02-03 10:33 ` Geert Uytterhoeven
2023-02-03 10:36 ` John Paul Adrian Glaubitz
2023-02-03 15:57 ` Randy Dunlap
2023-02-03 16:04 ` Geert Uytterhoeven
2023-02-09 3:06 ` Rob Landley
2023-02-05 23:08 ` Stephen Rothwell
2023-02-05 23:20 ` John Paul Adrian Glaubitz
2023-02-13 16:30 ` John Paul Adrian Glaubitz
2023-02-07 9:06 ` John Paul Adrian Glaubitz
2023-02-08 1:31 ` Randy Dunlap
2023-02-08 12:13 ` John Paul Adrian Glaubitz
2023-02-08 12:24 ` Huacai Chen
2023-02-08 12:37 ` John Paul Adrian Glaubitz
2023-02-08 14:12 ` Wolfram Sang
2023-02-09 3:09 ` Rob Landley
2023-02-09 9:15 ` John Paul Adrian Glaubitz
2023-01-17 19:13 ` Rob Landley
2023-01-17 20:26 ` Geert Uytterhoeven
2023-01-17 23:05 ` Guenter Roeck
2023-01-18 0:10 ` D. Jeff Dionne
2023-01-18 5:03 ` Rob Landley
2023-01-18 7:46 ` Geert Uytterhoeven
2023-01-18 11:14 ` Rob Landley
[not found] ` <20230113062339.1909087-14-hch@lst.de>
2023-01-13 8:45 ` [PATCH 13/22] pinctrl: remove renesas sh controllers Geert Uytterhoeven
2023-01-13 15:18 ` remove arch/sh Rob Herring
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20230113062339.1909087-17-hch@lst.de \
--to=hch@lst.de \
--cc=alsa-devel@alsa-project.org \
--cc=arnd@arndb.de \
--cc=dalias@libc.org \
--cc=devicetree@vger.kernel.org \
--cc=dmaengine@vger.kernel.org \
--cc=dri-devel@lists.freedesktop.org \
--cc=geert+renesas@glider.be \
--cc=gregkh@linuxfoundation.org \
--cc=kieran.bingham+renesas@ideasonboard.com \
--cc=laurent.pinchart@ideasonboard.com \
--cc=linux-arch@vger.kernel.org \
--cc=linux-fbdev@vger.kernel.org \
--cc=linux-gpio@vger.kernel.org \
--cc=linux-i2c@vger.kernel.org \
--cc=linux-input@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-media@vger.kernel.org \
--cc=linux-mmc@vger.kernel.org \
--cc=linux-mtd@lists.infradead.org \
--cc=linux-renesas-soc@vger.kernel.org \
--cc=linux-rtc@vger.kernel.org \
--cc=linux-serial@vger.kernel.org \
--cc=linux-sh@vger.kernel.org \
--cc=linux-spi@vger.kernel.org \
--cc=linux-usb@vger.kernel.org \
--cc=linux-watchdog@vger.kernel.org \
--cc=netdev@vger.kernel.org \
--cc=ysato@users.sourceforge.jp \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).