ASoC: Convert WM8903 to use PGA_S for output stage enables
Subsystems (3)
PATCH 1/3 ASoC: Convert WM8903 to use PGA_S for output stage enables
This simplfies the code and slightly reduces the startup time.
Signed-off-by Mark Brown <[email protected]>
--- sound/soc/codecs/wm8903.c | 180 +++++++++++++++------------------------------ 1 files changed, 60 insertions(+), 120 deletions(-)
sound/soc/codecs/wm8903.c +60 -120
@@ -251,6 +251,8 @@ static int wm8903_volatile_register(struct snd_soc_codec *codec, unsigned int recase WM8903_REVISION_NUMBER :case WM8903_INTERRUPT_STATUS_1 :case WM8903_WRITE_SEQUENCER_4 : +case WM8903_POWER_MANAGEMENT_3 : +case WM8903_POWER_MANAGEMENT_2 :return 1 ;default :
@@ -309,11 +311,6 @@ static void wm8903_reset(struct snd_soc_codec *codec) sizeof(wm8903_reg_defaults)); } -#define WM8903_OUTPUT_SHORT 0x8 -#define WM8903_OUTPUT_OUT 0x4 -#define WM8903_OUTPUT_INT 0x2 -#define WM8903_OUTPUT_IN 0x1 -static int wm8903_cp_event (struct snd_soc_dapm_widget *w,struct snd_kcontrol *kcontrol,int event) {
@@ -324,99 +321,6 @@ static int wm8903_cp_event(struct snd_soc_dapm_widget *w, }/* -* Event for headphone and line out amplifier power changes. Special -* power up/down sequences are required in order to maximise pop/click -* performance. -*/ -static int wm8903_output_event (struct snd_soc_dapm_widget *w, -struct snd_kcontrol *kcontrol,int event) -{ -struct snd_soc_codec *codec = w->codec; -u16 val; -u16 reg; -u16 dcs_reg; -u16 dcs_bit; -int shift; - -switch (w->reg) { -case WM8903_POWER_MANAGEMENT_2 : - reg =WM8903_ANALOGUE_HP_0 ; - dcs_bit =0 + w->shift; -break ; -case WM8903_POWER_MANAGEMENT_3 : - reg =WM8903_ANALOGUE_LINEOUT_0 ; - dcs_bit =2 + w->shift; -break ; -default : -BUG (); -return -EINVAL ;/* Spurious warning from some compilers */ - } - -switch (w->shift) { -case 0 : - shift =0 ; -break ; -case 1 : - shift =4 ; -break ; -default : -BUG (); -return -EINVAL ;/* Spurious warning from some compilers */ - } - -if (event &SND_SOC_DAPM_PRE_PMU ) { - val =snd_soc_read (codec, reg); - -/* Short the output */ - val &= ~(WM8903_OUTPUT_SHORT << shift); -snd_soc_write (codec, reg, val); - } - -if (event &SND_SOC_DAPM_POST_PMU ) { - val =snd_soc_read (codec, reg); - - val |= (WM8903_OUTPUT_IN << shift); -snd_soc_write (codec, reg, val); - - val |= (WM8903_OUTPUT_INT << shift); -snd_soc_write (codec, reg, val); - -/* Turn on the output ENA_OUTP */ - val |= (WM8903_OUTPUT_OUT << shift); -snd_soc_write (codec, reg, val); - -/* Enable the DC servo */ - dcs_reg =snd_soc_read (codec,WM8903_DC_SERVO_0 ); - dcs_reg |= dcs_bit; -snd_soc_write (codec,WM8903_DC_SERVO_0 , dcs_reg); - -/* Remove the short */ - val |= (WM8903_OUTPUT_SHORT << shift); -snd_soc_write (codec, reg, val); - } - -if (event &SND_SOC_DAPM_PRE_PMD ) { - val =snd_soc_read (codec, reg); - -/* Short the output */ - val &= ~(WM8903_OUTPUT_SHORT << shift); -snd_soc_write (codec, reg, val); - -/* Disable the DC servo */ - dcs_reg =snd_soc_read (codec,WM8903_DC_SERVO_0 ); - dcs_reg &= ~dcs_bit; -snd_soc_write (codec,WM8903_DC_SERVO_0 , dcs_reg); - -/* Then disable the intermediate and output stages */ - val &= ~((WM8903_OUTPUT_OUT |WM8903_OUTPUT_INT | -WM8903_OUTPUT_IN ) << shift); -snd_soc_write (codec, reg, val); - } - -return 0 ; -} - -/* * When used with DAC outputs only the WM8903 charge pump supports * operation in class W mode, providing very low power consumption * when used with digital sources. Enable and disable this mode
@@ -918,23 +822,40 @@ SND_SOC_DAPM_MIXER("Left Speaker Mixer", WM8903_POWER_MANAGEMENT_4, 1, 0,SND_SOC_DAPM_MIXER ("Right Speaker Mixer" ,WM8903_POWER_MANAGEMENT_4 ,0 ,0 , right_speaker_mixer,ARRAY_SIZE (right_speaker_mixer)), -SND_SOC_DAPM_PGA_E ("Left Headphone Output PGA" ,WM8903_POWER_MANAGEMENT_2 , -1 ,0 ,NULL ,0 , wm8903_output_event, -SND_SOC_DAPM_PRE_PMU |SND_SOC_DAPM_POST_PMU | -SND_SOC_DAPM_PRE_PMD ), -SND_SOC_DAPM_PGA_E ("Right Headphone Output PGA" ,WM8903_POWER_MANAGEMENT_2 , -0 ,0 ,NULL ,0 , wm8903_output_event, -SND_SOC_DAPM_PRE_PMU |SND_SOC_DAPM_POST_PMU | -SND_SOC_DAPM_PRE_PMD ), - -SND_SOC_DAPM_PGA_E ("Left Line Output PGA" ,WM8903_POWER_MANAGEMENT_3 ,1 ,0 , -NULL ,0 , wm8903_output_event, -SND_SOC_DAPM_PRE_PMU |SND_SOC_DAPM_POST_PMU | -SND_SOC_DAPM_PRE_PMD ), -SND_SOC_DAPM_PGA_E ("Right Line Output PGA" ,WM8903_POWER_MANAGEMENT_3 ,0 ,0 , -NULL ,0 , wm8903_output_event, -SND_SOC_DAPM_PRE_PMU |SND_SOC_DAPM_POST_PMU | -SND_SOC_DAPM_PRE_PMD ), +SND_SOC_DAPM_PGA_S ("Left Headphone Output PGA" ,0 ,WM8903_ANALOGUE_HP_0 , +4 ,0 ,NULL ,0 ), +SND_SOC_DAPM_PGA_S ("Right Headphone Output PGA" ,0 ,WM8903_ANALOGUE_HP_0 , +0 ,0 ,NULL ,0 ), + +SND_SOC_DAPM_PGA_S ("Left Line Output PGA" ,0 ,WM8903_ANALOGUE_LINEOUT_0 ,4 ,0 , +NULL ,0 ), +SND_SOC_DAPM_PGA_S ("Right Line Output PGA" ,0 ,WM8903_ANALOGUE_LINEOUT_0 ,0 ,0 , +NULL ,0 ), + +SND_SOC_DAPM_PGA_S ("HPL_RMV_SHORT" ,4 ,WM8903_ANALOGUE_HP_0 ,7 ,0 ,NULL ,0 ), +SND_SOC_DAPM_PGA_S ("HPL_ENA_OUTP" ,3 ,WM8903_ANALOGUE_HP_0 ,6 ,0 ,NULL ,0 ), +SND_SOC_DAPM_PGA_S ("HPL_ENA_DLY" ,1 ,WM8903_ANALOGUE_HP_0 ,5 ,0 ,NULL ,0 ), +SND_SOC_DAPM_PGA_S ("HPR_RMV_SHORT" ,4 ,WM8903_ANALOGUE_HP_0 ,3 ,0 ,NULL ,0 ), +SND_SOC_DAPM_PGA_S ("HPR_ENA_OUTP" ,3 ,WM8903_ANALOGUE_HP_0 ,2 ,0 ,NULL ,0 ), +SND_SOC_DAPM_PGA_S ("HPR_ENA_DLY" ,1 ,WM8903_ANALOGUE_HP_0 ,1 ,0 ,NULL ,0 ), + +SND_SOC_DAPM_PGA_S ("LINEOUTL_RMV_SHORT" ,4 ,WM8903_ANALOGUE_LINEOUT_0 ,7 ,0 , +NULL ,0 ), +SND_SOC_DAPM_PGA_S ("LINEOUTL_ENA_OUTP" ,3 ,WM8903_ANALOGUE_LINEOUT_0 ,6 ,0 , +NULL ,0 ), +SND_SOC_DAPM_PGA_S ("LINEOUTL_ENA_DLY" ,1 ,WM8903_ANALOGUE_LINEOUT_0 ,5 ,0 , +NULL ,0 ), +SND_SOC_DAPM_PGA_S ("LINEOUTR_RMV_SHORT" ,4 ,WM8903_ANALOGUE_LINEOUT_0 ,3 ,0 , +NULL ,0 ), +SND_SOC_DAPM_PGA_S ("LINEOUTR_ENA_OUTP" ,3 ,WM8903_ANALOGUE_LINEOUT_0 ,2 ,0 , +NULL ,0 ), +SND_SOC_DAPM_PGA_S ("LINEOUTR_ENA_DLY" ,1 ,WM8903_ANALOGUE_LINEOUT_0 ,1 ,0 , +NULL ,0 ), + +SND_SOC_DAPM_PGA_S ("HPL_DCS" ,3 ,WM8903_DC_SERVO_0 ,3 ,0 ,NULL ,0 ), +SND_SOC_DAPM_PGA_S ("HPR_DCS" ,3 ,WM8903_DC_SERVO_0 ,2 ,0 ,NULL ,0 ), +SND_SOC_DAPM_PGA_S ("LINEOUTL_DCS" ,3 ,WM8903_DC_SERVO_0 ,1 ,0 ,NULL ,0 ), +SND_SOC_DAPM_PGA_S ("LINEOUTR_DCS" ,3 ,WM8903_DC_SERVO_0 ,0 ,0 ,NULL ,0 ),SND_SOC_DAPM_PGA ("Left Speaker PGA" ,WM8903_POWER_MANAGEMENT_5 ,1 ,0 , NULL, 0),
@@ -1050,11 +971,30 @@ static const struct snd_soc_dapm_route intercon[] = { { "Left Speaker PGA", NULL, "Left Speaker Mixer" }, { "Right Speaker PGA", NULL, "Right Speaker Mixer" }, - { "HPOUTL", NULL, "Left Headphone Output PGA" }, - { "HPOUTR", NULL, "Right Headphone Output PGA" }, - - { "LINEOUTL", NULL, "Left Line Output PGA" }, - { "LINEOUTR", NULL, "Right Line Output PGA" }, + { "HPL_ENA_DLY", NULL, "Left Headphone Output PGA" }, + { "HPR_ENA_DLY", NULL, "Right Headphone Output PGA" }, + { "LINEOUTL_ENA_DLY", NULL, "Left Line Output PGA" }, + { "LINEOUTR_ENA_DLY", NULL, "Right Line Output PGA" }, + + { "HPL_DCS", NULL, "HPL_ENA_DLY" }, + { "HPR_DCS", NULL, "HPR_ENA_DLY" }, + { "LINEOUTL_DCS", NULL, "LINEOUTL_ENA_DLY" }, + { "LINEOUTR_DCS", NULL, "LINEOUTR_ENA_DLY" }, + + { "HPL_ENA_OUTP", NULL, "HPL_DCS" }, + { "HPR_ENA_OUTP", NULL, "HPR_DCS" }, + { "LINEOUTL_ENA_OUTP", NULL, "LINEOUTL_DCS" }, + { "LINEOUTR_ENA_OUTP", NULL, "LINEOUTR_DCS" }, + + { "HPL_RMV_SHORT", NULL, "HPL_ENA_OUTP" }, + { "HPR_RMV_SHORT", NULL, "HPR_ENA_OUTP" }, + { "LINEOUTL_RMV_SHORT", NULL, "LINEOUTL_ENA_OUTP" }, + { "LINEOUTR_RMV_SHORT", NULL, "LINEOUTR_ENA_OUTP" }, + + { "HPOUTL", NULL, "HPL_RMV_SHORT" }, + { "HPOUTR", NULL, "HPR_RMV_SHORT" }, + { "LINEOUTL", NULL, "LINEOUTL_RMV_SHORT" }, + { "LINEOUTR", NULL, "LINEOUTR_RMV_SHORT" }, { "LOP", NULL, "Left Speaker PGA" }, { "LON", NULL, "Left Speaker PGA" },
Signature · 1 line
1.7.2.3
PATCH 2/3 ASoC: Dynamically manage CLK_SYS in WM8903
Signed-off-by Mark Brown <[email protected]>
--- sound/soc/codecs/wm8903.c | 15 ++++++++++++--- 1 files changed, 12 insertions(+), 3 deletions(-)
sound/soc/codecs/wm8903.c +12 -3
@@ -865,10 +865,18 @@ SND_SOC_DAPM_PGA("Right Speaker PGA", WM8903_POWER_MANAGEMENT_5, 0, 0,SND_SOC_DAPM_SUPPLY ("Charge Pump" ,WM8903_CHARGE_PUMP_0 ,0 ,0 , wm8903_cp_event,SND_SOC_DAPM_POST_PMU ),SND_SOC_DAPM_SUPPLY ("CLK_DSP" ,WM8903_CLOCK_RATES_2 ,1 ,0 ,NULL ,0 ), +SND_SOC_DAPM_SUPPLY("CLK_SYS", WM8903_CLOCK_RATES_2, 2, 0, NULL, 0), };static const struct snd_soc_dapm_route intercon[] = { + {"CLK_DSP" ,NULL ,"CLK_SYS" }, + {"Mic Bias" ,NULL ,"CLK_SYS" }, + {"HPL_DCS" ,NULL ,"CLK_SYS" }, + {"HPR_DCS" ,NULL ,"CLK_SYS" }, + {"LINEOUTL_DCS" ,NULL ,"CLK_SYS" }, + {"LINEOUTR_DCS" ,NULL ,"CLK_SYS" }, + {"Left Input Mux" ,"IN1L" ,"IN1L" }, {"Left Input Mux" ,"IN2L" ,"IN2L" }, { "Left Input Mux", "IN3L", "IN3L" },
@@ -1064,10 +1072,11 @@ static int wm8903_set_bias_level(struct snd_soc_codec *codec,break ;case SND_SOC_BIAS_OFF : +snd_soc_update_bits (codec,WM8903_CLOCK_RATES_2 , +WM8903_CLK_SYS_ENA ,WM8903_CLK_SYS_ENA );wm8903_run_sequence (codec,32 ); - reg =snd_soc_read (codec,WM8903_CLOCK_RATES_2 ); - reg &= ~WM8903_CLK_SYS_ENA ; -snd_soc_write (codec,WM8903_CLOCK_RATES_2 , reg); +snd_soc_update_bits (codec,WM8903_CLOCK_RATES_2 , +WM8903_CLK_SYS_ENA ,0 );break ; }
Signature · 1 line
1.7.2.3
PATCH 3/3 ASoC: Fix WM8903 DAC mute default
In reply to Mark BrownThe WM8903 register map does not mute the DAC by default at startup so we need to explicitly do so.
Signed-off-by Mark Brown <[email protected]>
--- sound/soc/codecs/wm8903.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-)
sound/soc/codecs/wm8903.c +3 -3
@@ -2072,9 +2072,9 @@ static int wm8903_probe(struct snd_soc_codec *codec)snd_soc_write (codec,WM8903_ANALOGUE_OUT3_RIGHT , val);/* Enable DAC soft mute by default */ - val =snd_soc_read (codec,WM8903_DAC_DIGITAL_1 ); - val |=WM8903_DAC_MUTEMODE ; -snd_soc_write (codec,WM8903_DAC_DIGITAL_1 , val); +snd_soc_update_bits (codec,WM8903_DAC_DIGITAL_1 , +WM8903_DAC_MUTEMODE |WM8903_DAC_MUTE , +WM8903_DAC_MUTEMODE |WM8903_DAC_MUTE );snd_soc_add_controls (codec, wm8903_snd_controls,ARRAY_SIZE (wm8903_snd_controls));
Signature · 1 line
1.7.2.3
Re: [PATCH 3/3] ASoC: Fix WM8903 DAC mute default
Quoted 5 lines · Mark Brown
The WM8903 register map does not mute the DAC by default at startup so we need to explicitly do so.
Signed-off-by Mark Brown <[email protected]>---
Acked-by Liam Girdwood <[email protected]>
Signature · 3 lines
Freelance Developer, SlimLogic Ltd ASoC and Voltage Regulator Maintainer. http://www.slimlogic.co.uk
Re: [PATCH 2/3] ASoC: Dynamically manage CLK_SYS in WM8903
In reply to Mark BrownQuoted 4 lines · Mark Brown
Signed-off-by Mark Brown <[email protected]>--- sound/soc/codecs/wm8903.c | 15 ++++++++++++--- 1 files changed, 12 insertions(+), 3 deletions(-)
Acked-by Liam Girdwood <[email protected]>
Signature · 3 lines
Freelance Developer, SlimLogic Ltd ASoC and Voltage Regulator Maintainer. http://www.slimlogic.co.uk
Quoted 6 lines · Mark Brown
This simplfies the code and slightly reduces the startup time.
Signed-off-by Mark Brown <[email protected]>--- sound/soc/codecs/wm8903.c | 180 +++++++++++++++------------------------------ 1 files changed, 60 insertions(+), 120 deletions(-)
Acked-by Liam Girdwood <[email protected]>
Signature · 3 lines
Freelance Developer, SlimLogic Ltd ASoC and Voltage Regulator Maintainer. http://www.slimlogic.co.uk