ASoC: Use shared controls for input signal path in WM8915
Subsystems (3)
PATCH 1/2 ASoC: Use shared controls for input signal path in WM8915
Gives finer grained power management.
Signed-off-by Mark Brown <[email protected]>
--- sound/soc/codecs/wm8915.c | 45 +++++++++++++++++++++++++-------------------- 1 files changed, 25 insertions(+), 20 deletions(-)
sound/soc/codecs/wm8915.c +25 -20
@@ -991,10 +991,10 @@ SND_SOC_DAPM_MICBIAS("MICB1", WM8915_POWER_MANAGEMENT_1, 8, 0),SND_SOC_DAPM_PGA ("IN1L PGA" ,WM8915_POWER_MANAGEMENT_2 ,5 ,0 ,NULL ,0 ),SND_SOC_DAPM_PGA ("IN1R PGA" ,WM8915_POWER_MANAGEMENT_2 ,4 ,0 ,NULL ,0 ), -SND_SOC_DAPM_PGA ("ADC" ,SND_SOC_NOPM ,0 ,0 ,NULL ,0 ), - -SND_SOC_DAPM_MUX ("IN1 Mux" ,SND_SOC_NOPM ,0 ,0 , &in1_mux), -SND_SOC_DAPM_MUX ("IN2 Mux" ,SND_SOC_NOPM ,0 ,0 , &in2_mux), +SND_SOC_DAPM_MUX ("IN1L Mux" ,SND_SOC_NOPM ,0 ,0 , &in1_mux), +SND_SOC_DAPM_MUX ("IN1R Mux" ,SND_SOC_NOPM ,0 ,0 , &in1_mux), +SND_SOC_DAPM_MUX ("IN2L Mux" ,SND_SOC_NOPM ,0 ,0 , &in2_mux), +SND_SOC_DAPM_MUX ("IN2R Mux" ,SND_SOC_NOPM ,0 ,0 , &in2_mux),SND_SOC_DAPM_PGA ("IN1L" ,WM8915_POWER_MANAGEMENT_7 ,2 ,0 ,NULL ,0 ), SND_SOC_DAPM_PGA("IN1R", WM8915_POWER_MANAGEMENT_7, 3, 0, NULL, 0),
@@ -1172,28 +1172,33 @@ static const struct snd_soc_dapm_route wm8915_dapm_routes[] = { { "DMIC1L", NULL, "DMIC1" }, { "DMIC1R", NULL, "DMIC1" }, - { "ADC", NULL, "ADCL" }, - { "ADC", NULL, "ADCR" }, + { "IN1L Mux", "ADC", "ADCL" }, + { "IN1L Mux", "DMIC1", "DMIC1L" }, + { "IN1L Mux", "DMIC2", "DMIC2L" }, + + { "IN1R Mux", "ADC", "ADCR" }, + { "IN1R Mux", "DMIC1", "DMIC1R" }, + { "IN1R Mux", "DMIC2", "DMIC2R" }, - { "IN1 Mux", "ADC", "ADC" }, - { "IN1 Mux", "DMIC1", "DMIC1" }, - { "IN1 Mux", "DMIC2", "DMIC2" }, + { "IN2L Mux", "ADC", "ADCL" }, + { "IN2L Mux", "DMIC1", "DMIC1L" }, + { "IN2L Mux", "DMIC2", "DMIC2L" }, - { "IN2 Mux", "ADC", "ADC" }, - { "IN2 Mux", "DMIC1", "DMIC1" }, - { "IN2 Mux", "DMIC2", "DMIC2" }, + { "IN2R Mux", "ADC", "ADCR" }, + { "IN2R Mux", "DMIC1", "DMIC1R" }, + { "IN2R Mux", "DMIC2", "DMIC2R" }, - { "Left Sidetone", "IN1", "IN1 Mux" }, - { "Left Sidetone", "IN2", "IN2 Mux" }, + { "Left Sidetone", "IN1", "IN1L Mux" }, + { "Left Sidetone", "IN2", "IN2L Mux" }, - { "Right Sidetone", "IN1", "IN1 Mux" }, - { "Right Sidetone", "IN2", "IN2 Mux" }, + { "Right Sidetone", "IN1", "IN1R Mux" }, + { "Right Sidetone", "IN2", "IN2R Mux" }, - { "DSP1TXL", "IN1 Switch", "IN1 Mux" }, - { "DSP1TXR", "IN1 Switch", "IN1 Mux" }, + { "DSP1TXL", "IN1 Switch", "IN1L Mux" }, + { "DSP1TXR", "IN1 Switch", "IN1R Mux" }, - { "DSP2TXL", "IN1 Switch", "IN2 Mux" }, - { "DSP2TXR", "IN1 Switch", "IN2 Mux" }, + { "DSP2TXL", "IN1 Switch", "IN2L Mux" }, + { "DSP2TXR", "IN1 Switch", "IN2R Mux" }, { "AIF1TX0", NULL, "DSP1TXL" }, { "AIF1TX1", NULL, "DSP1TXR" },
Signature · 1 line
1.7.4.1
PATCH 2/2 ASoC: Remove outdated FIXME from WM8915
Actually the current code is perfectly sensible given the hardware.
Signed-off-by Mark Brown <[email protected]>
--- sound/soc/codecs/wm8915.c | 1 - 1 files changed, 0 insertions(+), 1 deletions(-)
sound/soc/codecs/wm8915.c +0 -1
@@ -1001,7 +1001,6 @@ SND_SOC_DAPM_PGA("IN1R", WM8915_POWER_MANAGEMENT_7, 3, 0, NULL, 0),SND_SOC_DAPM_PGA ("IN2L" ,WM8915_POWER_MANAGEMENT_7 ,6 ,0 ,NULL ,0 ),SND_SOC_DAPM_PGA ("IN2R" ,WM8915_POWER_MANAGEMENT_7 ,7 ,0 ,NULL ,0 ), -/* FIXME - these need to be concentrator widgets */ SND_SOC_DAPM_SUPPLY ("DMIC2" ,WM8915_POWER_MANAGEMENT_7 ,9 ,0 ,NULL ,0 ), SND_SOC_DAPM_SUPPLY("DMIC1", WM8915_POWER_MANAGEMENT_7, 8, 0, NULL, 0),
Signature · 1 line
1.7.4.1
Quoted 4 lines · Mark Brown
Gives finer grained power management.
Signed-off-by Mark Brown <[email protected]>---
Both
Acked-by Liam Girdwood <[email protected]>