diff options
| author | Mark Brown <broonie@linaro.org> | 2014-01-16 12:43:55 +0000 |
|---|---|---|
| committer | Mark Brown <broonie@linaro.org> | 2014-01-16 12:43:55 +0000 |
| commit | a4c83a2d00086942b442147326c0383b1ccc59a7 (patch) | |
| tree | 73a8df8e4cacc90ca4be95e57239fba181d9f50c /sound/soc | |
| parent | 2f43a23ab9ea1865a663e100b0af20198decb4f1 (diff) | |
| parent | afb6d4ed3fd88bacf8b0abcbf053c79c604f509f (diff) | |
| download | linux-a4c83a2d00086942b442147326c0383b1ccc59a7.tar.gz linux-a4c83a2d00086942b442147326c0383b1ccc59a7.tar.bz2 linux-a4c83a2d00086942b442147326c0383b1ccc59a7.zip | |
Merge remote-tracking branch 'asoc/topic/arizona' into for-tiwai
Diffstat (limited to 'sound/soc')
| -rw-r--r-- | sound/soc/codecs/wm5110.c | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/sound/soc/codecs/wm5110.c b/sound/soc/codecs/wm5110.c index 22bd7dd80bba..d862f76b59f9 100644 --- a/sound/soc/codecs/wm5110.c +++ b/sound/soc/codecs/wm5110.c @@ -313,6 +313,13 @@ ARIZONA_MIXER_CONTROLS("SPKDAT1R", ARIZONA_OUT5RMIX_INPUT_1_SOURCE), ARIZONA_MIXER_CONTROLS("SPKDAT2L", ARIZONA_OUT6LMIX_INPUT_1_SOURCE), ARIZONA_MIXER_CONTROLS("SPKDAT2R", ARIZONA_OUT6RMIX_INPUT_1_SOURCE), +SOC_SINGLE("HPOUT1 SC Protect Switch", ARIZONA_HP1_SHORT_CIRCUIT_CTRL, + ARIZONA_HP1_SC_ENA_SHIFT, 1, 0), +SOC_SINGLE("HPOUT2 SC Protect Switch", ARIZONA_HP2_SHORT_CIRCUIT_CTRL, + ARIZONA_HP2_SC_ENA_SHIFT, 1, 0), +SOC_SINGLE("HPOUT3 SC Protect Switch", ARIZONA_HP3_SHORT_CIRCUIT_CTRL, + ARIZONA_HP3_SC_ENA_SHIFT, 1, 0), + SOC_DOUBLE_R("HPOUT1 Digital Switch", ARIZONA_DAC_DIGITAL_VOLUME_1L, ARIZONA_DAC_DIGITAL_VOLUME_1R, ARIZONA_OUT1L_MUTE_SHIFT, 1, 1), SOC_DOUBLE_R("HPOUT2 Digital Switch", ARIZONA_DAC_DIGITAL_VOLUME_2L, |