[alsa-devel] [PATCH 3/6] ASoC: kirkwood: get rid of armada-370-db driver

[Thomas Petazzoni]

Now that the Armada 370 DB audio complex is fully described in the
Device Tree using the simple-card DT binding, the armada-370-db audio
machine driver can be removed.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni at free-electrons.com>
---
 sound/soc/kirkwood/Kconfig         |  13 +---
 sound/soc/kirkwood/Makefile        |   4 -
 sound/soc/kirkwood/armada-370-db.c | 148 -------------------------------------
 3 files changed, 1 insertion(+), 164 deletions(-)
 delete mode 100644 sound/soc/kirkwood/armada-370-db.c

diff --git a/sound/soc/kirkwood/Kconfig b/sound/soc/kirkwood/Kconfig
index 132bb83..c1b9822 100644
--- a/sound/soc/kirkwood/Kconfig
+++ b/sound/soc/kirkwood/Kconfig
@@ -3,15 +3,4 @@ config SND_KIRKWOOD_SOC
 	depends on ARCH_DOVE || ARCH_MVEBU || COMPILE_TEST
 	help
 	  Say Y or M if you want to add support for codecs attached to
-	  the Kirkwood I2S interface. You will also need to select the
-	  audio interfaces to support below.
-
-config SND_KIRKWOOD_SOC_ARMADA370_DB
-	tristate "SoC Audio support for Armada 370 DB"
-	depends on SND_KIRKWOOD_SOC && (ARCH_MVEBU || COMPILE_TEST) && I2C
-	select SND_SOC_CS42L51
-	select SND_SOC_SPDIF
-	help
-	  Say Y if you want to add support for SoC audio on
-	  the Armada 370 Development Board.
-
+	  the Kirkwood I2S interface.
diff --git a/sound/soc/kirkwood/Makefile b/sound/soc/kirkwood/Makefile
index c36b03d..8cff64e 100644
--- a/sound/soc/kirkwood/Makefile
+++ b/sound/soc/kirkwood/Makefile
@@ -1,7 +1,3 @@
 snd-soc-kirkwood-objs := kirkwood-dma.o kirkwood-i2s.o
 
 obj-$(CONFIG_SND_KIRKWOOD_SOC) += snd-soc-kirkwood.o
-
-snd-soc-armada-370-db-objs := armada-370-db.o
-
-obj-$(CONFIG_SND_KIRKWOOD_SOC_ARMADA370_DB) += snd-soc-armada-370-db.o
diff --git a/sound/soc/kirkwood/armada-370-db.c b/sound/soc/kirkwood/armada-370-db.c
deleted file mode 100644
index c443338..0000000
--- a/sound/soc/kirkwood/armada-370-db.c
+++ /dev/null
@@ -1,148 +0,0 @@
-/*
- * Copyright (C) 2014 Marvell
- *
- * Thomas Petazzoni <thomas.petazzoni at free-electrons.com>
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- */
-
-#include <linux/module.h>
-#include <linux/moduleparam.h>
-#include <linux/interrupt.h>
-#include <linux/platform_device.h>
-#include <linux/slab.h>
-#include <sound/soc.h>
-#include <linux/of.h>
-#include <linux/platform_data/asoc-kirkwood.h>
-#include "../codecs/cs42l51.h"
-
-static int a370db_hw_params(struct snd_pcm_substream *substream,
-			    struct snd_pcm_hw_params *params)
-{
-	struct snd_soc_pcm_runtime *rtd = substream->private_data;
-	struct snd_soc_dai *codec_dai = rtd->codec_dai;
-	unsigned int freq;
-
-	switch (params_rate(params)) {
-	default:
-	case 44100:
-		freq = 11289600;
-		break;
-	case 48000:
-		freq = 12288000;
-		break;
-	case 96000:
-		freq = 24576000;
-		break;
-	}
-
-	return snd_soc_dai_set_sysclk(codec_dai, 0, freq, SND_SOC_CLOCK_IN);
-}
-
-static struct snd_soc_ops a370db_ops = {
-	.hw_params = a370db_hw_params,
-};
-
-static const struct snd_soc_dapm_widget a370db_dapm_widgets[] = {
-	SND_SOC_DAPM_HP("Out Jack", NULL),
-	SND_SOC_DAPM_LINE("In Jack", NULL),
-};
-
-static const struct snd_soc_dapm_route a370db_route[] = {
-	{ "Out Jack",	NULL,	"HPL" },
-	{ "Out Jack",	NULL,	"HPR" },
-	{ "AIN1L",	NULL,	"In Jack" },
-	{ "AIN1L",	NULL,	"In Jack" },
-};
-
-static struct snd_soc_dai_link a370db_dai[] = {
-{
-	.name = "CS42L51",
-	.stream_name = "analog",
-	.cpu_dai_name = "i2s",
-	.codec_dai_name = "cs42l51-hifi",
-	.dai_fmt = SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_CBS_CFS,
-	.ops = &a370db_ops,
-},
-{
-	.name = "S/PDIF out",
-	.stream_name = "spdif-out",
-	.cpu_dai_name = "spdif",
-	.codec_dai_name = "dit-hifi",
-	.dai_fmt = SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_CBS_CFS,
-},
-{
-	.name = "S/PDIF in",
-	.stream_name = "spdif-in",
-	.cpu_dai_name = "spdif",
-	.codec_dai_name = "dir-hifi",
-	.dai_fmt = SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_CBS_CFS,
-},
-};
-
-static struct snd_soc_card a370db = {
-	.name = "a370db",
-	.owner = THIS_MODULE,
-	.dai_link = a370db_dai,
-	.num_links = ARRAY_SIZE(a370db_dai),
-	.dapm_widgets = a370db_dapm_widgets,
-	.num_dapm_widgets = ARRAY_SIZE(a370db_dapm_widgets),
-	.dapm_routes = a370db_route,
-	.num_dapm_routes = ARRAY_SIZE(a370db_route),
-};
-
-static int a370db_probe(struct platform_device *pdev)
-{
-	struct snd_soc_card *card = &a370db;
-
-	card->dev = &pdev->dev;
-
-	a370db_dai[0].cpu_of_node =
-		of_parse_phandle(pdev->dev.of_node,
-				 "marvell,audio-controller", 0);
-	a370db_dai[0].platform_of_node = a370db_dai[0].cpu_of_node;
-
-	a370db_dai[0].codec_of_node =
-		of_parse_phandle(pdev->dev.of_node,
-				 "marvell,audio-codec", 0);
-
-	a370db_dai[1].cpu_of_node = a370db_dai[0].cpu_of_node;
-	a370db_dai[1].platform_of_node = a370db_dai[0].cpu_of_node;
-
-	a370db_dai[1].codec_of_node =
-		of_parse_phandle(pdev->dev.of_node,
-				 "marvell,audio-codec", 1);
-
-	a370db_dai[2].cpu_of_node = a370db_dai[0].cpu_of_node;
-	a370db_dai[2].platform_of_node = a370db_dai[0].cpu_of_node;
-
-	a370db_dai[2].codec_of_node =
-		of_parse_phandle(pdev->dev.of_node,
-				 "marvell,audio-codec", 2);
-
-	return devm_snd_soc_register_card(card->dev, card);
-}
-
-static const struct of_device_id a370db_dt_ids[] = {
-	{ .compatible = "marvell,a370db-audio" },
-	{ },
-};
-
-static struct platform_driver a370db_driver = {
-	.driver		= {
-		.name	= "a370db-audio",
-		.owner	= THIS_MODULE,
-		.of_match_table = of_match_ptr(a370db_dt_ids),
-	},
-	.probe		= a370db_probe,
-};
-
-module_platform_driver(a370db_driver);
-
-MODULE_AUTHOR("Thomas Petazzoni <thomas.petazzoni at free-electrons.com>");
-MODULE_DESCRIPTION("ALSA SoC a370db audio client");
-MODULE_LICENSE("GPL");
-MODULE_ALIAS("platform:a370db-audio");
-- 
2.0.0