Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
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
-3
+2
-3
sound/soc/codecs/es8323.c
+2
-3
sound/soc/codecs/es8323.c
···
182
182
183
183
/* Left Mixer */
184
184
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),
186
186
SOC_DAPM_SINGLE("Left Bypass Switch", ES8323_DACCONTROL17, 6, 1, 0),
187
187
};
188
188
189
189
/* Right Mixer */
190
190
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),
192
192
SOC_DAPM_SINGLE("Right Bypass Switch", ES8323_DACCONTROL20, 6, 1, 0),
193
193
};
194
194
···
632
632
633
633
snd_soc_component_write(component, ES8323_CONTROL2, 0x60);
634
634
snd_soc_component_write(component, ES8323_CHIPPOWER, 0x00);
635
-
snd_soc_component_write(component, ES8323_DACCONTROL17, 0xB8);
636
635
637
636
return 0;
638
637
}