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>
244 lines
6.5 KiB
C
244 lines
6.5 KiB
C
/*
|
|
* ASoC driver for Stretch s6105 IP camera platform
|
|
*
|
|
* Author: Daniel Gloeckner, <dg@emlix.com>
|
|
* Copyright: (C) 2009 emlix GmbH <info@emlix.com>
|
|
*
|
|
* 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/moduleparam.h>
|
|
#include <linux/timer.h>
|
|
#include <linux/interrupt.h>
|
|
#include <linux/platform_device.h>
|
|
#include <linux/i2c.h>
|
|
#include <sound/core.h>
|
|
#include <sound/pcm.h>
|
|
#include <sound/soc.h>
|
|
#include <sound/soc-dapm.h>
|
|
|
|
#include <variant/dmac.h>
|
|
|
|
#include "../codecs/tlv320aic3x.h"
|
|
#include "s6000-pcm.h"
|
|
#include "s6000-i2s.h"
|
|
|
|
#define S6105_CAM_CODEC_CLOCK 12288000
|
|
|
|
static int s6105_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 = 0;
|
|
|
|
/* set codec DAI configuration */
|
|
ret = snd_soc_dai_set_fmt(codec_dai, SND_SOC_DAIFMT_I2S |
|
|
SND_SOC_DAIFMT_CBM_CFM);
|
|
if (ret < 0)
|
|
return ret;
|
|
|
|
/* set cpu DAI configuration */
|
|
ret = snd_soc_dai_set_fmt(cpu_dai, SND_SOC_DAIFMT_CBM_CFM |
|
|
SND_SOC_DAIFMT_NB_NF);
|
|
if (ret < 0)
|
|
return ret;
|
|
|
|
/* set the codec system clock */
|
|
ret = snd_soc_dai_set_sysclk(codec_dai, 0, S6105_CAM_CODEC_CLOCK,
|
|
SND_SOC_CLOCK_OUT);
|
|
if (ret < 0)
|
|
return ret;
|
|
|
|
return 0;
|
|
}
|
|
|
|
static struct snd_soc_ops s6105_ops = {
|
|
.hw_params = s6105_hw_params,
|
|
};
|
|
|
|
/* s6105 machine dapm widgets */
|
|
static const struct snd_soc_dapm_widget aic3x_dapm_widgets[] = {
|
|
SND_SOC_DAPM_LINE("Audio Out Differential", NULL),
|
|
SND_SOC_DAPM_LINE("Audio Out Stereo", NULL),
|
|
SND_SOC_DAPM_LINE("Audio In", NULL),
|
|
};
|
|
|
|
/* s6105 machine audio_mapnections to the codec pins */
|
|
static const struct snd_soc_dapm_route audio_map[] = {
|
|
/* Audio Out connected to HPLOUT, HPLCOM, HPROUT */
|
|
{"Audio Out Differential", NULL, "HPLOUT"},
|
|
{"Audio Out Differential", NULL, "HPLCOM"},
|
|
{"Audio Out Stereo", NULL, "HPLOUT"},
|
|
{"Audio Out Stereo", NULL, "HPROUT"},
|
|
|
|
/* Audio In connected to LINE1L, LINE1R */
|
|
{"LINE1L", NULL, "Audio In"},
|
|
{"LINE1R", NULL, "Audio In"},
|
|
};
|
|
|
|
static int output_type_info(struct snd_kcontrol *kcontrol,
|
|
struct snd_ctl_elem_info *uinfo)
|
|
{
|
|
uinfo->type = SNDRV_CTL_ELEM_TYPE_ENUMERATED;
|
|
uinfo->count = 1;
|
|
uinfo->value.enumerated.items = 2;
|
|
if (uinfo->value.enumerated.item) {
|
|
uinfo->value.enumerated.item = 1;
|
|
strcpy(uinfo->value.enumerated.name, "HPLOUT/HPROUT");
|
|
} else {
|
|
strcpy(uinfo->value.enumerated.name, "HPLOUT/HPLCOM");
|
|
}
|
|
return 0;
|
|
}
|
|
|
|
static int output_type_get(struct snd_kcontrol *kcontrol,
|
|
struct snd_ctl_elem_value *ucontrol)
|
|
{
|
|
ucontrol->value.enumerated.item[0] = kcontrol->private_value;
|
|
return 0;
|
|
}
|
|
|
|
static int output_type_put(struct snd_kcontrol *kcontrol,
|
|
struct snd_ctl_elem_value *ucontrol)
|
|
{
|
|
struct snd_soc_codec *codec = kcontrol->private_data;
|
|
unsigned int val = (ucontrol->value.enumerated.item[0] != 0);
|
|
char *differential = "Audio Out Differential";
|
|
char *stereo = "Audio Out Stereo";
|
|
|
|
if (kcontrol->private_value == val)
|
|
return 0;
|
|
kcontrol->private_value = val;
|
|
snd_soc_dapm_disable_pin(codec, val ? differential : stereo);
|
|
snd_soc_dapm_sync(codec);
|
|
snd_soc_dapm_enable_pin(codec, val ? stereo : differential);
|
|
snd_soc_dapm_sync(codec);
|
|
|
|
return 1;
|
|
}
|
|
|
|
static const struct snd_kcontrol_new audio_out_mux = {
|
|
.iface = SNDRV_CTL_ELEM_IFACE_MIXER,
|
|
.name = "Master Output Mux",
|
|
.index = 0,
|
|
.access = SNDRV_CTL_ELEM_ACCESS_READWRITE,
|
|
.info = output_type_info,
|
|
.get = output_type_get,
|
|
.put = output_type_put,
|
|
.private_value = 1 /* default to stereo */
|
|
};
|
|
|
|
/* Logic for a aic3x as connected on the s6105 ip camera ref design */
|
|
static int s6105_aic3x_init(struct snd_soc_pcm_runtime *rtd)
|
|
{
|
|
struct snd_soc_codec *codec = rtd->codec;
|
|
|
|
/* Add s6105 specific widgets */
|
|
snd_soc_dapm_new_controls(codec, aic3x_dapm_widgets,
|
|
ARRAY_SIZE(aic3x_dapm_widgets));
|
|
|
|
/* Set up s6105 specific audio path audio_map */
|
|
snd_soc_dapm_add_routes(codec, audio_map, ARRAY_SIZE(audio_map));
|
|
|
|
/* not present */
|
|
snd_soc_dapm_nc_pin(codec, "MONO_LOUT");
|
|
snd_soc_dapm_nc_pin(codec, "LINE2L");
|
|
snd_soc_dapm_nc_pin(codec, "LINE2R");
|
|
|
|
/* not connected */
|
|
snd_soc_dapm_nc_pin(codec, "MIC3L"); /* LINE2L on this chip */
|
|
snd_soc_dapm_nc_pin(codec, "MIC3R"); /* LINE2R on this chip */
|
|
snd_soc_dapm_nc_pin(codec, "LLOUT");
|
|
snd_soc_dapm_nc_pin(codec, "RLOUT");
|
|
snd_soc_dapm_nc_pin(codec, "HPRCOM");
|
|
|
|
/* always connected */
|
|
snd_soc_dapm_enable_pin(codec, "Audio In");
|
|
|
|
/* must correspond to audio_out_mux.private_value initializer */
|
|
snd_soc_dapm_disable_pin(codec, "Audio Out Differential");
|
|
snd_soc_dapm_sync(codec);
|
|
snd_soc_dapm_enable_pin(codec, "Audio Out Stereo");
|
|
|
|
snd_soc_dapm_sync(codec);
|
|
|
|
snd_ctl_add(codec->snd_card, snd_ctl_new1(&audio_out_mux, codec));
|
|
|
|
return 0;
|
|
}
|
|
|
|
/* s6105 digital audio interface glue - connects codec <--> CPU */
|
|
static struct snd_soc_dai_link s6105_dai = {
|
|
.name = "TLV320AIC31",
|
|
.stream_name = "AIC31",
|
|
.cpu_dai_name = "s6000-i2s",
|
|
.codec_dai_name = "tlv320aic3x-hifi",
|
|
.platform_name = "s6000-pcm-audio",
|
|
.codec_name = "tlv320aic3x-codec.0-001a",
|
|
.init = s6105_aic3x_init,
|
|
.ops = &s6105_ops,
|
|
};
|
|
|
|
/* s6105 audio machine driver */
|
|
static struct snd_soc_card snd_soc_card_s6105 = {
|
|
.name = "Stretch IP Camera",
|
|
.dai_link = &s6105_dai,
|
|
.num_links = 1,
|
|
};
|
|
|
|
static struct s6000_snd_platform_data __initdata s6105_snd_data = {
|
|
.wide = 0,
|
|
.channel_in = 0,
|
|
.channel_out = 1,
|
|
.lines_in = 1,
|
|
.lines_out = 1,
|
|
.same_rate = 1,
|
|
};
|
|
|
|
static struct platform_device *s6105_snd_device;
|
|
|
|
/* temporary i2c device creation until this can be moved into the machine
|
|
* support file.
|
|
*/
|
|
static struct i2c_board_info i2c_device[] = {
|
|
{ I2C_BOARD_INFO("tlv320aic33", 0x18), }
|
|
};
|
|
|
|
static int __init s6105_init(void)
|
|
{
|
|
int ret;
|
|
|
|
i2c_register_board_info(0, i2c_device, ARRAY_SIZE(i2c_device));
|
|
|
|
s6105_snd_device = platform_device_alloc("soc-audio", -1);
|
|
if (!s6105_snd_device)
|
|
return -ENOMEM;
|
|
|
|
platform_set_drvdata(s6105_snd_device, &snd_soc_card_s6105);
|
|
platform_device_add_data(s6105_snd_device, &s6105_snd_data,
|
|
sizeof(s6105_snd_data));
|
|
|
|
ret = platform_device_add(s6105_snd_device);
|
|
if (ret)
|
|
platform_device_put(s6105_snd_device);
|
|
|
|
return ret;
|
|
}
|
|
|
|
static void __exit s6105_exit(void)
|
|
{
|
|
platform_device_unregister(s6105_snd_device);
|
|
}
|
|
|
|
module_init(s6105_init);
|
|
module_exit(s6105_exit);
|
|
|
|
MODULE_AUTHOR("Daniel Gloeckner");
|
|
MODULE_DESCRIPTION("Stretch s6105 IP camera ASoC driver");
|
|
MODULE_LICENSE("GPL");
|