Skip to content

Commit 7ed3723

Browse files
committed
ASoC: es8323: power and mixer controls cleanup and
Merge series from Shimrra Shai <shimrrashai@gmail.com>: This is a revision of a previous patch submission of mine wherein one part was accepted and one part was not. It was originally phrased for a particular device using the ES8323 CODEC, and I was advised to make the mixer controls user-selectable so it was not tied to the needs of any specific device. This submission brings the DAC and mixer controls for basic audio playback on this CODEC into line with the DAPM infrastructure and enables their operation through the standard mixer interface.
2 parents d5020c1 + daf855f commit 7ed3723

1 file changed

Lines changed: 2 additions & 3 deletions

File tree

sound/soc/codecs/es8323.c

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -182,13 +182,13 @@ static const struct snd_kcontrol_new es8323_mono_adc_mux_controls =
182182

183183
/* Left Mixer */
184184
static const struct snd_kcontrol_new es8323_left_mixer_controls[] = {
185-
SOC_DAPM_SINGLE("Left Playback Switch", SND_SOC_NOPM, 7, 1, 1),
185+
SOC_DAPM_SINGLE("Left Playback Switch", ES8323_DACCONTROL17, 7, 1, 0),
186186
SOC_DAPM_SINGLE("Left Bypass Switch", ES8323_DACCONTROL17, 6, 1, 0),
187187
};
188188

189189
/* Right Mixer */
190190
static const struct snd_kcontrol_new es8323_right_mixer_controls[] = {
191-
SOC_DAPM_SINGLE("Right Playback Switch", SND_SOC_NOPM, 6, 1, 1),
191+
SOC_DAPM_SINGLE("Right Playback Switch", ES8323_DACCONTROL20, 7, 1, 0),
192192
SOC_DAPM_SINGLE("Right Bypass Switch", ES8323_DACCONTROL20, 6, 1, 0),
193193
};
194194

@@ -632,7 +632,6 @@ static int es8323_probe(struct snd_soc_component *component)
632632

633633
snd_soc_component_write(component, ES8323_CONTROL2, 0x60);
634634
snd_soc_component_write(component, ES8323_CHIPPOWER, 0x00);
635-
snd_soc_component_write(component, ES8323_DACCONTROL17, 0xB8);
636635

637636
return 0;
638637
}

0 commit comments

Comments
 (0)