* [PATCH 1/2] ASoC: arizona: Correct AEC loopback enable @ 2013-06-05 13:51 Charles Keepax 2013-06-05 13:51 ` [PATCH 2/2] ASoC: arizona: Hookup SYSCLK to inputs and noise generators Charles Keepax 2013-06-05 14:46 ` [PATCH 1/2] ASoC: arizona: Correct AEC loopback enable Mark Brown 0 siblings, 2 replies; 4+ messages in thread From: Charles Keepax @ 2013-06-05 13:51 UTC (permalink / raw) To: broonie; +Cc: alsa-devel, tiwai, patches, lgirdwood, Charles Keepax Signed-off-by: Charles Keepax <ckeepax@opensource.wolfsonmicro.com> --- sound/soc/codecs/wm5102.c | 3 ++- sound/soc/codecs/wm5110.c | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/sound/soc/codecs/wm5102.c b/sound/soc/codecs/wm5102.c index e895d39..100fdad 100644 --- a/sound/soc/codecs/wm5102.c +++ b/sound/soc/codecs/wm5102.c @@ -1120,7 +1120,8 @@ SND_SOC_DAPM_AIF_IN("AIF3RX2", NULL, 0, ARIZONA_DSP_WIDGETS(DSP1, "DSP1"), SND_SOC_DAPM_VALUE_MUX("AEC Loopback", ARIZONA_DAC_AEC_CONTROL_1, - ARIZONA_AEC_LOOPBACK_ENA, 0, &wm5102_aec_loopback_mux), + ARIZONA_AEC_LOOPBACK_ENA_SHIFT, 0, + &wm5102_aec_loopback_mux), SND_SOC_DAPM_PGA_E("OUT1L", SND_SOC_NOPM, ARIZONA_OUT1L_ENA_SHIFT, 0, NULL, 0, arizona_hp_ev, diff --git a/sound/soc/codecs/wm5110.c b/sound/soc/codecs/wm5110.c index ba38f06..88ad7db 100644 --- a/sound/soc/codecs/wm5110.c +++ b/sound/soc/codecs/wm5110.c @@ -503,7 +503,8 @@ SND_SOC_DAPM_PGA("ASRC2R", ARIZONA_ASRC_ENABLE, ARIZONA_ASRC2R_ENA_SHIFT, 0, NULL, 0), SND_SOC_DAPM_VALUE_MUX("AEC Loopback", ARIZONA_DAC_AEC_CONTROL_1, - ARIZONA_AEC_LOOPBACK_ENA, 0, &wm5110_aec_loopback_mux), + ARIZONA_AEC_LOOPBACK_ENA_SHIFT, 0, + &wm5110_aec_loopback_mux), SND_SOC_DAPM_AIF_OUT("AIF1TX1", NULL, 0, ARIZONA_AIF1_TX_ENABLES, ARIZONA_AIF1TX1_ENA_SHIFT, 0), -- 1.7.2.5 ^ permalink raw reply related [flat|nested] 4+ messages in thread
* [PATCH 2/2] ASoC: arizona: Hookup SYSCLK to inputs and noise generators 2013-06-05 13:51 [PATCH 1/2] ASoC: arizona: Correct AEC loopback enable Charles Keepax @ 2013-06-05 13:51 ` Charles Keepax 2013-06-05 14:37 ` Mark Brown 2013-06-05 14:46 ` [PATCH 1/2] ASoC: arizona: Correct AEC loopback enable Mark Brown 1 sibling, 1 reply; 4+ messages in thread From: Charles Keepax @ 2013-06-05 13:51 UTC (permalink / raw) To: broonie; +Cc: alsa-devel, tiwai, patches, lgirdwood, Charles Keepax All sources and sinks should enable SYSCLK. Signed-off-by: Charles Keepax <ckeepax@opensource.wolfsonmicro.com> --- sound/soc/codecs/wm5102.c | 11 +++++++++++ sound/soc/codecs/wm5110.c | 13 +++++++++++++ 2 files changed, 24 insertions(+), 0 deletions(-) diff --git a/sound/soc/codecs/wm5102.c b/sound/soc/codecs/wm5102.c index 100fdad..82dd0c6 100644 --- a/sound/soc/codecs/wm5102.c +++ b/sound/soc/codecs/wm5102.c @@ -1304,10 +1304,21 @@ static const struct snd_soc_dapm_route wm5102_dapm_routes[] = { { "OUT5L", NULL, "SYSCLK" }, { "OUT5R", NULL, "SYSCLK" }, + { "IN1L", NULL, "SYSCLK" }, + { "IN1R", NULL, "SYSCLK" }, + { "IN2L", NULL, "SYSCLK" }, + { "IN2R", NULL, "SYSCLK" }, + { "IN3L", NULL, "SYSCLK" }, + { "IN3R", NULL, "SYSCLK" }, + { "MICBIAS1", NULL, "MICVDD" }, { "MICBIAS2", NULL, "MICVDD" }, { "MICBIAS3", NULL, "MICVDD" }, + { "Noise Generator", NULL, "SYSCLK" }, + { "Tone Generator 1", NULL, "SYSCLK" }, + { "Tone Generator 2", NULL, "SYSCLK" }, + { "Noise Generator", NULL, "NOISE" }, { "Tone Generator 1", NULL, "TONE" }, { "Tone Generator 2", NULL, "TONE" }, diff --git a/sound/soc/codecs/wm5110.c b/sound/soc/codecs/wm5110.c index 88ad7db..be7216c 100644 --- a/sound/soc/codecs/wm5110.c +++ b/sound/soc/codecs/wm5110.c @@ -736,10 +736,23 @@ static const struct snd_soc_dapm_route wm5110_dapm_routes[] = { { "OUT6L", NULL, "SYSCLK" }, { "OUT6R", NULL, "SYSCLK" }, + { "IN1L", NULL, "SYSCLK" }, + { "IN1R", NULL, "SYSCLK" }, + { "IN2L", NULL, "SYSCLK" }, + { "IN2R", NULL, "SYSCLK" }, + { "IN3L", NULL, "SYSCLK" }, + { "IN3R", NULL, "SYSCLK" }, + { "IN4L", NULL, "SYSCLK" }, + { "IN4R", NULL, "SYSCLK" }, + { "MICBIAS1", NULL, "MICVDD" }, { "MICBIAS2", NULL, "MICVDD" }, { "MICBIAS3", NULL, "MICVDD" }, + { "Noise Generator", NULL, "SYSCLK" }, + { "Tone Generator 1", NULL, "SYSCLK" }, + { "Tone Generator 2", NULL, "SYSCLK" }, + { "Noise Generator", NULL, "NOISE" }, { "Tone Generator 1", NULL, "TONE" }, { "Tone Generator 2", NULL, "TONE" }, -- 1.7.2.5 ^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: [PATCH 2/2] ASoC: arizona: Hookup SYSCLK to inputs and noise generators 2013-06-05 13:51 ` [PATCH 2/2] ASoC: arizona: Hookup SYSCLK to inputs and noise generators Charles Keepax @ 2013-06-05 14:37 ` Mark Brown 0 siblings, 0 replies; 4+ messages in thread From: Mark Brown @ 2013-06-05 14:37 UTC (permalink / raw) To: Charles Keepax; +Cc: tiwai, alsa-devel, patches, lgirdwood [-- Attachment #1.1: Type: text/plain, Size: 252 bytes --] On Wed, Jun 05, 2013 at 02:51:31PM +0100, Charles Keepax wrote: > All sources and sinks should enable SYSCLK. Well, the theory here was that you only really need to bother with the sinks as the sources can't do anything unless connected to an output. [-- 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] 4+ messages in thread
* Re: [PATCH 1/2] ASoC: arizona: Correct AEC loopback enable 2013-06-05 13:51 [PATCH 1/2] ASoC: arizona: Correct AEC loopback enable Charles Keepax 2013-06-05 13:51 ` [PATCH 2/2] ASoC: arizona: Hookup SYSCLK to inputs and noise generators Charles Keepax @ 2013-06-05 14:46 ` Mark Brown 1 sibling, 0 replies; 4+ messages in thread From: Mark Brown @ 2013-06-05 14:46 UTC (permalink / raw) To: Charles Keepax; +Cc: tiwai, alsa-devel, patches, lgirdwood [-- Attachment #1.1: Type: text/plain, Size: 288 bytes --] On Wed, Jun 05, 2013 at 02:51:30PM +0100, Charles Keepax wrote: > Signed-off-by: Charles Keepax <ckeepax@opensource.wolfsonmicro.com> Applied both, thanks (though like I say the second patch should have no practical effect - if it does you're probably missing something else somewhere). [-- 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] 4+ messages in thread
end of thread, other threads:[~2013-06-05 14:46 UTC | newest] Thread overview: 4+ messages (download: mbox.gz follow: Atom feed -- links below jump to the message on this page -- 2013-06-05 13:51 [PATCH 1/2] ASoC: arizona: Correct AEC loopback enable Charles Keepax 2013-06-05 13:51 ` [PATCH 2/2] ASoC: arizona: Hookup SYSCLK to inputs and noise generators Charles Keepax 2013-06-05 14:37 ` Mark Brown 2013-06-05 14:46 ` [PATCH 1/2] ASoC: arizona: Correct AEC loopback enable Mark Brown
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.