Commit 29ed9cec authored by Alexander Sverdlin's avatar Alexander Sverdlin Committed by Arnd Bergmann
Browse files

ASoC: cirrus: edb93xx: Delete driver 



Can be replaced with "simple-audio-card" for the rates up to 50kHz, refer
to commit "ARM: dts: ep93xx: Add EDB9302 DT".

Signed-off-by: default avatarAlexander Sverdlin <alexander.sverdlin@gmail.com>
Signed-off-by: default avatarNikita Shubin <nikita.shubin@maquefel.me>
Acked-by: default avatarMark Brown <broonie@kernel.org>
Acked-by: default avatarVinod Koul <vkoul@kernel.org>
Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parent 43528a72

sound/soc/cirrus/Kconfig

+0 −9
Original line number Diff line number Diff line
@@ -31,12 +31,3 @@ config SND_EP93XX_SOC_I2S_WATCHDOG 


endif # if SND_EP93XX_SOC_I2S

config SND_EP93XX_SOC_EDB93XX

	tristate "SoC Audio support for Cirrus Logic EDB93xx boards"

	depends on SND_EP93XX_SOC && (MACH_EDB9301 || MACH_EDB9302 || MACH_EDB9302A || MACH_EDB9307A || MACH_EDB9315A)

	select SND_EP93XX_SOC_I2S

	select SND_SOC_CS4271_I2C if I2C

	select SND_SOC_CS4271_SPI if SPI_MASTER

	help

	  Say Y or M here if you want to add support for I2S audio on the

	  Cirrus Logic EDB93xx boards.

sound/soc/cirrus/Makefile

+0 −4
Original line number Diff line number Diff line
@@ -6,7 +6,3 @@ snd-soc-ep93xx-i2s-y := ep93xx-i2s.o 
obj-$(CONFIG_SND_EP93XX_SOC)			+= snd-soc-ep93xx.o

obj-$(CONFIG_SND_EP93XX_SOC_I2S)		+= snd-soc-ep93xx-i2s.o

# EP93XX Machine Support

snd-soc-edb93xx-y				:= edb93xx.o



obj-$(CONFIG_SND_EP93XX_SOC_EDB93XX)		+= snd-soc-edb93xx.o

sound/soc/cirrus/edb93xx.c

deleted100644 → 0
+0 −116
Original line number Diff line number Diff line 
// SPDX-License-Identifier: GPL-2.0-or-later

/*

 * SoC audio for EDB93xx

 *

 * Copyright (c) 2010 Alexander Sverdlin <subaparts@yandex.ru>

 *

 * This driver support CS4271 codec being master or slave, working

 * in control port mode, connected either via SPI or I2C.

 * The data format accepted is I2S or left-justified.

 * DAPM support not implemented.

 */



#include <linux/platform_device.h>

#include <linux/module.h>

#include <linux/soc/cirrus/ep93xx.h>

#include <sound/core.h>

#include <sound/pcm.h>

#include <sound/soc.h>

#include <asm/mach-types.h>



static int edb93xx_hw_params(struct snd_pcm_substream *substream,

			     struct snd_pcm_hw_params *params)

{

	struct snd_soc_pcm_runtime *rtd = snd_soc_substream_to_rtd(substream);

	struct snd_soc_dai *codec_dai = snd_soc_rtd_to_codec(rtd, 0);

	struct snd_soc_dai *cpu_dai = snd_soc_rtd_to_cpu(rtd, 0);

	int err;

	unsigned int mclk_rate;

	unsigned int rate = params_rate(params);



	/*

	 * According to CS4271 datasheet we use MCLK/LRCK=256 for

	 * rates below 50kHz and 128 for higher sample rates

	 */

	if (rate < 50000)

		mclk_rate = rate * 64 * 4;

	else

		mclk_rate = rate * 64 * 2;



	err = snd_soc_dai_set_sysclk(codec_dai, 0, mclk_rate,

				     SND_SOC_CLOCK_IN);

	if (err)

		return err;



	return snd_soc_dai_set_sysclk(cpu_dai, 0, mclk_rate,

				      SND_SOC_CLOCK_OUT);

}



static const struct snd_soc_ops edb93xx_ops = {

	.hw_params	= edb93xx_hw_params,

};



SND_SOC_DAILINK_DEFS(hifi,

	DAILINK_COMP_ARRAY(COMP_CPU("ep93xx-i2s")),

	DAILINK_COMP_ARRAY(COMP_CODEC("spi0.0", "cs4271-hifi")),

	DAILINK_COMP_ARRAY(COMP_PLATFORM("ep93xx-i2s")));



static struct snd_soc_dai_link edb93xx_dai = {

	.name		= "CS4271",

	.stream_name	= "CS4271 HiFi",

	.dai_fmt	= SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_NB_NF |

			  SND_SOC_DAIFMT_CBC_CFC,

	.ops		= &edb93xx_ops,

	SND_SOC_DAILINK_REG(hifi),

};



static struct snd_soc_card snd_soc_edb93xx = {

	.name		= "EDB93XX",

	.owner		= THIS_MODULE,

	.dai_link	= &edb93xx_dai,

	.num_links	= 1,

};



static int edb93xx_probe(struct platform_device *pdev)

{

	struct snd_soc_card *card = &snd_soc_edb93xx;

	int ret;



	ret = ep93xx_i2s_acquire();

	if (ret)

		return ret;



	card->dev = &pdev->dev;



	ret = snd_soc_register_card(card);

	if (ret) {

		dev_err(&pdev->dev, "snd_soc_register_card() failed: %d\n",

			ret);

		ep93xx_i2s_release();

	}



	return ret;

}



static void edb93xx_remove(struct platform_device *pdev)

{

	struct snd_soc_card *card = platform_get_drvdata(pdev);



	snd_soc_unregister_card(card);

	ep93xx_i2s_release();

}



static struct platform_driver edb93xx_driver = {

	.driver		= {

		.name	= "edb93xx-audio",

	},

	.probe		= edb93xx_probe,

	.remove_new	= edb93xx_remove,

};



module_platform_driver(edb93xx_driver);



MODULE_AUTHOR("Alexander Sverdlin <subaparts@yandex.ru>");

MODULE_DESCRIPTION("ALSA SoC EDB93xx");

MODULE_LICENSE("GPL");

MODULE_ALIAS("platform:edb93xx-audio");