mirror of
https://github.com/torvalds/linux.git
synced 2024-11-16 00:52:01 +00:00
ASoC: wm5110: Remove mixer widgets on the ASRC
There is no mixer attached to the ASRC on the wm5110 only a multiplexer to select the source for the single input line. This change correctly defines this in the wm5110 CODEC driver. Signed-off-by: Charles Keepax <ckeepax@opensource.wolfsonmicro.com> Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
This commit is contained in:
parent
0f3ec6a935
commit
5886c74379
@ -308,10 +308,10 @@ ARIZONA_MIXER_ENUMS(AIF2TX2, ARIZONA_AIF2TX2MIX_INPUT_1_SOURCE);
|
||||
ARIZONA_MIXER_ENUMS(AIF3TX1, ARIZONA_AIF3TX1MIX_INPUT_1_SOURCE);
|
||||
ARIZONA_MIXER_ENUMS(AIF3TX2, ARIZONA_AIF3TX2MIX_INPUT_1_SOURCE);
|
||||
|
||||
ARIZONA_MIXER_ENUMS(ASRC1L, ARIZONA_ASRC1LMIX_INPUT_1_SOURCE);
|
||||
ARIZONA_MIXER_ENUMS(ASRC1R, ARIZONA_ASRC1RMIX_INPUT_1_SOURCE);
|
||||
ARIZONA_MIXER_ENUMS(ASRC2L, ARIZONA_ASRC2LMIX_INPUT_1_SOURCE);
|
||||
ARIZONA_MIXER_ENUMS(ASRC2R, ARIZONA_ASRC2RMIX_INPUT_1_SOURCE);
|
||||
ARIZONA_MUX_ENUMS(ASRC1L, ARIZONA_ASRC1LMIX_INPUT_1_SOURCE);
|
||||
ARIZONA_MUX_ENUMS(ASRC1R, ARIZONA_ASRC1RMIX_INPUT_1_SOURCE);
|
||||
ARIZONA_MUX_ENUMS(ASRC2L, ARIZONA_ASRC2LMIX_INPUT_1_SOURCE);
|
||||
ARIZONA_MUX_ENUMS(ASRC2R, ARIZONA_ASRC2RMIX_INPUT_1_SOURCE);
|
||||
|
||||
static const char *wm5110_aec_loopback_texts[] = {
|
||||
"HPOUT1L", "HPOUT1R", "HPOUT2L", "HPOUT2R", "HPOUT3L", "HPOUT3R",
|
||||
@ -585,10 +585,10 @@ ARIZONA_MIXER_WIDGETS(AIF2TX2, "AIF2TX2"),
|
||||
ARIZONA_MIXER_WIDGETS(AIF3TX1, "AIF3TX1"),
|
||||
ARIZONA_MIXER_WIDGETS(AIF3TX2, "AIF3TX2"),
|
||||
|
||||
ARIZONA_MIXER_WIDGETS(ASRC1L, "ASRC1L"),
|
||||
ARIZONA_MIXER_WIDGETS(ASRC1R, "ASRC1R"),
|
||||
ARIZONA_MIXER_WIDGETS(ASRC2L, "ASRC2L"),
|
||||
ARIZONA_MIXER_WIDGETS(ASRC2R, "ASRC2R"),
|
||||
ARIZONA_MUX_WIDGETS(ASRC1L, "ASRC1L"),
|
||||
ARIZONA_MUX_WIDGETS(ASRC1R, "ASRC1R"),
|
||||
ARIZONA_MUX_WIDGETS(ASRC2L, "ASRC2L"),
|
||||
ARIZONA_MUX_WIDGETS(ASRC2R, "ASRC2R"),
|
||||
|
||||
SND_SOC_DAPM_OUTPUT("HPOUT1L"),
|
||||
SND_SOC_DAPM_OUTPUT("HPOUT1R"),
|
||||
@ -786,10 +786,10 @@ static const struct snd_soc_dapm_route wm5110_dapm_routes[] = {
|
||||
ARIZONA_MIXER_ROUTES("LHPF3", "LHPF3"),
|
||||
ARIZONA_MIXER_ROUTES("LHPF4", "LHPF4"),
|
||||
|
||||
ARIZONA_MIXER_ROUTES("ASRC1L", "ASRC1L"),
|
||||
ARIZONA_MIXER_ROUTES("ASRC1R", "ASRC1R"),
|
||||
ARIZONA_MIXER_ROUTES("ASRC2L", "ASRC2L"),
|
||||
ARIZONA_MIXER_ROUTES("ASRC2R", "ASRC2R"),
|
||||
ARIZONA_MUX_ROUTES("ASRC1L"),
|
||||
ARIZONA_MUX_ROUTES("ASRC1R"),
|
||||
ARIZONA_MUX_ROUTES("ASRC2L"),
|
||||
ARIZONA_MUX_ROUTES("ASRC2R"),
|
||||
|
||||
{ "HPOUT1L", NULL, "OUT1L" },
|
||||
{ "HPOUT1R", NULL, "OUT1R" },
|
||||
|
Loading…
Reference in New Issue
Block a user