iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branches 'asoc/topic/const', 'asoc/topic/cs35l32', 'asoc/topic/cs4265' and 'asoc/topic/cs42l52' into asoc-next

Browse Source
This commit is contained in:
Mark Brown
2015-08-30 15:52:59 +01:00
parent 48997b9c03 6479304755 c17633081a 80deaf09cb 4caae9546d
commit b18fec9fe4
16 changed files with 34 additions and 140 deletions
Download Patch File Download Diff File Expand all files Collapse all files

55
sound/soc/codecs/cs42l52.c
View File

@ -110,58 +110,7 @@ static const struct reg_default cs42l52_reg_defaults[] = {
static bool cs42l52_readable_register(struct device *dev, unsigned int reg)
{
switch (reg) {
case CS42L52_CHIP:
case CS42L52_PWRCTL1:
case CS42L52_PWRCTL2:
case CS42L52_PWRCTL3:
case CS42L52_CLK_CTL:
case CS42L52_IFACE_CTL1:
case CS42L52_IFACE_CTL2:
case CS42L52_ADC_PGA_A:
case CS42L52_ADC_PGA_B:
case CS42L52_ANALOG_HPF_CTL:
case CS42L52_ADC_HPF_FREQ:
case CS42L52_ADC_MISC_CTL:
case CS42L52_PB_CTL1:
case CS42L52_MISC_CTL:
case CS42L52_PB_CTL2:
case CS42L52_MICA_CTL:
case CS42L52_MICB_CTL:
case CS42L52_PGAA_CTL:
case CS42L52_PGAB_CTL:
case CS42L52_PASSTHRUA_VOL:
case CS42L52_PASSTHRUB_VOL:
case CS42L52_ADCA_VOL:
case CS42L52_ADCB_VOL:
case CS42L52_ADCA_MIXER_VOL:
case CS42L52_ADCB_MIXER_VOL:
case CS42L52_PCMA_MIXER_VOL:
case CS42L52_PCMB_MIXER_VOL:
case CS42L52_BEEP_FREQ:
case CS42L52_BEEP_VOL:
case CS42L52_BEEP_TONE_CTL:
case CS42L52_TONE_CTL:
case CS42L52_MASTERA_VOL:
case CS42L52_MASTERB_VOL:
case CS42L52_HPA_VOL:
case CS42L52_HPB_VOL:
case CS42L52_SPKA_VOL:
case CS42L52_SPKB_VOL:
case CS42L52_ADC_PCM_MIXER:
case CS42L52_LIMITER_CTL1:
case CS42L52_LIMITER_CTL2:
case CS42L52_LIMITER_AT_RATE:
case CS42L52_ALC_CTL:
case CS42L52_ALC_RATE:
case CS42L52_ALC_THRESHOLD:
case CS42L52_NOISE_GATE_CTL:
case CS42L52_CLK_STATUS:
case CS42L52_BATT_COMPEN:
case CS42L52_BATT_LEVEL:
case CS42L52_SPK_STATUS:
case CS42L52_TEM_CTL:
case CS42L52_THE_FOLDBACK:
case CS42L52_CHARGE_PUMP:
case CS42L52_CHIP ... CS42L52_CHARGE_PUMP:
return true;
default:
return false;
@ -919,7 +868,7 @@ static int cs42l52_set_bias_level(struct snd_soc_codec *codec,
SNDRV_PCM_FMTBIT_S20_3LE | SNDRV_PCM_FMTBIT_U20_3LE | \
SNDRV_PCM_FMTBIT_S24_LE | SNDRV_PCM_FMTBIT_U24_LE)
static struct snd_soc_dai_ops cs42l52_ops = {
static const struct snd_soc_dai_ops cs42l52_ops = {
.hw_params = cs42l52_pcm_hw_params,
.digital_mute = cs42l52_digital_mute,
.set_fmt = cs42l52_set_fmt,