mfd: Remove davinci voicecodec driver

The ASoC davinci voicecodec support is no longer used after
the removal of the dm3xx SoC platform, so the MFD driver is never
selected.

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Acked-by: Bartosz Golaszewski <bartosz.golaszewski@linaro.org>
Signed-off-by: Lee Jones <lee@kernel.org>
Link: https://lore.kernel.org/r/20221019152947.3857217-11-arnd@kernel.org

diff --git a/drivers/mfd/Kconfig b/drivers/mfd/Kconfig
index 20613a5..3bacbe1 100644 (file)
--- a/drivers/mfd/Kconfig
+++ b/drivers/mfd/Kconfig
@@ -1444,11 +1444,6 @@ config MFD_SYSCON
          Select this option to enable accessing system control registers
          via regmap.
 
-config MFD_DAVINCI_VOICECODEC
-       tristate
-       select MFD_CORE
-       select REGMAP_MMIO
-
 config MFD_TI_AM335X_TSCADC
        tristate "TI ADC / Touch Screen chip support"
        select MFD_CORE

diff --git a/drivers/mfd/Makefile b/drivers/mfd/Makefile
index 6bfe201..86c51dc 100644 (file)
--- a/drivers/mfd/Makefile
+++ b/drivers/mfd/Makefile
@@ -23,8 +23,6 @@ obj-$(CONFIG_HTC_I2CPLD)      += htc-i2cpld.o
 
 obj-$(CONFIG_MFD_TI_LP873X)    += lp873x.o
 obj-$(CONFIG_MFD_TI_LP87565)   += lp87565.o
-
-obj-$(CONFIG_MFD_DAVINCI_VOICECODEC)   += davinci_voicecodec.o
 obj-$(CONFIG_MFD_TI_AM335X_TSCADC)     += ti_am335x_tscadc.o
 
 obj-$(CONFIG_MFD_STA2X11)      += sta2x11-mfd.o

diff --git a/drivers/mfd/davinci_voicecodec.c b/drivers/mfd/davinci_voicecodec.c
deleted file mode 100644 (file)
index 9658204..0000000
--- a/drivers/mfd/davinci_voicecodec.c
+++ /dev/null
@@ -1,136 +0,0 @@
-// SPDX-License-Identifier: GPL-2.0-or-later
-/*
- * DaVinci Voice Codec Core Interface for TI platforms
- *
- * Copyright (C) 2010 Texas Instruments, Inc
- *
- * Author: Miguel Aguilar <miguel.aguilar@ridgerun.com>
- */
-
-#include <linux/init.h>
-#include <linux/module.h>
-#include <linux/device.h>
-#include <linux/slab.h>
-#include <linux/delay.h>
-#include <linux/io.h>
-#include <linux/clk.h>
-#include <linux/regmap.h>
-
-#include <sound/pcm.h>
-
-#include <linux/mfd/davinci_voicecodec.h>
-
-static const struct regmap_config davinci_vc_regmap = {
-       .reg_bits = 32,
-       .val_bits = 32,
-};
-
-static int __init davinci_vc_probe(struct platform_device *pdev)
-{
-       struct davinci_vc *davinci_vc;
-       struct resource *res;
-       struct mfd_cell *cell = NULL;
-       dma_addr_t fifo_base;
-       int ret;
-
-       davinci_vc = devm_kzalloc(&pdev->dev,
-                                 sizeof(struct davinci_vc), GFP_KERNEL);
-       if (!davinci_vc)
-               return -ENOMEM;
-
-       davinci_vc->clk = devm_clk_get(&pdev->dev, NULL);
-       if (IS_ERR(davinci_vc->clk)) {
-               dev_dbg(&pdev->dev,
-                           "could not get the clock for voice codec\n");
-               return -ENODEV;
-       }
-       clk_enable(davinci_vc->clk);
-
-       davinci_vc->base = devm_platform_get_and_ioremap_resource(pdev, 0, &res);
-       if (IS_ERR(davinci_vc->base)) {
-               ret = PTR_ERR(davinci_vc->base);
-               goto fail;
-       }
-       fifo_base = (dma_addr_t)res->start;
-
-       davinci_vc->regmap = devm_regmap_init_mmio(&pdev->dev,
-                                                  davinci_vc->base,
-                                                  &davinci_vc_regmap);
-       if (IS_ERR(davinci_vc->regmap)) {
-               ret = PTR_ERR(davinci_vc->regmap);
-               goto fail;
-       }
-
-       res = platform_get_resource(pdev, IORESOURCE_DMA, 0);
-       if (!res) {
-               dev_err(&pdev->dev, "no DMA resource\n");
-               ret = -ENXIO;
-               goto fail;
-       }
-
-       davinci_vc->davinci_vcif.dma_tx_channel = res->start;
-       davinci_vc->davinci_vcif.dma_tx_addr = fifo_base + DAVINCI_VC_WFIFO;
-
-       res = platform_get_resource(pdev, IORESOURCE_DMA, 1);
-       if (!res) {
-               dev_err(&pdev->dev, "no DMA resource\n");
-               ret = -ENXIO;
-               goto fail;
-       }
-
-       davinci_vc->davinci_vcif.dma_rx_channel = res->start;
-       davinci_vc->davinci_vcif.dma_rx_addr = fifo_base + DAVINCI_VC_RFIFO;
-
-       davinci_vc->dev = &pdev->dev;
-       davinci_vc->pdev = pdev;
-
-       /* Voice codec interface client */
-       cell = &davinci_vc->cells[DAVINCI_VC_VCIF_CELL];
-       cell->name = "davinci-vcif";
-       cell->platform_data = davinci_vc;
-       cell->pdata_size = sizeof(*davinci_vc);
-
-       /* Voice codec CQ93VC client */
-       cell = &davinci_vc->cells[DAVINCI_VC_CQ93VC_CELL];
-       cell->name = "cq93vc-codec";
-       cell->platform_data = davinci_vc;
-       cell->pdata_size = sizeof(*davinci_vc);
-
-       ret = mfd_add_devices(&pdev->dev, pdev->id, davinci_vc->cells,
-                             DAVINCI_VC_CELLS, NULL, 0, NULL);
-       if (ret != 0) {
-               dev_err(&pdev->dev, "fail to register client devices\n");
-               goto fail;
-       }
-
-       return 0;
-
-fail:
-       clk_disable(davinci_vc->clk);
-
-       return ret;
-}
-
-static int davinci_vc_remove(struct platform_device *pdev)
-{
-       struct davinci_vc *davinci_vc = platform_get_drvdata(pdev);
-
-       mfd_remove_devices(&pdev->dev);
-
-       clk_disable(davinci_vc->clk);
-
-       return 0;
-}
-
-static struct platform_driver davinci_vc_driver = {
-       .driver = {
-               .name = "davinci_voicecodec",
-       },
-       .remove = davinci_vc_remove,
-};
-
-module_platform_driver_probe(davinci_vc_driver, davinci_vc_probe);
-
-MODULE_AUTHOR("Miguel Aguilar");
-MODULE_DESCRIPTION("Texas Instruments DaVinci Voice Codec Core Interface");
-MODULE_LICENSE("GPL");