ASoC: jz4740: Drop lb60 board code

The board now uses the simple-audio-card driver.

Signed-off-by: Paul Cercueil <paul@crapouillou.net>
Tested-by: Artur Rojek <contact@artur-rojek.eu>
Acked-by: Mark Brown <broonie@kernel.org>
Signed-off-by: Paul Burton <paul.burton@mips.com>

diff --git a/sound/soc/jz4740/Kconfig b/sound/soc/jz4740/Kconfig
index 6b75716..e72f826 100644 (file)
--- a/sound/soc/jz4740/Kconfig
+++ b/sound/soc/jz4740/Kconfig
@@ -1,30 +1,9 @@
 # SPDX-License-Identifier: GPL-2.0-only
-config SND_JZ4740_SOC
-       tristate "SoC Audio for Ingenic JZ4740 SoC"
-       depends on MIPS || COMPILE_TEST
-       select SND_SOC_GENERIC_DMAENGINE_PCM
-       help
-         Say Y or M if you want to add support for codecs attached to
-         the JZ4740 I2S interface. You will also need to select the audio
-         interfaces to support below.
-
-if SND_JZ4740_SOC
-
 config SND_JZ4740_SOC_I2S
        tristate "SoC Audio (I2S protocol) for Ingenic JZ4740 SoC"
+       depends on MIPS || COMPILE_TEST
        depends on HAS_IOMEM
+       select SND_SOC_GENERIC_DMAENGINE_PCM
        help
          Say Y if you want to use I2S protocol and I2S codec on Ingenic JZ4740
          based boards.
-
-config SND_JZ4740_SOC_QI_LB60
-       tristate "SoC Audio support for Qi LB60"
-       depends on HAS_IOMEM
-       depends on JZ4740_QI_LB60 || COMPILE_TEST
-       select SND_JZ4740_SOC_I2S
-    select SND_SOC_JZ4740_CODEC
-       help
-         Say Y if you want to add support for ASoC audio on the Qi LB60 board
-         a.k.a Qi Ben NanoNote.
-
-endif

diff --git a/sound/soc/jz4740/Makefile b/sound/soc/jz4740/Makefile
index fb10e9a..f8701c9 100644 (file)
--- a/sound/soc/jz4740/Makefile
+++ b/sound/soc/jz4740/Makefile
@@ -5,8 +5,3 @@
 snd-soc-jz4740-i2s-objs := jz4740-i2s.o
 
 obj-$(CONFIG_SND_JZ4740_SOC_I2S) += snd-soc-jz4740-i2s.o
-
-# Jz4740 Machine Support
-snd-soc-qi-lb60-objs := qi_lb60.o
-
-obj-$(CONFIG_SND_JZ4740_SOC_QI_LB60) += snd-soc-qi-lb60.o

diff --git a/sound/soc/jz4740/qi_lb60.c b/sound/soc/jz4740/qi_lb60.c
deleted file mode 100644 (file)
index 8ef6f41..0000000
--- a/sound/soc/jz4740/qi_lb60.c
+++ /dev/null
@@ -1,106 +0,0 @@
-// SPDX-License-Identifier: GPL-2.0-only
-/*
- * Copyright (C) 2009, Lars-Peter Clausen <lars@metafoo.de>
- */
-
-#include <linux/module.h>
-#include <linux/moduleparam.h>
-#include <linux/timer.h>
-#include <linux/interrupt.h>
-#include <linux/platform_device.h>
-#include <sound/core.h>
-#include <sound/pcm.h>
-#include <sound/soc.h>
-#include <linux/gpio/consumer.h>
-
-struct qi_lb60 {
-       struct gpio_desc *snd_gpio;
-       struct gpio_desc *amp_gpio;
-};
-
-static int qi_lb60_spk_event(struct snd_soc_dapm_widget *widget,
-                            struct snd_kcontrol *ctrl, int event)
-{
-       struct qi_lb60 *qi_lb60 = snd_soc_card_get_drvdata(widget->dapm->card);
-       int on = !SND_SOC_DAPM_EVENT_OFF(event);
-
-       gpiod_set_value_cansleep(qi_lb60->snd_gpio, on);
-       gpiod_set_value_cansleep(qi_lb60->amp_gpio, on);
-
-       return 0;
-}
-
-static const struct snd_soc_dapm_widget qi_lb60_widgets[] = {
-       SND_SOC_DAPM_SPK("Speaker", qi_lb60_spk_event),
-       SND_SOC_DAPM_MIC("Mic", NULL),
-};
-
-static const struct snd_soc_dapm_route qi_lb60_routes[] = {
-       {"Mic", NULL, "MIC"},
-       {"Speaker", NULL, "LOUT"},
-       {"Speaker", NULL, "ROUT"},
-};
-
-SND_SOC_DAILINK_DEFS(hifi,
-       DAILINK_COMP_ARRAY(COMP_CPU("jz4740-i2s")),
-       DAILINK_COMP_ARRAY(COMP_CODEC("jz4740-codec", "jz4740-hifi")),
-       DAILINK_COMP_ARRAY(COMP_PLATFORM("jz4740-i2s")));
-
-static struct snd_soc_dai_link qi_lb60_dai = {
-       .name = "jz4740",
-       .stream_name = "jz4740",
-       .dai_fmt = SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_NB_NF |
-               SND_SOC_DAIFMT_CBM_CFM,
-       SND_SOC_DAILINK_REG(hifi),
-};
-
-static struct snd_soc_card qi_lb60_card = {
-       .name = "QI LB60",
-       .owner = THIS_MODULE,
-       .dai_link = &qi_lb60_dai,
-       .num_links = 1,
-
-       .dapm_widgets = qi_lb60_widgets,
-       .num_dapm_widgets = ARRAY_SIZE(qi_lb60_widgets),
-       .dapm_routes = qi_lb60_routes,
-       .num_dapm_routes = ARRAY_SIZE(qi_lb60_routes),
-       .fully_routed = true,
-};
-
-static int qi_lb60_probe(struct platform_device *pdev)
-{
-       struct qi_lb60 *qi_lb60;
-       struct snd_soc_card *card = &qi_lb60_card;
-
-       qi_lb60 = devm_kzalloc(&pdev->dev, sizeof(*qi_lb60), GFP_KERNEL);
-       if (!qi_lb60)
-               return -ENOMEM;
-
-       qi_lb60->snd_gpio = devm_gpiod_get(&pdev->dev, "snd", GPIOD_OUT_LOW);
-       if (IS_ERR(qi_lb60->snd_gpio))
-               return PTR_ERR(qi_lb60->snd_gpio);
-
-       qi_lb60->amp_gpio = devm_gpiod_get(&pdev->dev, "amp", GPIOD_OUT_LOW);
-       if (IS_ERR(qi_lb60->amp_gpio))
-               return PTR_ERR(qi_lb60->amp_gpio);
-
-       card->dev = &pdev->dev;
-
-       snd_soc_card_set_drvdata(card, qi_lb60);
-
-       return devm_snd_soc_register_card(&pdev->dev, card);
-}
-
-static struct platform_driver qi_lb60_driver = {
-       .driver         = {
-               .name   = "qi-lb60-audio",
-       },
-       .probe          = qi_lb60_probe,
-};
-
-module_platform_driver(qi_lb60_driver);
-
-MODULE_AUTHOR("Lars-Peter Clausen <lars@metafoo.de>");
-MODULE_DESCRIPTION("ALSA SoC QI LB60 Audio support");
-MODULE_LICENSE("GPL v2");
-MODULE_ALIAS("platform:qi-lb60-audio");