diff options
Diffstat (limited to 'sound/soc/codecs/wm8750.c')
-rw-r--r-- | sound/soc/codecs/wm8750.c | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/sound/soc/codecs/wm8750.c b/sound/soc/codecs/wm8750.c index c5d13a9454d9..4cc85128dc59 100644 --- a/sound/soc/codecs/wm8750.c +++ b/sound/soc/codecs/wm8750.c | |||
@@ -444,9 +444,9 @@ SOC_DOUBLE_R("Capture Volume", WM8750_LINVOL, WM8750_RINVOL, 0, 63, 0), | |||
444 | SOC_DOUBLE_R("Capture ZC Switch", WM8750_LINVOL, WM8750_RINVOL, 6, 1, 0), | 444 | SOC_DOUBLE_R("Capture ZC Switch", WM8750_LINVOL, WM8750_RINVOL, 6, 1, 0), |
445 | SOC_DOUBLE_R("Capture Switch", WM8750_LINVOL, WM8750_RINVOL, 7, 1, 1), | 445 | SOC_DOUBLE_R("Capture Switch", WM8750_LINVOL, WM8750_RINVOL, 7, 1, 1), |
446 | 446 | ||
447 | SOC_DOUBLE_R("Out1 Playback ZC Switch", WM8750_LOUT1V, | 447 | SOC_DOUBLE_R("Headphone Playback ZC Switch", WM8750_LOUT1V, |
448 | WM8750_ROUT1V, 7, 1, 0), | 448 | WM8750_ROUT1V, 7, 1, 0), |
449 | SOC_DOUBLE_R("Out2 Playback ZC Switch", WM8750_LOUT2V, | 449 | SOC_DOUBLE_R("Speaker Playback ZC Switch", WM8750_LOUT2V, |
450 | WM8750_ROUT2V, 7, 1, 0), | 450 | WM8750_ROUT2V, 7, 1, 0), |
451 | 451 | ||
452 | SOC_ENUM("Playback De-emphasis", wm8750_enum[15]), | 452 | SOC_ENUM("Playback De-emphasis", wm8750_enum[15]), |
@@ -487,7 +487,7 @@ SOC_SINGLE("Right ADC Capture Volume", WM8750_RADC, 0, 255, 0), | |||
487 | SOC_SINGLE("ZC Timeout Switch", WM8750_ADCTL1, 0, 1, 0), | 487 | SOC_SINGLE("ZC Timeout Switch", WM8750_ADCTL1, 0, 1, 0), |
488 | SOC_SINGLE("Playback Invert Switch", WM8750_ADCTL1, 1, 1, 0), | 488 | SOC_SINGLE("Playback Invert Switch", WM8750_ADCTL1, 1, 1, 0), |
489 | 489 | ||
490 | SOC_SINGLE("Right Out2 Playback Invert Switch", WM8750_ADCTL2, 4, 1, 0), | 490 | SOC_SINGLE("Right Speaker Playback Invert Switch", WM8750_ADCTL2, 4, 1, 0), |
491 | 491 | ||
492 | /* Unimplemented */ | 492 | /* Unimplemented */ |
493 | /* ADCDAC Bit 0 - ADCHPD */ | 493 | /* ADCDAC Bit 0 - ADCHPD */ |
@@ -514,8 +514,10 @@ SOC_DOUBLE_R("Bypass Mono Playback Volume", WM8750_MOUTM1, | |||
514 | 514 | ||
515 | SOC_SINGLE("Mono Playback ZC Switch", WM8750_MOUTV, 7, 1, 0), | 515 | SOC_SINGLE("Mono Playback ZC Switch", WM8750_MOUTV, 7, 1, 0), |
516 | 516 | ||
517 | SOC_DOUBLE_R("Out1 Playback Volume", WM8750_LOUT1V, WM8750_ROUT1V, 0, 127, 0), | 517 | SOC_DOUBLE_R("Headphone Playback Volume", WM8750_LOUT1V, WM8750_ROUT1V, |
518 | SOC_DOUBLE_R("Out2 Playback Volume", WM8750_LOUT2V, WM8750_ROUT2V, 0, 127, 0), | 518 | 0, 127, 0), |
519 | SOC_DOUBLE_R("Speaker Playback Volume", WM8750_LOUT2V, WM8750_ROUT2V, | ||
520 | 0, 127, 0), | ||
519 | 521 | ||
520 | SOC_SINGLE("Mono Playback Volume", WM8750_MOUTV, 0, 127, 0), | 522 | SOC_SINGLE("Mono Playback Volume", WM8750_MOUTV, 0, 127, 0), |
521 | 523 | ||