Merge remote-tracking branch 'asoc/fix/arizona' into asoc-arizona

Conflicts:
	sound/soc/codecs/arizona.c

diff --cc sound/soc/codecs/arizona.c
index a12dd16,ef62c43..316f074
--- 1/sound/soc/codecs/arizona.c
--- 2/sound/soc/codecs/arizona.c
+++ b/sound/soc/codecs/arizona.c
@@@ -778,7 -675,17 +778,7 @@@ static int arizona_hw_params(struct snd
                return -EINVAL;
        }
  
-       lrclk = snd_soc_params_to_bclk(params) / params_rate(params);
 -      for (i = 0; i < ARRAY_SIZE(arizona_sr_vals); i++)
 -              if (arizona_sr_vals[i] == params_rate(params))
 -                      break;
 -      if (i == ARRAY_SIZE(arizona_sr_vals)) {
 -              arizona_aif_err(dai, "Unsupported sample rate %dHz\n",
 -                              params_rate(params));
 -              return -EINVAL;
 -      }
 -      sr_val = i;
 -
+       lrclk = rates[bclk] / params_rate(params);
  
        arizona_aif_dbg(dai, "BCLK %dHz LRCLK %dHz\n",
                        rates[bclk], rates[bclk] / lrclk);