ASoC: phycore-ac97: Remove unused driver

Since commit e1324ece2af4 ("ARM: imx: Remove i.MX35 board files"), the
MACH_PCM043 and MACH_PCA100 non-DT platform are no longer supported,
so get rid of their machine audio driver too.

Signed-off-by: Fabio Estevam <festevam@gmail.com>
Link: https://lore.kernel.org/r/20201110203937.25684-3-festevam@gmail.com
Signed-off-by: Mark Brown <broonie@kernel.org>

diff --git a/sound/soc/fsl/Kconfig b/sound/soc/fsl/Kconfig
index c18ec9310aa7d24f88f8753aa09bb751cb984185..63be2bf5b509889d8198ddb5f37c2da46ff76268 100644 (file)
--- a/sound/soc/fsl/Kconfig
+++ b/sound/soc/fsl/Kconfig
@@ -239,18 +239,6 @@ config SND_SOC_IMX_SSI
 
 comment "SoC Audio support for Freescale i.MX boards:"
 
-config SND_SOC_PHYCORE_AC97
-       tristate "SoC Audio support for Phytec phyCORE (and phyCARD) boards"
-       depends on MACH_PCM043 || MACH_PCA100
-       select SND_SOC_AC97_BUS
-       select SND_SOC_WM9712
-       select SND_SOC_IMX_PCM_FIQ
-       select SND_SOC_IMX_AUDMUX
-       select SND_SOC_IMX_SSI
-       help
-         Say Y if you want to add support for SoC audio on Phytec phyCORE
-         and phyCARD boards in AC97 mode
-
 config SND_SOC_EUKREA_TLV320
        tristate "Eukrea TLV320"
        depends on ARCH_MXC && !ARM64 && I2C

diff --git a/sound/soc/fsl/Makefile b/sound/soc/fsl/Makefile
index 5c6058f414be996c336611d803ad79c4db9f114e..12755058f87785c4acf71823dacebe671ba0b687 100644 (file)
--- a/sound/soc/fsl/Makefile
+++ b/sound/soc/fsl/Makefile
@@ -63,7 +63,6 @@ obj-$(CONFIG_SND_SOC_IMX_PCM_DMA) += imx-pcm-dma.o
 
 # i.MX Machine Support
 snd-soc-eukrea-tlv320-objs := eukrea-tlv320.o
-snd-soc-phycore-ac97-objs := phycore-ac97.o
 snd-soc-imx-es8328-objs := imx-es8328.o
 snd-soc-imx-sgtl5000-objs := imx-sgtl5000.o
 snd-soc-imx-spdif-objs := imx-spdif.o
@@ -71,7 +70,6 @@ snd-soc-imx-mc13783-objs := imx-mc13783.o
 snd-soc-imx-audmix-objs := imx-audmix.o
 
 obj-$(CONFIG_SND_SOC_EUKREA_TLV320) += snd-soc-eukrea-tlv320.o
-obj-$(CONFIG_SND_SOC_PHYCORE_AC97) += snd-soc-phycore-ac97.o
 obj-$(CONFIG_SND_SOC_IMX_ES8328) += snd-soc-imx-es8328.o
 obj-$(CONFIG_SND_SOC_IMX_SGTL5000) += snd-soc-imx-sgtl5000.o
 obj-$(CONFIG_SND_SOC_IMX_SPDIF) += snd-soc-imx-spdif.o

diff --git a/sound/soc/fsl/phycore-ac97.c b/sound/soc/fsl/phycore-ac97.c
deleted file mode 100644 (file)
index e561f7f..0000000
--- a/sound/soc/fsl/phycore-ac97.c
+++ /dev/null
@@ -1,121 +0,0 @@
-// SPDX-License-Identifier: GPL-2.0+
-//
-// phycore-ac97.c  --  SoC audio for imx_phycore in AC97 mode
-//
-// Copyright 2009 Sascha Hauer, Pengutronix <s.hauer@pengutronix.de>
-
-#include <linux/module.h>
-#include <linux/moduleparam.h>
-#include <linux/device.h>
-#include <linux/i2c.h>
-#include <sound/core.h>
-#include <sound/pcm.h>
-#include <sound/soc.h>
-#include <asm/mach-types.h>
-
-#include "imx-audmux.h"
-
-static struct snd_soc_card imx_phycore;
-
-static const struct snd_soc_ops imx_phycore_hifi_ops = {
-};
-
-SND_SOC_DAILINK_DEFS(hifi,
-       DAILINK_COMP_ARRAY(COMP_CPU("imx-ssi.0")),
-       DAILINK_COMP_ARRAY(COMP_CODEC("wm9712-codec", "wm9712-hifi")),
-       DAILINK_COMP_ARRAY(COMP_PLATFORM("imx-ssi.0")));
-
-static struct snd_soc_dai_link imx_phycore_dai_ac97[] = {
-       {
-               .name           = "HiFi",
-               .stream_name    = "HiFi",
-               .ops            = &imx_phycore_hifi_ops,
-               SND_SOC_DAILINK_REG(hifi),
-       },
-};
-
-static struct snd_soc_card imx_phycore = {
-       .name           = "PhyCORE-ac97-audio",
-       .owner          = THIS_MODULE,
-       .dai_link       = imx_phycore_dai_ac97,
-       .num_links      = ARRAY_SIZE(imx_phycore_dai_ac97),
-};
-
-static struct platform_device *imx_phycore_snd_ac97_device;
-static struct platform_device *imx_phycore_snd_device;
-
-static int __init imx_phycore_init(void)
-{
-       int ret;
-
-       if (machine_is_pca100()) {
-               imx_audmux_v1_configure_port(MX27_AUDMUX_HPCR1_SSI0,
-                       IMX_AUDMUX_V1_PCR_SYN | /* 4wire mode */
-                       IMX_AUDMUX_V1_PCR_TFCSEL(3) |
-                       IMX_AUDMUX_V1_PCR_TCLKDIR | /* clock is output */
-                       IMX_AUDMUX_V1_PCR_RXDSEL(3));
-               imx_audmux_v1_configure_port(3,
-                       IMX_AUDMUX_V1_PCR_SYN | /* 4wire mode */
-                       IMX_AUDMUX_V1_PCR_TFCSEL(0) |
-                       IMX_AUDMUX_V1_PCR_TFSDIR |
-                       IMX_AUDMUX_V1_PCR_RXDSEL(0));
-       } else if (machine_is_pcm043()) {
-               imx_audmux_v2_configure_port(3,
-                       IMX_AUDMUX_V2_PTCR_SYN | /* 4wire mode */
-                       IMX_AUDMUX_V2_PTCR_TFSEL(0) |
-                       IMX_AUDMUX_V2_PTCR_TFSDIR,
-                       IMX_AUDMUX_V2_PDCR_RXDSEL(0));
-               imx_audmux_v2_configure_port(0,
-                       IMX_AUDMUX_V2_PTCR_SYN | /* 4wire mode */
-                       IMX_AUDMUX_V2_PTCR_TCSEL(3) |
-                       IMX_AUDMUX_V2_PTCR_TCLKDIR, /* clock is output */
-                       IMX_AUDMUX_V2_PDCR_RXDSEL(3));
-       } else {
-               /* return happy. We might run on a totally different machine */
-               return 0;
-       }
-
-       imx_phycore_snd_ac97_device = platform_device_alloc("soc-audio", -1);
-       if (!imx_phycore_snd_ac97_device)
-               return -ENOMEM;
-
-       platform_set_drvdata(imx_phycore_snd_ac97_device, &imx_phycore);
-       ret = platform_device_add(imx_phycore_snd_ac97_device);
-       if (ret)
-               goto fail1;
-
-       imx_phycore_snd_device = platform_device_alloc("wm9712-codec", -1);
-       if (!imx_phycore_snd_device) {
-               ret = -ENOMEM;
-               goto fail2;
-       }
-       ret = platform_device_add(imx_phycore_snd_device);
-
-       if (ret) {
-               printk(KERN_ERR "ASoC: Platform device allocation failed\n");
-               goto fail3;
-       }
-
-       return 0;
-
-fail3:
-       platform_device_put(imx_phycore_snd_device);
-fail2:
-       platform_device_del(imx_phycore_snd_ac97_device);
-fail1:
-       platform_device_put(imx_phycore_snd_ac97_device);
-       return ret;
-}
-
-static void __exit imx_phycore_exit(void)
-{
-       platform_device_unregister(imx_phycore_snd_device);
-       platform_device_unregister(imx_phycore_snd_ac97_device);
-}
-
-late_initcall(imx_phycore_init);
-module_exit(imx_phycore_exit);
-
-MODULE_AUTHOR("Sascha Hauer <s.hauer@pengutronix.de>");
-MODULE_DESCRIPTION("PhyCORE ALSA SoC driver");
-MODULE_LICENSE("GPL");