Merge tag 'asoc-v3.15' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-next

ASoC: Updates for v3.15

Quite a busy release for ASoC this time, more on janitorial work than
exciting new features but welcome nontheless:

 - Lots of cleanups from Takashi for enumerations; the original API for
   these was error prone so he's refactored lots of code to use more
   modern APIs which avoid issues.
 - Elimination of the ASoC level wrappers for I2C and SPI moving us
   closer to converting to regmap completely and avoiding some
   randconfig hassle.
 - Provide both manually and transparently locked DAPM APIs rather than
   a mix of the two fixing some concurrency issues.
 - Start converting CODEC drivers to use separate bus interface drivers
   rather than having them all in one file helping avoid dependency
   issues.
 - DPCM support for Intel Haswell and Bay Trail platforms.
 - Lots of work on improvements for simple-card, DaVinci and the Renesas
   rcar drivers.
 - New drivers for Analog Devices ADAU1977, TI PCM512x and parts of the
   CSR SiRF SoC.

1 files changed, 37 insertions, 64 deletions

diff --git a/sound/soc/codecs/twl4030.c b/sound/soc/codecs/twl4030.c
index 00665ada23e2..975e0f760ac1 100644
--- a/sound/soc/codecs/twl4030.c
+++ b/sound/soc/codecs/twl4030.c
@@ -415,10 +415,9 @@ static const struct snd_kcontrol_new twl4030_dapm_carkitr_controls[] = {
 static const char *twl4030_handsfreel_texts[] =
                 {"Voice", "AudioL1", "AudioL2", "AudioR2"};
 
-static const struct soc_enum twl4030_handsfreel_enum =
-        SOC_ENUM_SINGLE(TWL4030_REG_HFL_CTL, 0,
-                        ARRAY_SIZE(twl4030_handsfreel_texts),
-                        twl4030_handsfreel_texts);
+static SOC_ENUM_SINGLE_DECL(twl4030_handsfreel_enum,
+                            TWL4030_REG_HFL_CTL, 0,
+                            twl4030_handsfreel_texts);
 
 static const struct snd_kcontrol_new twl4030_dapm_handsfreel_control =
 SOC_DAPM_ENUM("Route", twl4030_handsfreel_enum);
@@ -431,10 +430,9 @@ static const struct snd_kcontrol_new twl4030_dapm_handsfreelmute_control =
 static const char *twl4030_handsfreer_texts[] =
                 {"Voice", "AudioR1", "AudioR2", "AudioL2"};
 
-static const struct soc_enum twl4030_handsfreer_enum =
-        SOC_ENUM_SINGLE(TWL4030_REG_HFR_CTL, 0,
-                        ARRAY_SIZE(twl4030_handsfreer_texts),
-                        twl4030_handsfreer_texts);
+static SOC_ENUM_SINGLE_DECL(twl4030_handsfreer_enum,
+                            TWL4030_REG_HFR_CTL, 0,
+                            twl4030_handsfreer_texts);
 
 static const struct snd_kcontrol_new twl4030_dapm_handsfreer_control =
 SOC_DAPM_ENUM("Route", twl4030_handsfreer_enum);
@@ -448,10 +446,9 @@ static const struct snd_kcontrol_new twl4030_dapm_handsfreermute_control =
 static const char *twl4030_vibra_texts[] =
                 {"AudioL1", "AudioR1", "AudioL2", "AudioR2"};
 
-static const struct soc_enum twl4030_vibra_enum =
-        SOC_ENUM_SINGLE(TWL4030_REG_VIBRA_CTL, 2,
-                        ARRAY_SIZE(twl4030_vibra_texts),
-                        twl4030_vibra_texts);
+static SOC_ENUM_SINGLE_DECL(twl4030_vibra_enum,
+                            TWL4030_REG_VIBRA_CTL, 2,
+                            twl4030_vibra_texts);
 
 static const struct snd_kcontrol_new twl4030_dapm_vibra_control =
 SOC_DAPM_ENUM("Route", twl4030_vibra_enum);
@@ -460,10 +457,9 @@ SOC_DAPM_ENUM("Route", twl4030_vibra_enum);
 static const char *twl4030_vibrapath_texts[] =
                 {"Local vibrator", "Audio"};
 
-static const struct soc_enum twl4030_vibrapath_enum =
-        SOC_ENUM_SINGLE(TWL4030_REG_VIBRA_CTL, 4,
-                        ARRAY_SIZE(twl4030_vibrapath_texts),
-                        twl4030_vibrapath_texts);
+static SOC_ENUM_SINGLE_DECL(twl4030_vibrapath_enum,
+                            TWL4030_REG_VIBRA_CTL, 4,
+                            twl4030_vibrapath_texts);
 
 static const struct snd_kcontrol_new twl4030_dapm_vibrapath_control =
 SOC_DAPM_ENUM("Route", twl4030_vibrapath_enum);
@@ -490,10 +486,9 @@ static const struct snd_kcontrol_new twl4030_dapm_analogrmic_controls[] = {
 static const char *twl4030_micpathtx1_texts[] =
                 {"Analog", "Digimic0"};
 
-static const struct soc_enum twl4030_micpathtx1_enum =
-        SOC_ENUM_SINGLE(TWL4030_REG_ADCMICSEL, 0,
-                        ARRAY_SIZE(twl4030_micpathtx1_texts),
-                        twl4030_micpathtx1_texts);
+static SOC_ENUM_SINGLE_DECL(twl4030_micpathtx1_enum,
+                            TWL4030_REG_ADCMICSEL, 0,
+                            twl4030_micpathtx1_texts);
 
 static const struct snd_kcontrol_new twl4030_dapm_micpathtx1_control =
 SOC_DAPM_ENUM("Route", twl4030_micpathtx1_enum);
@@ -502,10 +497,9 @@ SOC_DAPM_ENUM("Route", twl4030_micpathtx1_enum);
 static const char *twl4030_micpathtx2_texts[] =
                 {"Analog", "Digimic1"};
 
-static const struct soc_enum twl4030_micpathtx2_enum =
-        SOC_ENUM_SINGLE(TWL4030_REG_ADCMICSEL, 2,
-                        ARRAY_SIZE(twl4030_micpathtx2_texts),
-                        twl4030_micpathtx2_texts);
+static SOC_ENUM_SINGLE_DECL(twl4030_micpathtx2_enum,
+                            TWL4030_REG_ADCMICSEL, 2,
+                            twl4030_micpathtx2_texts);
 
 static const struct snd_kcontrol_new twl4030_dapm_micpathtx2_control =
 SOC_DAPM_ENUM("Route", twl4030_micpathtx2_enum);
@@ -955,19 +949,15 @@ static const char *twl4030_op_modes_texts[] = {
         "Option 2 (voice/audio)", "Option 1 (audio)"
 };
 
-static const struct soc_enum twl4030_op_modes_enum =
-        SOC_ENUM_SINGLE(TWL4030_REG_CODEC_MODE, 0,
-                        ARRAY_SIZE(twl4030_op_modes_texts),
-                        twl4030_op_modes_texts);
+static SOC_ENUM_SINGLE_DECL(twl4030_op_modes_enum,
+                            TWL4030_REG_CODEC_MODE, 0,
+                            twl4030_op_modes_texts);
 
 static int snd_soc_put_twl4030_opmode_enum_double(struct snd_kcontrol *kcontrol,
         struct snd_ctl_elem_value *ucontrol)
 {
         struct snd_soc_codec *codec = snd_kcontrol_chip(kcontrol);
         struct twl4030_priv *twl4030 = snd_soc_codec_get_drvdata(codec);
-        struct soc_enum *e = (struct soc_enum *)kcontrol->private_value;
-        unsigned short val;
-        unsigned short mask;
 
         if (twl4030->configured) {
                 dev_err(codec->dev,
@@ -975,19 +965,7 @@ static int snd_soc_put_twl4030_opmode_enum_double(struct snd_kcontrol *kcontrol,
                 return -EBUSY;
         }
 
-        if (ucontrol->value.enumerated.item[0] > e->max - 1)
-                return -EINVAL;
-
-        val = ucontrol->value.enumerated.item[0] << e->shift_l;
-        mask = e->mask << e->shift_l;
-        if (e->shift_l != e->shift_r) {
-                if (ucontrol->value.enumerated.item[1] > e->max - 1)
-                        return -EINVAL;
-                val |= ucontrol->value.enumerated.item[1] << e->shift_r;
-                mask |= e->mask << e->shift_r;
-        }
-
-        return snd_soc_update_bits(codec, e->reg, mask, val);
+        return snd_soc_put_enum_double(kcontrol, ucontrol);
 }
 
 /*
@@ -1044,10 +1022,9 @@ static const char *twl4030_avadc_clk_priority_texts[] = {
         "Voice high priority", "HiFi high priority"
 };
 
-static const struct soc_enum twl4030_avadc_clk_priority_enum =
-        SOC_ENUM_SINGLE(TWL4030_REG_AVADC_CTL, 2,
-                        ARRAY_SIZE(twl4030_avadc_clk_priority_texts),
-                        twl4030_avadc_clk_priority_texts);
+static SOC_ENUM_SINGLE_DECL(twl4030_avadc_clk_priority_enum,
+                            TWL4030_REG_AVADC_CTL, 2,
+                            twl4030_avadc_clk_priority_texts);
 
 static const char *twl4030_rampdelay_texts[] = {
         "27/20/14 ms", "55/40/27 ms", "109/81/55 ms", "218/161/109 ms",
@@ -1055,40 +1032,36 @@ static const char *twl4030_rampdelay_texts[] = {
         "3495/2581/1748 ms"
 };
 
-static const struct soc_enum twl4030_rampdelay_enum =
-        SOC_ENUM_SINGLE(TWL4030_REG_HS_POPN_SET, 2,
-                        ARRAY_SIZE(twl4030_rampdelay_texts),
-                        twl4030_rampdelay_texts);
+static SOC_ENUM_SINGLE_DECL(twl4030_rampdelay_enum,
+                            TWL4030_REG_HS_POPN_SET, 2,
+                            twl4030_rampdelay_texts);
 
 /* Vibra H-bridge direction mode */
 static const char *twl4030_vibradirmode_texts[] = {
         "Vibra H-bridge direction", "Audio data MSB",
 };
 
-static const struct soc_enum twl4030_vibradirmode_enum =
-        SOC_ENUM_SINGLE(TWL4030_REG_VIBRA_CTL, 5,
-                        ARRAY_SIZE(twl4030_vibradirmode_texts),
-                        twl4030_vibradirmode_texts);
+static SOC_ENUM_SINGLE_DECL(twl4030_vibradirmode_enum,
+                            TWL4030_REG_VIBRA_CTL, 5,
+                            twl4030_vibradirmode_texts);
 
 /* Vibra H-bridge direction */
 static const char *twl4030_vibradir_texts[] = {
         "Positive polarity", "Negative polarity",
 };
 
-static const struct soc_enum twl4030_vibradir_enum =
-        SOC_ENUM_SINGLE(TWL4030_REG_VIBRA_CTL, 1,
-                        ARRAY_SIZE(twl4030_vibradir_texts),
-                        twl4030_vibradir_texts);
+static SOC_ENUM_SINGLE_DECL(twl4030_vibradir_enum,
+                            TWL4030_REG_VIBRA_CTL, 1,
+                            twl4030_vibradir_texts);
 
 /* Digimic Left and right swapping */
 static const char *twl4030_digimicswap_texts[] = {
         "Not swapped", "Swapped",
 };
 
-static const struct soc_enum twl4030_digimicswap_enum =
-        SOC_ENUM_SINGLE(TWL4030_REG_MISC_SET_1, 0,
-                        ARRAY_SIZE(twl4030_digimicswap_texts),
-                        twl4030_digimicswap_texts);
+static SOC_ENUM_SINGLE_DECL(twl4030_digimicswap_enum,
+                            TWL4030_REG_MISC_SET_1, 0,
+                            twl4030_digimicswap_texts);
 
 static const struct snd_kcontrol_new twl4030_snd_controls[] = {
         /* Codec operation mode control */