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>
134 lines
3.5 KiB
C
134 lines
3.5 KiB
C
/* sound/soc/s3c24xx/s3c24xx_simtec_tlv320aic23.c
|
|
*
|
|
* Copyright 2009 Simtec Electronics
|
|
*
|
|
* This program is free software; you can redistribute it and/or modify
|
|
* it under the terms of the GNU General Public License version 2 as
|
|
* published by the Free Software Foundation.
|
|
*/
|
|
|
|
#include <linux/module.h>
|
|
#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 <plat/audio-simtec.h>
|
|
|
|
#include "s3c-dma.h"
|
|
#include "s3c24xx-i2s.h"
|
|
#include "s3c24xx_simtec.h"
|
|
|
|
#include "../codecs/tlv320aic23.h"
|
|
|
|
/* supported machines:
|
|
*
|
|
* Machine Connections AMP
|
|
* ------- ----------- ---
|
|
* BAST MIC, HPOUT, LOUT, LIN TPA2001D1 (HPOUTL,R) (gain hardwired)
|
|
* VR1000 HPOUT, LIN None
|
|
* VR2000 LIN, LOUT, MIC, HP LM4871 (HPOUTL,R)
|
|
* DePicture LIN, LOUT, MIC, HP LM4871 (HPOUTL,R)
|
|
* Anubis LIN, LOUT, MIC, HP TPA2001D1 (HPOUTL,R)
|
|
*/
|
|
|
|
static const struct snd_soc_dapm_widget dapm_widgets[] = {
|
|
SND_SOC_DAPM_HP("Headphone Jack", NULL),
|
|
SND_SOC_DAPM_LINE("Line In", NULL),
|
|
SND_SOC_DAPM_LINE("Line Out", NULL),
|
|
SND_SOC_DAPM_MIC("Mic Jack", NULL),
|
|
};
|
|
|
|
static const struct snd_soc_dapm_route base_map[] = {
|
|
{ "Headphone Jack", NULL, "LHPOUT"},
|
|
{ "Headphone Jack", NULL, "RHPOUT"},
|
|
|
|
{ "Line Out", NULL, "LOUT" },
|
|
{ "Line Out", NULL, "ROUT" },
|
|
|
|
{ "LLINEIN", NULL, "Line In"},
|
|
{ "RLINEIN", NULL, "Line In"},
|
|
|
|
{ "MICIN", NULL, "Mic Jack"},
|
|
};
|
|
|
|
/**
|
|
* simtec_tlv320aic23_init - initialise and add controls
|
|
* @codec; The codec instance to attach to.
|
|
*
|
|
* Attach our controls and configure the necessary codec
|
|
* mappings for our sound card instance.
|
|
*/
|
|
static int simtec_tlv320aic23_init(struct snd_soc_pcm_runtime *rtd)
|
|
{
|
|
struct snd_soc_codec *codec = rtd->codec;
|
|
|
|
snd_soc_dapm_new_controls(codec, dapm_widgets,
|
|
ARRAY_SIZE(dapm_widgets));
|
|
|
|
snd_soc_dapm_add_routes(codec, base_map, ARRAY_SIZE(base_map));
|
|
|
|
snd_soc_dapm_enable_pin(codec, "Headphone Jack");
|
|
snd_soc_dapm_enable_pin(codec, "Line In");
|
|
snd_soc_dapm_enable_pin(codec, "Line Out");
|
|
snd_soc_dapm_enable_pin(codec, "Mic Jack");
|
|
|
|
simtec_audio_init(rtd);
|
|
snd_soc_dapm_sync(codec);
|
|
|
|
return 0;
|
|
}
|
|
|
|
static struct snd_soc_dai_link simtec_dai_aic23 = {
|
|
.name = "tlv320aic23",
|
|
.stream_name = "TLV320AIC23",
|
|
.codec_name = "tlv320aic3x-codec.0-0x1a",
|
|
.cpu_dai_name = "s3c24xx-i2s",
|
|
.codec_dai_name = "tlv320aic3x-hifi",
|
|
.platform_name = "s3c24xx-pcm-audio",
|
|
.init = simtec_tlv320aic23_init,
|
|
};
|
|
|
|
/* simtec audio machine driver */
|
|
static struct snd_soc_card snd_soc_machine_simtec_aic23 = {
|
|
.name = "Simtec",
|
|
.dai_link = &simtec_dai_aic23,
|
|
.num_links = 1,
|
|
};
|
|
|
|
static int __devinit simtec_audio_tlv320aic23_probe(struct platform_device *pd)
|
|
{
|
|
return simtec_audio_core_probe(pd, &snd_soc_machine_simtec_aic23);
|
|
}
|
|
|
|
static struct platform_driver simtec_audio_tlv320aic23_platdrv = {
|
|
.driver = {
|
|
.owner = THIS_MODULE,
|
|
.name = "s3c24xx-simtec-tlv320aic23",
|
|
.pm = simtec_audio_pm,
|
|
},
|
|
.probe = simtec_audio_tlv320aic23_probe,
|
|
.remove = __devexit_p(simtec_audio_remove),
|
|
};
|
|
|
|
MODULE_ALIAS("platform:s3c24xx-simtec-tlv320aic23");
|
|
|
|
static int __init simtec_tlv320aic23_modinit(void)
|
|
{
|
|
return platform_driver_register(&simtec_audio_tlv320aic23_platdrv);
|
|
}
|
|
|
|
static void __exit simtec_tlv320aic23_modexit(void)
|
|
{
|
|
platform_driver_unregister(&simtec_audio_tlv320aic23_platdrv);
|
|
}
|
|
|
|
module_init(simtec_tlv320aic23_modinit);
|
|
module_exit(simtec_tlv320aic23_modexit);
|
|
|
|
MODULE_AUTHOR("Ben Dooks <ben@simtec.co.uk>");
|
|
MODULE_DESCRIPTION("ALSA SoC Simtec Audio support");
|
|
MODULE_LICENSE("GPL");
|