diff options
| -rw-r--r-- | sound/soc/codecs/wm_hubs.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/sound/soc/codecs/wm_hubs.c b/sound/soc/codecs/wm_hubs.c index 810a563d0ebf..d73c30536a2c 100644 --- a/sound/soc/codecs/wm_hubs.c +++ b/sound/soc/codecs/wm_hubs.c | |||
| @@ -438,11 +438,11 @@ static const struct snd_soc_dapm_widget analogue_dapm_widgets[] = { | |||
| 438 | SND_SOC_DAPM_INPUT("IN1LN"), | 438 | SND_SOC_DAPM_INPUT("IN1LN"), |
| 439 | SND_SOC_DAPM_INPUT("IN1LP"), | 439 | SND_SOC_DAPM_INPUT("IN1LP"), |
| 440 | SND_SOC_DAPM_INPUT("IN2LN"), | 440 | SND_SOC_DAPM_INPUT("IN2LN"), |
| 441 | SND_SOC_DAPM_INPUT("IN2LP/VXRN"), | 441 | SND_SOC_DAPM_INPUT("IN2LP:VXRN"), |
| 442 | SND_SOC_DAPM_INPUT("IN1RN"), | 442 | SND_SOC_DAPM_INPUT("IN1RN"), |
| 443 | SND_SOC_DAPM_INPUT("IN1RP"), | 443 | SND_SOC_DAPM_INPUT("IN1RP"), |
| 444 | SND_SOC_DAPM_INPUT("IN2RN"), | 444 | SND_SOC_DAPM_INPUT("IN2RN"), |
| 445 | SND_SOC_DAPM_INPUT("IN2RP/VXRP"), | 445 | SND_SOC_DAPM_INPUT("IN2RP:VXRP"), |
| 446 | 446 | ||
| 447 | SND_SOC_DAPM_MICBIAS("MICBIAS2", WM8993_POWER_MANAGEMENT_1, 5, 0), | 447 | SND_SOC_DAPM_MICBIAS("MICBIAS2", WM8993_POWER_MANAGEMENT_1, 5, 0), |
| 448 | SND_SOC_DAPM_MICBIAS("MICBIAS1", WM8993_POWER_MANAGEMENT_1, 4, 0), | 448 | SND_SOC_DAPM_MICBIAS("MICBIAS1", WM8993_POWER_MANAGEMENT_1, 4, 0), |
| @@ -537,14 +537,14 @@ static const struct snd_soc_dapm_route analogue_routes[] = { | |||
| 537 | { "IN1R PGA", "IN1RP Switch", "IN1RP" }, | 537 | { "IN1R PGA", "IN1RP Switch", "IN1RP" }, |
| 538 | { "IN1R PGA", "IN1RN Switch", "IN1RN" }, | 538 | { "IN1R PGA", "IN1RN Switch", "IN1RN" }, |
| 539 | 539 | ||
| 540 | { "IN2L PGA", "IN2LP Switch", "IN2LP/VXRN" }, | 540 | { "IN2L PGA", "IN2LP Switch", "IN2LP:VXRN" }, |
| 541 | { "IN2L PGA", "IN2LN Switch", "IN2LN" }, | 541 | { "IN2L PGA", "IN2LN Switch", "IN2LN" }, |
| 542 | 542 | ||
| 543 | { "IN2R PGA", "IN2RP Switch", "IN2RP/VXRP" }, | 543 | { "IN2R PGA", "IN2RP Switch", "IN2RP:VXRP" }, |
| 544 | { "IN2R PGA", "IN2RN Switch", "IN2RN" }, | 544 | { "IN2R PGA", "IN2RN Switch", "IN2RN" }, |
| 545 | 545 | ||
| 546 | { "Direct Voice", NULL, "IN2LP/VXRN" }, | 546 | { "Direct Voice", NULL, "IN2LP:VXRN" }, |
| 547 | { "Direct Voice", NULL, "IN2RP/VXRP" }, | 547 | { "Direct Voice", NULL, "IN2RP:VXRP" }, |
| 548 | 548 | ||
| 549 | { "MIXINL", "IN1L Switch", "IN1L PGA" }, | 549 | { "MIXINL", "IN1L Switch", "IN1L PGA" }, |
| 550 | { "MIXINL", "IN2L Switch", "IN2L PGA" }, | 550 | { "MIXINL", "IN2L Switch", "IN2L PGA" }, |
| @@ -565,7 +565,7 @@ static const struct snd_soc_dapm_route analogue_routes[] = { | |||
| 565 | { "Left Output Mixer", "Right Input Switch", "MIXINR" }, | 565 | { "Left Output Mixer", "Right Input Switch", "MIXINR" }, |
| 566 | { "Left Output Mixer", "IN2RN Switch", "IN2RN" }, | 566 | { "Left Output Mixer", "IN2RN Switch", "IN2RN" }, |
| 567 | { "Left Output Mixer", "IN2LN Switch", "IN2LN" }, | 567 | { "Left Output Mixer", "IN2LN Switch", "IN2LN" }, |
| 568 | { "Left Output Mixer", "IN2LP Switch", "IN2LP/VXRN" }, | 568 | { "Left Output Mixer", "IN2LP Switch", "IN2LP:VXRN" }, |
| 569 | { "Left Output Mixer", "IN1L Switch", "IN1L PGA" }, | 569 | { "Left Output Mixer", "IN1L Switch", "IN1L PGA" }, |
| 570 | { "Left Output Mixer", "IN1R Switch", "IN1R PGA" }, | 570 | { "Left Output Mixer", "IN1R Switch", "IN1R PGA" }, |
| 571 | 571 | ||
| @@ -573,7 +573,7 @@ static const struct snd_soc_dapm_route analogue_routes[] = { | |||
| 573 | { "Right Output Mixer", "Right Input Switch", "MIXINR" }, | 573 | { "Right Output Mixer", "Right Input Switch", "MIXINR" }, |
| 574 | { "Right Output Mixer", "IN2LN Switch", "IN2LN" }, | 574 | { "Right Output Mixer", "IN2LN Switch", "IN2LN" }, |
| 575 | { "Right Output Mixer", "IN2RN Switch", "IN2RN" }, | 575 | { "Right Output Mixer", "IN2RN Switch", "IN2RN" }, |
| 576 | { "Right Output Mixer", "IN2RP Switch", "IN2RP/VXRP" }, | 576 | { "Right Output Mixer", "IN2RP Switch", "IN2RP:VXRP" }, |
| 577 | { "Right Output Mixer", "IN1L Switch", "IN1L PGA" }, | 577 | { "Right Output Mixer", "IN1L Switch", "IN1L PGA" }, |
| 578 | { "Right Output Mixer", "IN1R Switch", "IN1R PGA" }, | 578 | { "Right Output Mixer", "IN1R Switch", "IN1R PGA" }, |
| 579 | 579 | ||
