1 files changed, 28 insertions, 6 deletions

diff --git a/sound/soc/codecs/arizona.c b/sound/soc/codecs/arizona.c
index 0c05e7a7945f..9550d7433ad0 100644
--- a/sound/soc/codecs/arizona.c
+++ b/sound/soc/codecs/arizona.c
@@ -61,6 +61,11 @@
 #define ARIZONA_FLL_MIN_OUTDIV 2
 #define ARIZONA_FLL_MAX_OUTDIV 7
 
+#define ARIZONA_FMT_DSP_MODE_A          0
+#define ARIZONA_FMT_DSP_MODE_B          1
+#define ARIZONA_FMT_I2S_MODE            2
+#define ARIZONA_FMT_LEFT_JUSTIFIED_MODE 3
+
 #define arizona_fll_err(_fll, fmt, ...) \
         dev_err(_fll->arizona->dev, "FLL%d: " fmt, _fll->id, ##__VA_ARGS__)
 #define arizona_fll_warn(_fll, fmt, ...) \
@@ -648,7 +653,7 @@ SOC_ENUM_SINGLE_DECL(arizona_in_hpf_cut_enum,
 EXPORT_SYMBOL_GPL(arizona_in_hpf_cut_enum);
 
 static const char * const arizona_in_dmic_osr_text[] = {
-        "1.536MHz", "3.072MHz", "6.144MHz",
+        "1.536MHz", "3.072MHz", "6.144MHz", "768kHz",
 };
 
 const struct soc_enum arizona_in_dmic_osr[] = {
@@ -946,10 +951,26 @@ static int arizona_set_fmt(struct snd_soc_dai *dai, unsigned int fmt)
 
         switch (fmt & SND_SOC_DAIFMT_FORMAT_MASK) {
         case SND_SOC_DAIFMT_DSP_A:
-                mode = 0;
+                mode = ARIZONA_FMT_DSP_MODE_A;
+                break;
+        case SND_SOC_DAIFMT_DSP_B:
+                if ((fmt & SND_SOC_DAIFMT_MASTER_MASK)
+                                != SND_SOC_DAIFMT_CBM_CFM) {
+                        arizona_aif_err(dai, "DSP_B not valid in slave mode\n");
+                        return -EINVAL;
+                }
+                mode = ARIZONA_FMT_DSP_MODE_B;
                 break;
         case SND_SOC_DAIFMT_I2S:
-                mode = 2;
+                mode = ARIZONA_FMT_I2S_MODE;
+                break;
+        case SND_SOC_DAIFMT_LEFT_J:
+                if ((fmt & SND_SOC_DAIFMT_MASTER_MASK)
+                                != SND_SOC_DAIFMT_CBM_CFM) {
+                        arizona_aif_err(dai, "LEFT_J not valid in slave mode\n");
+                        return -EINVAL;
+                }
+                mode = ARIZONA_FMT_LEFT_JUSTIFIED_MODE;
                 break;
         default:
                 arizona_aif_err(dai, "Unsupported DAI format %d\n",
@@ -1164,13 +1185,13 @@ static void arizona_wm5102_set_dac_comp(struct snd_soc_codec *codec,
                 { 0x80, 0x0 },
         };
 
-        mutex_lock(&codec->mutex);
+        mutex_lock(&arizona->dac_comp_lock);
 
         dac_comp[1].def = arizona->dac_comp_coeff;
         if (rate >= 176400)
                 dac_comp[2].def = arizona->dac_comp_enabled;
 
-        mutex_unlock(&codec->mutex);
+        mutex_unlock(&arizona->dac_comp_lock);
 
         regmap_multi_reg_write(arizona->regmap,
                                dac_comp,
@@ -1298,7 +1319,8 @@ static int arizona_hw_params(struct snd_pcm_substream *substream,
 
         /* Force multiple of 2 channels for I2S mode */
         val = snd_soc_read(codec, base + ARIZONA_AIF_FORMAT);
-        if ((channels & 1) && (val & ARIZONA_AIF1_FMT_MASK)) {
+        val &= ARIZONA_AIF1_FMT_MASK;
+        if ((channels & 1) && (val == ARIZONA_FMT_I2S_MODE)) {
                 arizona_aif_dbg(dai, "Forcing stereo mode\n");
                 bclk_target /= channels;
                 bclk_target *= channels + 1;