* [PATCH 1/2] ASoC: Use dai_fmt in afeb9260 machine driver @ 2012-01-29 8:52 Axel Lin 2012-01-29 8:52 ` [PATCH 2/2] ASoC: Convert afeb9260 to table based DAPM init Axel Lin 2012-02-01 21:53 ` [PATCH 1/2] ASoC: Use dai_fmt in afeb9260 machine driver Mark Brown 0 siblings, 2 replies; 3+ messages in thread From: Axel Lin @ 2012-01-29 8:52 UTC (permalink / raw) To: alsa-devel; +Cc: Sergey Lapin, Brown, Liam Girdwood, Mark Signed-off-by: Axel Lin <axel.lin@gmail.com> --- sound/soc/atmel/snd-soc-afeb9260.c | 23 ++--------------------- 1 files changed, 2 insertions(+), 21 deletions(-) diff --git a/sound/soc/atmel/snd-soc-afeb9260.c b/sound/soc/atmel/snd-soc-afeb9260.c index 4ca667d..cb0130c 100644 --- a/sound/soc/atmel/snd-soc-afeb9260.c +++ b/sound/soc/atmel/snd-soc-afeb9260.c @@ -46,29 +46,8 @@ static int afeb9260_hw_params(struct snd_pcm_substream *substream, { 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 err; - /* Set codec DAI configuration */ - err = snd_soc_dai_set_fmt(codec_dai, - SND_SOC_DAIFMT_I2S| - SND_SOC_DAIFMT_NB_IF | - SND_SOC_DAIFMT_CBM_CFM); - if (err < 0) { - printk(KERN_ERR "can't set codec DAI configuration\n"); - return err; - } - - /* Set cpu DAI configuration */ - err = snd_soc_dai_set_fmt(cpu_dai, - SND_SOC_DAIFMT_I2S | - SND_SOC_DAIFMT_NB_IF | - SND_SOC_DAIFMT_CBM_CFM); - if (err < 0) { - printk(KERN_ERR "can't set cpu DAI configuration\n"); - return err; - } - /* Set the codec system clock for DAC and ADC */ err = snd_soc_dai_set_sysclk(codec_dai, 0, CODEC_CLOCK, SND_SOC_CLOCK_IN); @@ -129,6 +108,8 @@ static struct snd_soc_dai_link afeb9260_dai = { .platform_name = "atmel_pcm-audio", .codec_name = "tlv320aic23-codec.0-001a", .init = afeb9260_tlv320aic23_init, + .dai_fmt = SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_NB_IF | + SND_SOC_DAIFMT_CBM_CFM, .ops = &afeb9260_ops, }; -- 1.7.5.4 ^ permalink raw reply related [flat|nested] 3+ messages in thread
* [PATCH 2/2] ASoC: Convert afeb9260 to table based DAPM init 2012-01-29 8:52 [PATCH 1/2] ASoC: Use dai_fmt in afeb9260 machine driver Axel Lin @ 2012-01-29 8:52 ` Axel Lin 2012-02-01 21:53 ` [PATCH 1/2] ASoC: Use dai_fmt in afeb9260 machine driver Mark Brown 1 sibling, 0 replies; 3+ messages in thread From: Axel Lin @ 2012-01-29 8:52 UTC (permalink / raw) To: alsa-devel; +Cc: Sergey Lapin, Brown, Liam Girdwood, Mark Signed-off-by: Axel Lin <axel.lin@gmail.com> --- sound/soc/atmel/snd-soc-afeb9260.c | 14 ++++++-------- 1 files changed, 6 insertions(+), 8 deletions(-) diff --git a/sound/soc/atmel/snd-soc-afeb9260.c b/sound/soc/atmel/snd-soc-afeb9260.c index cb0130c..f65f08b 100644 --- a/sound/soc/atmel/snd-soc-afeb9260.c +++ b/sound/soc/atmel/snd-soc-afeb9260.c @@ -70,7 +70,7 @@ static const struct snd_soc_dapm_widget tlv320aic23_dapm_widgets[] = { SND_SOC_DAPM_MIC("Mic Jack", NULL), }; -static const struct snd_soc_dapm_route audio_map[] = { +static const struct snd_soc_dapm_route afeb9260_audio_map[] = { {"Headphone Jack", NULL, "LHPOUT"}, {"Headphone Jack", NULL, "RHPOUT"}, @@ -85,13 +85,6 @@ static int afeb9260_tlv320aic23_init(struct snd_soc_pcm_runtime *rtd) struct snd_soc_codec *codec = rtd->codec; struct snd_soc_dapm_context *dapm = &codec->dapm; - /* Add afeb9260 specific widgets */ - snd_soc_dapm_new_controls(dapm, tlv320aic23_dapm_widgets, - ARRAY_SIZE(tlv320aic23_dapm_widgets)); - - /* Set up afeb9260 specific audio path audio_map */ - snd_soc_dapm_add_routes(dapm, audio_map, ARRAY_SIZE(audio_map)); - snd_soc_dapm_enable_pin(dapm, "Headphone Jack"); snd_soc_dapm_enable_pin(dapm, "Line In"); snd_soc_dapm_enable_pin(dapm, "Mic Jack"); @@ -119,6 +112,11 @@ static struct snd_soc_card snd_soc_machine_afeb9260 = { .owner = THIS_MODULE, .dai_link = &afeb9260_dai, .num_links = 1, + + .dapm_widgets = tlv320aic23_dapm_widgets, + .num_dapm_widgets = ARRAY_SIZE(tlv320aic23_dapm_widgets), + .dapm_routes = afeb9260_audio_map, + .num_dapm_routes = ARRAY_SIZE(afeb9260_audio_map), }; static struct platform_device *afeb9260_snd_device; -- 1.7.5.4 ^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH 1/2] ASoC: Use dai_fmt in afeb9260 machine driver 2012-01-29 8:52 [PATCH 1/2] ASoC: Use dai_fmt in afeb9260 machine driver Axel Lin 2012-01-29 8:52 ` [PATCH 2/2] ASoC: Convert afeb9260 to table based DAPM init Axel Lin @ 2012-02-01 21:53 ` Mark Brown 1 sibling, 0 replies; 3+ messages in thread From: Mark Brown @ 2012-02-01 21:53 UTC (permalink / raw) To: Axel Lin; +Cc: alsa-devel, Sergey Lapin, Liam Girdwood [-- Attachment #1.1: Type: text/plain, Size: 128 bytes --] On Sun, Jan 29, 2012 at 04:52:02PM +0800, Axel Lin wrote: > Signed-off-by: Axel Lin <axel.lin@gmail.com> Applied both, thanks. [-- Attachment #1.2: Digital signature --] [-- Type: application/pgp-signature, Size: 836 bytes --] [-- Attachment #2: Type: text/plain, Size: 0 bytes --] ^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2012-02-01 21:53 UTC | newest] Thread overview: 3+ messages (download: mbox.gz follow: Atom feed -- links below jump to the message on this page -- 2012-01-29 8:52 [PATCH 1/2] ASoC: Use dai_fmt in afeb9260 machine driver Axel Lin 2012-01-29 8:52 ` [PATCH 2/2] ASoC: Convert afeb9260 to table based DAPM init Axel Lin 2012-02-01 21:53 ` [PATCH 1/2] ASoC: Use dai_fmt in afeb9260 machine driver Mark Brown
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox; as well as URLs for NNTP newsgroup(s).