From: Mark Brown Date: Wed, 12 Mar 2014 23:04:22 +0000 (+0000) Subject: Merge remote-tracking branches 'asoc/topic/da7213', 'asoc/topic/da732x', 'asoc/topic... X-Git-Tag: v3.15-rc1~36^2~1^2~5^2~6 X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=commitdiff_plain;h=84f6965e2b49be82bda0cc794c9a01b8b500cb37;p=linux.git Merge remote-tracking branches 'asoc/topic/da7213', 'asoc/topic/da732x', 'asoc/topic/da9055', 'asoc/topic/davinci', 'asoc/topic/fsl', 'asoc/topic/fsl-esai', 'asoc/topic/fsl-sai' and 'asoc/topic/fsl-spdif' into asoc-next --- 84f6965e2b49be82bda0cc794c9a01b8b500cb37 diff --cc sound/soc/codecs/da732x.c index f4d965ebc29e,f295b6569910,cf9b15472c85,f295b6569910,f295b6569910,f295b6569910,f295b6569910,f295b6569910,f295b6569910..4d1c302f5a76 --- a/sound/soc/codecs/da732x.c +++ b/sound/soc/codecs/da732x.c @@@@@@@@@@ -269,81 -269,81 -269,65 -269,81 -269,81 -269,81 -269,81 -269,81 -269,81 +269,65 @@@@@@@@@@ static const char *da732x_hpf_voice[] "150Hz", "200Hz", "300Hz", "400Hz" }; -- ------static const struct soc_enum da732x_dac1_hpf_mode_enum[] = { -- ------ SOC_ENUM_SINGLE(DA732X_REG_DAC1_HPF, DA732X_HPF_MODE_SHIFT, - DA732X_HPF_MODE_MAX, da732x_hpf_mode) - }; - - static const struct soc_enum da732x_dac2_hpf_mode_enum[] = { - SOC_ENUM_SINGLE(DA732X_REG_DAC2_HPF, DA732X_HPF_MODE_SHIFT, -- ------ DA732X_HPF_MODE_MAX, da732x_hpf_mode) -- ------}; ++ ++++++static SOC_ENUM_SINGLE_DECL(da732x_dac1_hpf_mode_enum, ++ ++++++ DA732X_REG_DAC1_HPF, DA732X_HPF_MODE_SHIFT, ++ ++++++ da732x_hpf_mode); - static const struct soc_enum da732x_dac3_hpf_mode_enum[] = { - SOC_ENUM_SINGLE(DA732X_REG_DAC3_HPF, DA732X_HPF_MODE_SHIFT, - ------static const struct soc_enum da732x_dac2_hpf_mode_enum[] = { - ------ SOC_ENUM_SINGLE(DA732X_REG_DAC2_HPF, DA732X_HPF_MODE_SHIFT, -- ------ DA732X_HPF_MODE_MAX, da732x_hpf_mode) -- ------}; ++ ++++++static SOC_ENUM_SINGLE_DECL(da732x_dac2_hpf_mode_enum, ++ ++++++ DA732X_REG_DAC2_HPF, DA732X_HPF_MODE_SHIFT, ++ ++++++ da732x_hpf_mode); - static const struct soc_enum da732x_adc1_hpf_mode_enum[] = { - SOC_ENUM_SINGLE(DA732X_REG_ADC1_HPF, DA732X_HPF_MODE_SHIFT, - ------static const struct soc_enum da732x_dac3_hpf_mode_enum[] = { - ------ SOC_ENUM_SINGLE(DA732X_REG_DAC3_HPF, DA732X_HPF_MODE_SHIFT, -- ------ DA732X_HPF_MODE_MAX, da732x_hpf_mode) -- ------}; ++ ++++++static SOC_ENUM_SINGLE_DECL(da732x_dac3_hpf_mode_enum, ++ ++++++ DA732X_REG_DAC3_HPF, DA732X_HPF_MODE_SHIFT, ++ ++++++ da732x_hpf_mode); - static const struct soc_enum da732x_adc2_hpf_mode_enum[] = { - SOC_ENUM_SINGLE(DA732X_REG_ADC2_HPF, DA732X_HPF_MODE_SHIFT, - ------static const struct soc_enum da732x_adc1_hpf_mode_enum[] = { - ------ SOC_ENUM_SINGLE(DA732X_REG_ADC1_HPF, DA732X_HPF_MODE_SHIFT, -- ------ DA732X_HPF_MODE_MAX, da732x_hpf_mode) -- ------}; ++ ++++++static SOC_ENUM_SINGLE_DECL(da732x_adc1_hpf_mode_enum, ++ ++++++ DA732X_REG_ADC1_HPF, DA732X_HPF_MODE_SHIFT, ++ ++++++ da732x_hpf_mode); - static const struct soc_enum da732x_dac1_hp_filter_enum[] = { - SOC_ENUM_SINGLE(DA732X_REG_DAC1_HPF, DA732X_HPF_MUSIC_SHIFT, - DA732X_HPF_MUSIC_MAX, da732x_hpf_music) - ------static const struct soc_enum da732x_adc2_hpf_mode_enum[] = { - ------ SOC_ENUM_SINGLE(DA732X_REG_ADC2_HPF, DA732X_HPF_MODE_SHIFT, - ------ DA732X_HPF_MODE_MAX, da732x_hpf_mode) -- ------}; ++ ++++++static SOC_ENUM_SINGLE_DECL(da732x_adc2_hpf_mode_enum, ++ ++++++ DA732X_REG_ADC2_HPF, DA732X_HPF_MODE_SHIFT, ++ ++++++ da732x_hpf_mode); - static const struct soc_enum da732x_dac2_hp_filter_enum[] = { - SOC_ENUM_SINGLE(DA732X_REG_DAC2_HPF, DA732X_HPF_MUSIC_SHIFT, - ------static const struct soc_enum da732x_dac1_hp_filter_enum[] = { - ------ SOC_ENUM_SINGLE(DA732X_REG_DAC1_HPF, DA732X_HPF_MUSIC_SHIFT, -- ------ DA732X_HPF_MUSIC_MAX, da732x_hpf_music) -- ------}; ++ ++++++static SOC_ENUM_SINGLE_DECL(da732x_dac1_hp_filter_enum, ++ ++++++ DA732X_REG_DAC1_HPF, DA732X_HPF_MUSIC_SHIFT, ++ ++++++ da732x_hpf_music); - static const struct soc_enum da732x_dac3_hp_filter_enum[] = { - SOC_ENUM_SINGLE(DA732X_REG_DAC3_HPF, DA732X_HPF_MUSIC_SHIFT, - ------static const struct soc_enum da732x_dac2_hp_filter_enum[] = { - ------ SOC_ENUM_SINGLE(DA732X_REG_DAC2_HPF, DA732X_HPF_MUSIC_SHIFT, -- ------ DA732X_HPF_MUSIC_MAX, da732x_hpf_music) -- ------}; ++ ++++++static SOC_ENUM_SINGLE_DECL(da732x_dac2_hp_filter_enum, ++ ++++++ DA732X_REG_DAC2_HPF, DA732X_HPF_MUSIC_SHIFT, ++ ++++++ da732x_hpf_music); - static const struct soc_enum da732x_adc1_hp_filter_enum[] = { - SOC_ENUM_SINGLE(DA732X_REG_ADC1_HPF, DA732X_HPF_MUSIC_SHIFT, - ------static const struct soc_enum da732x_dac3_hp_filter_enum[] = { - ------ SOC_ENUM_SINGLE(DA732X_REG_DAC3_HPF, DA732X_HPF_MUSIC_SHIFT, -- ------ DA732X_HPF_MUSIC_MAX, da732x_hpf_music) -- ------}; ++ ++++++static SOC_ENUM_SINGLE_DECL(da732x_dac3_hp_filter_enum, ++ ++++++ DA732X_REG_DAC3_HPF, DA732X_HPF_MUSIC_SHIFT, ++ ++++++ da732x_hpf_music); - static const struct soc_enum da732x_adc2_hp_filter_enum[] = { - SOC_ENUM_SINGLE(DA732X_REG_ADC2_HPF, DA732X_HPF_MUSIC_SHIFT, - ------static const struct soc_enum da732x_adc1_hp_filter_enum[] = { - ------ SOC_ENUM_SINGLE(DA732X_REG_ADC1_HPF, DA732X_HPF_MUSIC_SHIFT, -- ------ DA732X_HPF_MUSIC_MAX, da732x_hpf_music) -- ------}; ++ ++++++static SOC_ENUM_SINGLE_DECL(da732x_adc1_hp_filter_enum, ++ ++++++ DA732X_REG_ADC1_HPF, DA732X_HPF_MUSIC_SHIFT, ++ ++++++ da732x_hpf_music); - static const struct soc_enum da732x_dac1_voice_filter_enum[] = { - SOC_ENUM_SINGLE(DA732X_REG_DAC1_HPF, DA732X_HPF_VOICE_SHIFT, - DA732X_HPF_VOICE_MAX, da732x_hpf_voice) - ------static const struct soc_enum da732x_adc2_hp_filter_enum[] = { - ------ SOC_ENUM_SINGLE(DA732X_REG_ADC2_HPF, DA732X_HPF_MUSIC_SHIFT, - ------ DA732X_HPF_MUSIC_MAX, da732x_hpf_music) -- ------}; ++ ++++++static SOC_ENUM_SINGLE_DECL(da732x_adc2_hp_filter_enum, ++ ++++++ DA732X_REG_ADC2_HPF, DA732X_HPF_MUSIC_SHIFT, ++ ++++++ da732x_hpf_music); - static const struct soc_enum da732x_dac2_voice_filter_enum[] = { - SOC_ENUM_SINGLE(DA732X_REG_DAC2_HPF, DA732X_HPF_VOICE_SHIFT, - ------static const struct soc_enum da732x_dac1_voice_filter_enum[] = { - ------ SOC_ENUM_SINGLE(DA732X_REG_DAC1_HPF, DA732X_HPF_VOICE_SHIFT, -- ------ DA732X_HPF_VOICE_MAX, da732x_hpf_voice) -- ------}; ++ ++++++static SOC_ENUM_SINGLE_DECL(da732x_dac1_voice_filter_enum, ++ ++++++ DA732X_REG_DAC1_HPF, DA732X_HPF_VOICE_SHIFT, ++ ++++++ da732x_hpf_voice); - static const struct soc_enum da732x_dac3_voice_filter_enum[] = { - SOC_ENUM_SINGLE(DA732X_REG_DAC3_HPF, DA732X_HPF_VOICE_SHIFT, - ------static const struct soc_enum da732x_dac2_voice_filter_enum[] = { - ------ SOC_ENUM_SINGLE(DA732X_REG_DAC2_HPF, DA732X_HPF_VOICE_SHIFT, -- ------ DA732X_HPF_VOICE_MAX, da732x_hpf_voice) -- ------}; ++ ++++++static SOC_ENUM_SINGLE_DECL(da732x_dac2_voice_filter_enum, ++ ++++++ DA732X_REG_DAC2_HPF, DA732X_HPF_VOICE_SHIFT, ++ ++++++ da732x_hpf_voice); - static const struct soc_enum da732x_adc1_voice_filter_enum[] = { - SOC_ENUM_SINGLE(DA732X_REG_ADC1_HPF, DA732X_HPF_VOICE_SHIFT, - ------static const struct soc_enum da732x_dac3_voice_filter_enum[] = { - ------ SOC_ENUM_SINGLE(DA732X_REG_DAC3_HPF, DA732X_HPF_VOICE_SHIFT, -- ------ DA732X_HPF_VOICE_MAX, da732x_hpf_voice) -- ------}; ++ ++++++static SOC_ENUM_SINGLE_DECL(da732x_dac3_voice_filter_enum, ++ ++++++ DA732X_REG_DAC3_HPF, DA732X_HPF_VOICE_SHIFT, ++ ++++++ da732x_hpf_voice); - ------static const struct soc_enum da732x_adc1_voice_filter_enum[] = { - ------ SOC_ENUM_SINGLE(DA732X_REG_ADC1_HPF, DA732X_HPF_VOICE_SHIFT, - ------ DA732X_HPF_VOICE_MAX, da732x_hpf_voice) - ------}; - ------ -- ------static const struct soc_enum da732x_adc2_voice_filter_enum[] = { -- ------ SOC_ENUM_SINGLE(DA732X_REG_ADC2_HPF, DA732X_HPF_VOICE_SHIFT, -- ------ DA732X_HPF_VOICE_MAX, da732x_hpf_voice) -- ------}; ++ ++++++static SOC_ENUM_SINGLE_DECL(da732x_adc1_voice_filter_enum, ++ ++++++ DA732X_REG_ADC1_HPF, DA732X_HPF_VOICE_SHIFT, ++ ++++++ da732x_hpf_voice); ++ ++++++static SOC_ENUM_SINGLE_DECL(da732x_adc2_voice_filter_enum, ++ ++++++ DA732X_REG_ADC2_HPF, DA732X_HPF_VOICE_SHIFT, ++ ++++++ da732x_hpf_voice); static int da732x_hpf_set(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_value *ucontrol)