diff options
| author | Mark Brown <broonie@kernel.org> | 2025-08-19 16:53:55 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2025-08-19 16:53:55 +0100 |
| commit | 7ed3723d612c200839820cea8a9ee86cbaa858a8 (patch) | |
| tree | d5c43040c43c30cc41f47bf3f4239c34bfa8d89f | |
| parent | d5020c1ce3764e73dd6634f462cf6723d185bac2 (diff) | |
| parent | daf855f76a1210ceed9541f71ac5dd9be02018a6 (diff) | |
| download | linux-next-7ed3723d612c200839820cea8a9ee86cbaa858a8.tar.gz linux-next-7ed3723d612c200839820cea8a9ee86cbaa858a8.zip | |
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.
| -rw-r--r-- | sound/soc/codecs/es8323.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/sound/soc/codecs/es8323.c b/sound/soc/codecs/es8323.c index 70d348ff3b43..eb85b71e87f3 100644 --- a/sound/soc/codecs/es8323.c +++ b/sound/soc/codecs/es8323.c @@ -182,13 +182,13 @@ static const struct snd_kcontrol_new es8323_mono_adc_mux_controls = /* Left Mixer */ static const struct snd_kcontrol_new es8323_left_mixer_controls[] = { - SOC_DAPM_SINGLE("Left Playback Switch", SND_SOC_NOPM, 7, 1, 1), + SOC_DAPM_SINGLE("Left Playback Switch", ES8323_DACCONTROL17, 7, 1, 0), SOC_DAPM_SINGLE("Left Bypass Switch", ES8323_DACCONTROL17, 6, 1, 0), }; /* Right Mixer */ static const struct snd_kcontrol_new es8323_right_mixer_controls[] = { - SOC_DAPM_SINGLE("Right Playback Switch", SND_SOC_NOPM, 6, 1, 1), + SOC_DAPM_SINGLE("Right Playback Switch", ES8323_DACCONTROL20, 7, 1, 0), SOC_DAPM_SINGLE("Right Bypass Switch", ES8323_DACCONTROL20, 6, 1, 0), }; @@ -632,7 +632,6 @@ static int es8323_probe(struct snd_soc_component *component) snd_soc_component_write(component, ES8323_CONTROL2, 0x60); snd_soc_component_write(component, ES8323_CHIPPOWER, 0x00); - snd_soc_component_write(component, ES8323_DACCONTROL17, 0xB8); return 0; } |