forked from luck/tmp_suning_uos_patched
f0fba2ad1b
This patch extends the ASoC API to allow sound cards to have more than one CODEC and more than one platform DMA controller. This is achieved by dividing some current ASoC structures that contain both driver data and device data into structures that only either contain device data or driver data. i.e. struct snd_soc_codec ---> struct snd_soc_codec (device data) +-> struct snd_soc_codec_driver (driver data) struct snd_soc_platform ---> struct snd_soc_platform (device data) +-> struct snd_soc_platform_driver (driver data) struct snd_soc_dai ---> struct snd_soc_dai (device data) +-> struct snd_soc_dai_driver (driver data) struct snd_soc_device ---> deleted This now allows ASoC to be more tightly aligned with the Linux driver model and also means that every ASoC codec, platform and (platform) DAI is a kernel device. ASoC component private data is now stored as device private data. The ASoC sound card struct snd_soc_card has also been updated to store lists of it's components rather than a pointer to a codec and platform. The PCM runtime struct soc_pcm_runtime now has pointers to all its components. This patch adds DAPM support for ASoC multi-component and removes struct snd_soc_socdev from DAPM core. All DAPM calls are now made on a card, codec or runtime PCM level basis rather than using snd_soc_socdev. Other notable multi-component changes:- * Stream operations now de-reference less structures. * close_delayed work() now runs on a DAI basis rather than looping all DAIs in a card. * PM suspend()/resume() operations can now handle N CODECs and Platforms per sound card. * Added soc_bind_dai_link() to bind the component devices to the sound card. * Added soc_dai_link_probe() and soc_dai_link_remove() to probe and remove DAI link components. * sysfs entries can now be registered per component per card. * snd_soc_new_pcms() functionailty rolled into dai_link_probe(). * snd_soc_register_codec() now does all the codec list and mutex init. This patch changes the probe() and remove() of the CODEC drivers as follows:- o Make CODEC driver a platform driver o Moved all struct snd_soc_codec list, mutex, etc initialiasation to core. o Removed all static codec pointers (drivers now support > 1 codec dev) o snd_soc_register_pcms() now done by core. o snd_soc_register_dai() folded into snd_soc_register_codec(). CS4270 portions: Acked-by: Timur Tabi <timur@freescale.com> Some TLV320aic23 and Cirrus platform fixes. Signed-off-by: Ryan Mallon <ryan@bluewatersys.com> TI CODEC and OMAP fixes Signed-off-by: Peter Ujfalusi <peter.ujfalusi@nokia.com> Signed-off-by: Janusz Krzysztofik <jkrzyszt@tis.icnet.pl> Signed-off-by: Jarkko Nikula <jhnikula@gmail.com> Samsung platform and misc fixes :- Signed-off-by: Chanwoo Choi <cw00.choi@samsung.com> Signed-off-by: Joonyoung Shim <jy0922.shim@samsung.com> Signed-off-by: Kyungmin Park <kyungmin.park@samsung.com> Reviewed-by: Jassi Brar <jassi.brar@samsung.com> Signed-off-by: Seungwhan Youn <sw.youn@samsung.com> MPC8610 and PPC fixes. Signed-off-by: Timur Tabi <timur@freescale.com> i.MX fixes and some core fixes. Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de> J4740 platform fixes:- Signed-off-by: Lars-Peter Clausen <lars@metafoo.de> CC: Tony Lindgren <tony@atomide.com> CC: Nicolas Ferre <nicolas.ferre@atmel.com> CC: Kevin Hilman <khilman@deeprootsystems.com> CC: Sascha Hauer <s.hauer@pengutronix.de> CC: Atsushi Nemoto <anemo@mba.ocn.ne.jp> CC: Kuninori Morimoto <morimoto.kuninori@renesas.com> CC: Daniel Gloeckner <dg@emlix.com> CC: Manuel Lauss <mano@roarinelk.homelinux.net> CC: Mike Frysinger <vapier.adi@gmail.com> CC: Arnaud Patard <apatard@mandriva.com> CC: Wan ZongShun <mcuos.com@gmail.com> Acked-by: Mark Brown <broonie@opensource.wolfsonmicro.com> Signed-off-by: Liam Girdwood <lrg@slimlogic.co.uk>
198 lines
5.0 KiB
C
198 lines
5.0 KiB
C
/*
|
|
* am3517evm.c -- ALSA SoC support for OMAP3517 / AM3517 EVM
|
|
*
|
|
* Author: Anuj Aggarwal <anuj.aggarwal@ti.com>
|
|
*
|
|
* Based on sound/soc/omap/beagle.c by Steve Sakoman
|
|
*
|
|
* Copyright (C) 2009 Texas Instruments Incorporated
|
|
*
|
|
* 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 version 2.
|
|
*
|
|
* This program is distributed "as is" WITHOUT ANY WARRANTY of any kind,
|
|
* whether express or implied; without even the implied warranty of
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
|
* General Public License for more details.
|
|
*/
|
|
|
|
#include <linux/clk.h>
|
|
#include <linux/platform_device.h>
|
|
#include <sound/core.h>
|
|
#include <sound/pcm.h>
|
|
#include <sound/soc.h>
|
|
#include <sound/soc-dapm.h>
|
|
|
|
#include <asm/mach-types.h>
|
|
#include <mach/hardware.h>
|
|
#include <mach/gpio.h>
|
|
#include <plat/mcbsp.h>
|
|
|
|
#include "omap-mcbsp.h"
|
|
#include "omap-pcm.h"
|
|
|
|
#include "../codecs/tlv320aic23.h"
|
|
|
|
#define CODEC_CLOCK 12000000
|
|
|
|
static int am3517evm_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;
|
|
struct snd_soc_dai *cpu_dai = rtd->cpu_dai;
|
|
int ret;
|
|
|
|
/* Set codec DAI configuration */
|
|
ret = snd_soc_dai_set_fmt(codec_dai,
|
|
SND_SOC_DAIFMT_DSP_B |
|
|
SND_SOC_DAIFMT_NB_NF |
|
|
SND_SOC_DAIFMT_CBM_CFM);
|
|
if (ret < 0) {
|
|
printk(KERN_ERR "can't set codec DAI configuration\n");
|
|
return ret;
|
|
}
|
|
|
|
/* Set cpu DAI configuration */
|
|
ret = snd_soc_dai_set_fmt(cpu_dai,
|
|
SND_SOC_DAIFMT_DSP_B |
|
|
SND_SOC_DAIFMT_NB_NF |
|
|
SND_SOC_DAIFMT_CBM_CFM);
|
|
if (ret < 0) {
|
|
printk(KERN_ERR "can't set cpu DAI configuration\n");
|
|
return ret;
|
|
}
|
|
|
|
/* Set the codec system clock for DAC and ADC */
|
|
ret = snd_soc_dai_set_sysclk(codec_dai, 0,
|
|
CODEC_CLOCK, SND_SOC_CLOCK_IN);
|
|
if (ret < 0) {
|
|
printk(KERN_ERR "can't set codec system clock\n");
|
|
return ret;
|
|
}
|
|
|
|
ret = snd_soc_dai_set_sysclk(cpu_dai, OMAP_MCBSP_CLKR_SRC_CLKX, 0,
|
|
SND_SOC_CLOCK_IN);
|
|
if (ret < 0) {
|
|
printk(KERN_ERR "can't set CPU system clock OMAP_MCBSP_CLKR_SRC_CLKX\n");
|
|
return ret;
|
|
}
|
|
|
|
snd_soc_dai_set_sysclk(cpu_dai, OMAP_MCBSP_FSR_SRC_FSX, 0,
|
|
SND_SOC_CLOCK_IN);
|
|
if (ret < 0) {
|
|
printk(KERN_ERR "can't set CPU system clock OMAP_MCBSP_FSR_SRC_FSX\n");
|
|
return ret;
|
|
}
|
|
|
|
return 0;
|
|
}
|
|
|
|
static struct snd_soc_ops am3517evm_ops = {
|
|
.hw_params = am3517evm_hw_params,
|
|
};
|
|
|
|
/* am3517evm machine dapm widgets */
|
|
static const struct snd_soc_dapm_widget tlv320aic23_dapm_widgets[] = {
|
|
SND_SOC_DAPM_HP("Line Out", NULL),
|
|
SND_SOC_DAPM_LINE("Line In", NULL),
|
|
SND_SOC_DAPM_MIC("Mic In", NULL),
|
|
};
|
|
|
|
static const struct snd_soc_dapm_route audio_map[] = {
|
|
/* Line Out connected to LLOUT, RLOUT */
|
|
{"Line Out", NULL, "LOUT"},
|
|
{"Line Out", NULL, "ROUT"},
|
|
|
|
{"LLINEIN", NULL, "Line In"},
|
|
{"RLINEIN", NULL, "Line In"},
|
|
|
|
{"MICIN", NULL, "Mic In"},
|
|
};
|
|
|
|
static int am3517evm_aic23_init(struct snd_soc_pcm_runtime *rtd)
|
|
{
|
|
struct snd_soc_codec *codec = rtd->codec;
|
|
|
|
/* Add am3517-evm specific widgets */
|
|
snd_soc_dapm_new_controls(codec, tlv320aic23_dapm_widgets,
|
|
ARRAY_SIZE(tlv320aic23_dapm_widgets));
|
|
|
|
/* Set up davinci-evm specific audio path audio_map */
|
|
snd_soc_dapm_add_routes(codec, audio_map, ARRAY_SIZE(audio_map));
|
|
|
|
/* always connected */
|
|
snd_soc_dapm_enable_pin(codec, "Line Out");
|
|
snd_soc_dapm_enable_pin(codec, "Line In");
|
|
snd_soc_dapm_enable_pin(codec, "Mic In");
|
|
|
|
snd_soc_dapm_sync(codec);
|
|
|
|
return 0;
|
|
}
|
|
|
|
/* Digital audio interface glue - connects codec <--> CPU */
|
|
static struct snd_soc_dai_link am3517evm_dai = {
|
|
.name = "TLV320AIC23",
|
|
.stream_name = "AIC23",
|
|
.cpu_dai_name ="omap-mcbsp-dai.0",
|
|
.codec_dai_name = "tlv320aic23-hifi",
|
|
.platform_name = "omap-pcm-audio",
|
|
.codec_name = "tlv320aic23-codec",
|
|
.init = am3517evm_aic23_init,
|
|
.ops = &am3517evm_ops,
|
|
};
|
|
|
|
/* Audio machine driver */
|
|
static struct snd_soc_card snd_soc_am3517evm = {
|
|
.name = "am3517evm",
|
|
.dai_link = &am3517evm_dai,
|
|
.num_links = 1,
|
|
};
|
|
|
|
static struct platform_device *am3517evm_snd_device;
|
|
|
|
static int __init am3517evm_soc_init(void)
|
|
{
|
|
int ret;
|
|
|
|
if (!machine_is_omap3517evm()) {
|
|
pr_err("Not OMAP3517 / AM3517 EVM!\n");
|
|
return -ENODEV;
|
|
}
|
|
pr_info("OMAP3517 / AM3517 EVM SoC init\n");
|
|
|
|
am3517evm_snd_device = platform_device_alloc("soc-audio", -1);
|
|
if (!am3517evm_snd_device) {
|
|
printk(KERN_ERR "Platform device allocation failed\n");
|
|
return -ENOMEM;
|
|
}
|
|
|
|
platform_set_drvdata(am3517evm_snd_device, &snd_soc_am3517evm);
|
|
|
|
ret = platform_device_add(am3517evm_snd_device);
|
|
if (ret)
|
|
goto err1;
|
|
|
|
return 0;
|
|
|
|
err1:
|
|
printk(KERN_ERR "Unable to add platform device\n");
|
|
platform_device_put(am3517evm_snd_device);
|
|
|
|
return ret;
|
|
}
|
|
|
|
static void __exit am3517evm_soc_exit(void)
|
|
{
|
|
platform_device_unregister(am3517evm_snd_device);
|
|
}
|
|
|
|
module_init(am3517evm_soc_init);
|
|
module_exit(am3517evm_soc_exit);
|
|
|
|
MODULE_AUTHOR("Anuj Aggarwal <anuj.aggarwal@ti.com>");
|
|
MODULE_DESCRIPTION("ALSA SoC OMAP3517 / AM3517 EVM");
|
|
MODULE_LICENSE("GPL v2");
|