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

diff --combined sound/soc/codecs/arizona.c
index b3ea24d64c5009cf4cc77e1877c894e3f21f4ee7,5070a976adaa6030782d530fef27ffecb480161a..93b400800905d2fee18b066f11761cca524d9369
--- 1/sound/soc/codecs/arizona.c
--- 2/sound/soc/codecs/arizona.c
+++ b/sound/soc/codecs/arizona.c
@@@ -1023,18 -1023,24 +1023,18 @@@ void arizona_init_dvfs(struct arizona_p
  }
  EXPORT_SYMBOL_GPL(arizona_init_dvfs);
  
 -static unsigned int arizona_sysclk_48k_rates[] = {
 +static unsigned int arizona_opclk_ref_48k_rates[] = {
        6144000,
        12288000,
        24576000,
        49152000,
 -      73728000,
 -      98304000,
 -      147456000,
  };
  
 -static unsigned int arizona_sysclk_44k1_rates[] = {
 +static unsigned int arizona_opclk_ref_44k1_rates[] = {
        5644800,
        11289600,
        22579200,
        45158400,
 -      67737600,
 -      90316800,
 -      135475200,
  };
  
  static int arizona_set_opclk(struct snd_soc_codec *codec, unsigned int clk,
@@@ -1059,11 -1065,11 +1059,11 @@@
        }
  
        if (refclk % 8000)
 -              rates = arizona_sysclk_44k1_rates;
 +              rates = arizona_opclk_ref_44k1_rates;
        else
 -              rates = arizona_sysclk_48k_rates;
 +              rates = arizona_opclk_ref_48k_rates;
  
 -      for (ref = 0; ref < ARRAY_SIZE(arizona_sysclk_48k_rates) &&
 +      for (ref = 0; ref < ARRAY_SIZE(arizona_opclk_ref_48k_rates) &&
                     rates[ref] <= refclk; ref++) {
                div = 1;
                while (rates[ref] / div >= freq && div < 32) {
@@@ -1537,7 -1543,7 +1537,7 @@@ static int arizona_hw_params(struct snd
        bool reconfig;
        unsigned int aif_tx_state, aif_rx_state;
  
-       if (params_rate(params) % 8000)
+       if (params_rate(params) % 4000)
                rates = &arizona_44k1_bclk_rates[0];
        else
                rates = &arizona_48k_bclk_rates[0];