[03/17] mmc: remove cns3xxx driver

Message ID 20221019150410.3851944-3-arnd@kernel.org
State New
Headers
Series [01/17] ARM: at91: remove stale MAINTAINER file entries |

Commit Message

Arnd Bergmann Oct. 19, 2022, 3:03 p.m. UTC
  From: Arnd Bergmann <arnd@arndb.de>

The cns3xxx platform is gone, so this driver is now orphaned.

Cc: Krzysztof Halasa <khalasa@piap.pl>
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
---
 drivers/mmc/host/Kconfig         |  11 ---
 drivers/mmc/host/Makefile        |   1 -
 drivers/mmc/host/sdhci-cns3xxx.c | 113 -------------------------------
 3 files changed, 125 deletions(-)
 delete mode 100644 drivers/mmc/host/sdhci-cns3xxx.c
  

Comments

Ulf Hansson Oct. 20, 2022, 10:36 a.m. UTC | #1
On Wed, 19 Oct 2022 at 17:06, Arnd Bergmann <arnd@kernel.org> wrote:
>
> From: Arnd Bergmann <arnd@arndb.de>
>
> The cns3xxx platform is gone, so this driver is now orphaned.
>
> Cc: Krzysztof Halasa <khalasa@piap.pl>
> Signed-off-by: Arnd Bergmann <arnd@arndb.de>

Acked-by: Ulf Hansson <ulf.hansson@linaro.org>

Kind regards
Uffe

> ---
>  drivers/mmc/host/Kconfig         |  11 ---
>  drivers/mmc/host/Makefile        |   1 -
>  drivers/mmc/host/sdhci-cns3xxx.c | 113 -------------------------------
>  3 files changed, 125 deletions(-)
>  delete mode 100644 drivers/mmc/host/sdhci-cns3xxx.c
>
> diff --git a/drivers/mmc/host/Kconfig b/drivers/mmc/host/Kconfig
> index f324daadaf70..1c5b1c48a230 100644
> --- a/drivers/mmc/host/Kconfig
> +++ b/drivers/mmc/host/Kconfig
> @@ -253,17 +253,6 @@ config MMC_SDHCI_CADENCE
>
>           If unsure, say N.
>
> -config MMC_SDHCI_CNS3XXX
> -       tristate "SDHCI support on the Cavium Networks CNS3xxx SoC"
> -       depends on ARCH_CNS3XXX || COMPILE_TEST
> -       depends on MMC_SDHCI_PLTFM
> -       help
> -         This selects the SDHCI support for CNS3xxx System-on-Chip devices.
> -
> -         If you have a controller with this interface, say Y or M here.
> -
> -         If unsure, say N.
> -
>  config MMC_SDHCI_ESDHC_MCF
>         tristate "SDHCI support for the Freescale eSDHC ColdFire controller"
>         depends on M5441x
> diff --git a/drivers/mmc/host/Makefile b/drivers/mmc/host/Makefile
> index 4e4ceb32c4b4..7bea77c28b7e 100644
> --- a/drivers/mmc/host/Makefile
> +++ b/drivers/mmc/host/Makefile
> @@ -77,7 +77,6 @@ obj-$(CONFIG_MMC_REALTEK_USB) += rtsx_usb_sdmmc.o
>
>  obj-$(CONFIG_MMC_SDHCI_PLTFM)          += sdhci-pltfm.o
>  obj-$(CONFIG_MMC_SDHCI_CADENCE)                += sdhci-cadence.o
> -obj-$(CONFIG_MMC_SDHCI_CNS3XXX)                += sdhci-cns3xxx.o
>  obj-$(CONFIG_MMC_SDHCI_ESDHC_MCF)       += sdhci-esdhc-mcf.o
>  obj-$(CONFIG_MMC_SDHCI_ESDHC_IMX)      += sdhci-esdhc-imx.o
>  obj-$(CONFIG_MMC_SDHCI_DOVE)           += sdhci-dove.o
> diff --git a/drivers/mmc/host/sdhci-cns3xxx.c b/drivers/mmc/host/sdhci-cns3xxx.c
> deleted file mode 100644
> index 2a29c7a4f308..000000000000
> --- a/drivers/mmc/host/sdhci-cns3xxx.c
> +++ /dev/null
> @@ -1,113 +0,0 @@
> -// SPDX-License-Identifier: GPL-2.0-only
> -/*
> - * SDHCI support for CNS3xxx SoC
> - *
> - * Copyright 2008 Cavium Networks
> - * Copyright 2010 MontaVista Software, LLC.
> - *
> - * Authors: Scott Shu
> - *         Anton Vorontsov <avorontsov@mvista.com>
> - */
> -
> -#include <linux/delay.h>
> -#include <linux/device.h>
> -#include <linux/mmc/host.h>
> -#include <linux/module.h>
> -#include "sdhci-pltfm.h"
> -
> -static unsigned int sdhci_cns3xxx_get_max_clk(struct sdhci_host *host)
> -{
> -       return 150000000;
> -}
> -
> -static void sdhci_cns3xxx_set_clock(struct sdhci_host *host, unsigned int clock)
> -{
> -       struct device *dev = mmc_dev(host->mmc);
> -       int div = 1;
> -       u16 clk;
> -       unsigned long timeout;
> -
> -       host->mmc->actual_clock = 0;
> -
> -       sdhci_writew(host, 0, SDHCI_CLOCK_CONTROL);
> -
> -       if (clock == 0)
> -               return;
> -
> -       while (host->max_clk / div > clock) {
> -               /*
> -                * On CNS3xxx divider grows linearly up to 4, and then
> -                * exponentially up to 256.
> -                */
> -               if (div < 4)
> -                       div += 1;
> -               else if (div < 256)
> -                       div *= 2;
> -               else
> -                       break;
> -       }
> -
> -       dev_dbg(dev, "desired SD clock: %d, actual: %d\n",
> -               clock, host->max_clk / div);
> -
> -       /* Divide by 3 is special. */
> -       if (div != 3)
> -               div >>= 1;
> -
> -       clk = div << SDHCI_DIVIDER_SHIFT;
> -       clk |= SDHCI_CLOCK_INT_EN;
> -       sdhci_writew(host, clk, SDHCI_CLOCK_CONTROL);
> -
> -       timeout = 20;
> -       while (!((clk = sdhci_readw(host, SDHCI_CLOCK_CONTROL))
> -                       & SDHCI_CLOCK_INT_STABLE)) {
> -               if (timeout == 0) {
> -                       dev_warn(dev, "clock is unstable");
> -                       break;
> -               }
> -               timeout--;
> -               mdelay(1);
> -       }
> -
> -       clk |= SDHCI_CLOCK_CARD_EN;
> -       sdhci_writew(host, clk, SDHCI_CLOCK_CONTROL);
> -}
> -
> -static const struct sdhci_ops sdhci_cns3xxx_ops = {
> -       .get_max_clock  = sdhci_cns3xxx_get_max_clk,
> -       .set_clock      = sdhci_cns3xxx_set_clock,
> -       .set_bus_width  = sdhci_set_bus_width,
> -       .reset          = sdhci_reset,
> -       .set_uhs_signaling = sdhci_set_uhs_signaling,
> -};
> -
> -static const struct sdhci_pltfm_data sdhci_cns3xxx_pdata = {
> -       .ops = &sdhci_cns3xxx_ops,
> -       .quirks = SDHCI_QUIRK_BROKEN_DMA |
> -                 SDHCI_QUIRK_DATA_TIMEOUT_USES_SDCLK |
> -                 SDHCI_QUIRK_INVERTED_WRITE_PROTECT |
> -                 SDHCI_QUIRK_CAP_CLOCK_BASE_BROKEN |
> -                 SDHCI_QUIRK_BROKEN_TIMEOUT_VAL,
> -};
> -
> -static int sdhci_cns3xxx_probe(struct platform_device *pdev)
> -{
> -       return sdhci_pltfm_register(pdev, &sdhci_cns3xxx_pdata, 0);
> -}
> -
> -static struct platform_driver sdhci_cns3xxx_driver = {
> -       .driver         = {
> -               .name   = "sdhci-cns3xxx",
> -               .probe_type = PROBE_PREFER_ASYNCHRONOUS,
> -               .pm     = &sdhci_pltfm_pmops,
> -       },
> -       .probe          = sdhci_cns3xxx_probe,
> -       .remove         = sdhci_pltfm_unregister,
> -};
> -
> -module_platform_driver(sdhci_cns3xxx_driver);
> -
> -MODULE_DESCRIPTION("SDHCI driver for CNS3xxx");
> -MODULE_AUTHOR("Scott Shu, "
> -             "Anton Vorontsov <avorontsov@mvista.com>");
> -MODULE_LICENSE("GPL v2");
> --
> 2.29.2
>
  

Patch

diff --git a/drivers/mmc/host/Kconfig b/drivers/mmc/host/Kconfig
index f324daadaf70..1c5b1c48a230 100644
--- a/drivers/mmc/host/Kconfig
+++ b/drivers/mmc/host/Kconfig
@@ -253,17 +253,6 @@  config MMC_SDHCI_CADENCE
 
 	  If unsure, say N.
 
-config MMC_SDHCI_CNS3XXX
-	tristate "SDHCI support on the Cavium Networks CNS3xxx SoC"
-	depends on ARCH_CNS3XXX || COMPILE_TEST
-	depends on MMC_SDHCI_PLTFM
-	help
-	  This selects the SDHCI support for CNS3xxx System-on-Chip devices.
-
-	  If you have a controller with this interface, say Y or M here.
-
-	  If unsure, say N.
-
 config MMC_SDHCI_ESDHC_MCF
 	tristate "SDHCI support for the Freescale eSDHC ColdFire controller"
 	depends on M5441x
diff --git a/drivers/mmc/host/Makefile b/drivers/mmc/host/Makefile
index 4e4ceb32c4b4..7bea77c28b7e 100644
--- a/drivers/mmc/host/Makefile
+++ b/drivers/mmc/host/Makefile
@@ -77,7 +77,6 @@  obj-$(CONFIG_MMC_REALTEK_USB)	+= rtsx_usb_sdmmc.o
 
 obj-$(CONFIG_MMC_SDHCI_PLTFM)		+= sdhci-pltfm.o
 obj-$(CONFIG_MMC_SDHCI_CADENCE)		+= sdhci-cadence.o
-obj-$(CONFIG_MMC_SDHCI_CNS3XXX)		+= sdhci-cns3xxx.o
 obj-$(CONFIG_MMC_SDHCI_ESDHC_MCF)       += sdhci-esdhc-mcf.o
 obj-$(CONFIG_MMC_SDHCI_ESDHC_IMX)	+= sdhci-esdhc-imx.o
 obj-$(CONFIG_MMC_SDHCI_DOVE)		+= sdhci-dove.o
diff --git a/drivers/mmc/host/sdhci-cns3xxx.c b/drivers/mmc/host/sdhci-cns3xxx.c
deleted file mode 100644
index 2a29c7a4f308..000000000000
--- a/drivers/mmc/host/sdhci-cns3xxx.c
+++ /dev/null
@@ -1,113 +0,0 @@ 
-// SPDX-License-Identifier: GPL-2.0-only
-/*
- * SDHCI support for CNS3xxx SoC
- *
- * Copyright 2008 Cavium Networks
- * Copyright 2010 MontaVista Software, LLC.
- *
- * Authors: Scott Shu
- *	    Anton Vorontsov <avorontsov@mvista.com>
- */
-
-#include <linux/delay.h>
-#include <linux/device.h>
-#include <linux/mmc/host.h>
-#include <linux/module.h>
-#include "sdhci-pltfm.h"
-
-static unsigned int sdhci_cns3xxx_get_max_clk(struct sdhci_host *host)
-{
-	return 150000000;
-}
-
-static void sdhci_cns3xxx_set_clock(struct sdhci_host *host, unsigned int clock)
-{
-	struct device *dev = mmc_dev(host->mmc);
-	int div = 1;
-	u16 clk;
-	unsigned long timeout;
-
-	host->mmc->actual_clock = 0;
-
-	sdhci_writew(host, 0, SDHCI_CLOCK_CONTROL);
-
-	if (clock == 0)
-		return;
-
-	while (host->max_clk / div > clock) {
-		/*
-		 * On CNS3xxx divider grows linearly up to 4, and then
-		 * exponentially up to 256.
-		 */
-		if (div < 4)
-			div += 1;
-		else if (div < 256)
-			div *= 2;
-		else
-			break;
-	}
-
-	dev_dbg(dev, "desired SD clock: %d, actual: %d\n",
-		clock, host->max_clk / div);
-
-	/* Divide by 3 is special. */
-	if (div != 3)
-		div >>= 1;
-
-	clk = div << SDHCI_DIVIDER_SHIFT;
-	clk |= SDHCI_CLOCK_INT_EN;
-	sdhci_writew(host, clk, SDHCI_CLOCK_CONTROL);
-
-	timeout = 20;
-	while (!((clk = sdhci_readw(host, SDHCI_CLOCK_CONTROL))
-			& SDHCI_CLOCK_INT_STABLE)) {
-		if (timeout == 0) {
-			dev_warn(dev, "clock is unstable");
-			break;
-		}
-		timeout--;
-		mdelay(1);
-	}
-
-	clk |= SDHCI_CLOCK_CARD_EN;
-	sdhci_writew(host, clk, SDHCI_CLOCK_CONTROL);
-}
-
-static const struct sdhci_ops sdhci_cns3xxx_ops = {
-	.get_max_clock	= sdhci_cns3xxx_get_max_clk,
-	.set_clock	= sdhci_cns3xxx_set_clock,
-	.set_bus_width	= sdhci_set_bus_width,
-	.reset          = sdhci_reset,
-	.set_uhs_signaling = sdhci_set_uhs_signaling,
-};
-
-static const struct sdhci_pltfm_data sdhci_cns3xxx_pdata = {
-	.ops = &sdhci_cns3xxx_ops,
-	.quirks = SDHCI_QUIRK_BROKEN_DMA |
-		  SDHCI_QUIRK_DATA_TIMEOUT_USES_SDCLK |
-		  SDHCI_QUIRK_INVERTED_WRITE_PROTECT |
-		  SDHCI_QUIRK_CAP_CLOCK_BASE_BROKEN |
-		  SDHCI_QUIRK_BROKEN_TIMEOUT_VAL,
-};
-
-static int sdhci_cns3xxx_probe(struct platform_device *pdev)
-{
-	return sdhci_pltfm_register(pdev, &sdhci_cns3xxx_pdata, 0);
-}
-
-static struct platform_driver sdhci_cns3xxx_driver = {
-	.driver		= {
-		.name	= "sdhci-cns3xxx",
-		.probe_type = PROBE_PREFER_ASYNCHRONOUS,
-		.pm	= &sdhci_pltfm_pmops,
-	},
-	.probe		= sdhci_cns3xxx_probe,
-	.remove		= sdhci_pltfm_unregister,
-};
-
-module_platform_driver(sdhci_cns3xxx_driver);
-
-MODULE_DESCRIPTION("SDHCI driver for CNS3xxx");
-MODULE_AUTHOR("Scott Shu, "
-	      "Anton Vorontsov <avorontsov@mvista.com>");
-MODULE_LICENSE("GPL v2");