diff options
author | Mark Brown <broonie@linaro.org> | 2014-08-04 11:31:19 -0400 |
---|---|---|
committer | Mark Brown <broonie@linaro.org> | 2014-08-04 11:31:19 -0400 |
commit | 0e76ee41fc87a17541e32d6be5a4701e24391da0 (patch) | |
tree | 6e43268213f885793875937bb8a7e6828e105824 | |
parent | 3a2ac12f8eadaee97ad0337d81280547ab7a3311 (diff) | |
parent | 3aae27991957156b2903e8058dbda616085a9734 (diff) |
Merge remote-tracking branch 'asoc/topic/pcm1792' into asoc-next
-rw-r--r-- | sound/soc/codecs/pcm1792a.c | 3 | ||||
-rw-r--r-- | sound/soc/codecs/pcm1792a.h | 3 |
2 files changed, 5 insertions, 1 deletions
diff --git a/sound/soc/codecs/pcm1792a.c b/sound/soc/codecs/pcm1792a.c index 3a80ba4452df..57b0c94a710b 100644 --- a/sound/soc/codecs/pcm1792a.c +++ b/sound/soc/codecs/pcm1792a.c | |||
@@ -36,6 +36,7 @@ | |||
36 | #define PCM1792A_DAC_VOL_LEFT 0x10 | 36 | #define PCM1792A_DAC_VOL_LEFT 0x10 |
37 | #define PCM1792A_DAC_VOL_RIGHT 0x11 | 37 | #define PCM1792A_DAC_VOL_RIGHT 0x11 |
38 | #define PCM1792A_FMT_CONTROL 0x12 | 38 | #define PCM1792A_FMT_CONTROL 0x12 |
39 | #define PCM1792A_MODE_CONTROL 0x13 | ||
39 | #define PCM1792A_SOFT_MUTE PCM1792A_FMT_CONTROL | 40 | #define PCM1792A_SOFT_MUTE PCM1792A_FMT_CONTROL |
40 | 41 | ||
41 | #define PCM1792A_FMT_MASK 0x70 | 42 | #define PCM1792A_FMT_MASK 0x70 |
@@ -164,6 +165,8 @@ static const struct snd_kcontrol_new pcm1792a_controls[] = { | |||
164 | SOC_DOUBLE_R_RANGE_TLV("DAC Playback Volume", PCM1792A_DAC_VOL_LEFT, | 165 | SOC_DOUBLE_R_RANGE_TLV("DAC Playback Volume", PCM1792A_DAC_VOL_LEFT, |
165 | PCM1792A_DAC_VOL_RIGHT, 0, 0xf, 0xff, 0, | 166 | PCM1792A_DAC_VOL_RIGHT, 0, 0xf, 0xff, 0, |
166 | pcm1792a_dac_tlv), | 167 | pcm1792a_dac_tlv), |
168 | SOC_SINGLE("DAC Invert Output Switch", PCM1792A_MODE_CONTROL, 7, 1, 0), | ||
169 | SOC_SINGLE("DAC Rolloff Filter Switch", PCM1792A_MODE_CONTROL, 1, 1, 0), | ||
167 | }; | 170 | }; |
168 | 171 | ||
169 | static const struct snd_soc_dapm_widget pcm1792a_dapm_widgets[] = { | 172 | static const struct snd_soc_dapm_widget pcm1792a_dapm_widgets[] = { |
diff --git a/sound/soc/codecs/pcm1792a.h b/sound/soc/codecs/pcm1792a.h index 7a83d1fc102a..51d5470fee16 100644 --- a/sound/soc/codecs/pcm1792a.h +++ b/sound/soc/codecs/pcm1792a.h | |||
@@ -18,7 +18,8 @@ | |||
18 | #define __PCM1792A_H__ | 18 | #define __PCM1792A_H__ |
19 | 19 | ||
20 | #define PCM1792A_RATES (SNDRV_PCM_RATE_44100 | SNDRV_PCM_RATE_8000_48000 | \ | 20 | #define PCM1792A_RATES (SNDRV_PCM_RATE_44100 | SNDRV_PCM_RATE_8000_48000 | \ |
21 | SNDRV_PCM_RATE_96000 | SNDRV_PCM_RATE_192000) | 21 | SNDRV_PCM_RATE_88200 | SNDRV_PCM_RATE_96000 | \ |
22 | SNDRV_PCM_RATE_192000) | ||
22 | 23 | ||
23 | #define PCM1792A_FORMATS (SNDRV_PCM_FMTBIT_S32_LE | SNDRV_PCM_FMTBIT_S24_LE | \ | 24 | #define PCM1792A_FORMATS (SNDRV_PCM_FMTBIT_S32_LE | SNDRV_PCM_FMTBIT_S24_LE | \ |
24 | SNDRV_PCM_FMTBIT_S16_LE) | 25 | SNDRV_PCM_FMTBIT_S16_LE) |