Merge remote-tracking branches 'asoc/topic/da7213', 'asoc/topic/da732x', 'asoc/topic...

diff --cc sound/soc/cirrus/Kconfig
Simple merge

diff --cc sound/soc/codecs/Kconfig
Simple merge

diff --cc sound/soc/codecs/Makefile
Simple merge

diff --cc sound/soc/codecs/da732x.c
index f4d965ebc29e8320469becd09a3ac58a2668e8de,f295b65699105897743fad1ecbc4439a71e58f0e,cf9b15472c853b1962b987e54c8275d160a43eba,f295b65699105897743fad1ecbc4439a71e58f0e,f295b65699105897743fad1ecbc4439a71e58f0e,f295b65699105897743fad1ecbc4439a71e58f0e,f295b65699105897743fad1ecbc4439a71e58f0e,f295b65699105897743fad1ecbc4439a71e58f0e,f295b65699105897743fad1ecbc4439a71e58f0e..4d1c302f5a76edc06e4c1efa4fff4d3ba96818e7
--- 1/sound/soc/codecs/da732x.c
--- 2/sound/soc/codecs/da732x.c
--- 3/sound/soc/codecs/da732x.c
--- 4/sound/soc/codecs/da732x.c
--- 5/sound/soc/codecs/da732x.c
--- 6/sound/soc/codecs/da732x.c
--- 7/sound/soc/codecs/da732x.c
--- 8/sound/soc/codecs/da732x.c
--- 9/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)

diff --cc sound/soc/codecs/tlv320aic23.c
Simple merge

diff --cc sound/soc/fsl/Kconfig
Simple merge

diff --cc sound/soc/fsl/fsl_esai.c
Simple merge

diff --cc sound/soc/fsl/fsl_spdif.c
Simple merge

diff --cc sound/soc/samsung/Kconfig
Simple merge