Merge remote-tracking branch 'asoc/topic/arizona' into asoc-next

diff --combined sound/soc/codecs/arizona.c
index 054967d8bac2f6d089214e390b1bd6ce416f64b2,bf6844389ebfcce8d9a41628562625cd6afadd80..87cfaa3a6f0e512b56fb6a83182fdea7876a8e8f
--- 1/sound/soc/codecs/arizona.c
--- 2/sound/soc/codecs/arizona.c
+++ b/sound/soc/codecs/arizona.c
@@@ -268,7 -268,7 +268,7 @@@ EXPORT_SYMBOL_GPL(arizona_out_ev)
  static unsigned int arizona_sysclk_48k_rates[] = {
        6144000,
        12288000,
 -      22579200,
 +      24576000,
        49152000,
        73728000,
        98304000,
@@@ -278,7 -278,7 +278,7 @@@
  static unsigned int arizona_sysclk_44k1_rates[] = {
        5644800,
        11289600,
 -      24576000,
 +      22579200,
        45158400,
        67737600,
        90316800,
@@@ -380,6 -380,18 +380,18 @@@ int arizona_set_sysclk(struct snd_soc_c
        case 49152000:
                val |= 3 << ARIZONA_SYSCLK_FREQ_SHIFT;
                break;
+       case 67737600:
+       case 73728000:
+               val |= 4 << ARIZONA_SYSCLK_FREQ_SHIFT;
+               break;
+       case 90316800:
+       case 98304000:
+               val |= 5 << ARIZONA_SYSCLK_FREQ_SHIFT;
+               break;
+       case 135475200:
+       case 147456000:
+               val |= 6 << ARIZONA_SYSCLK_FREQ_SHIFT;
+               break;
        default:
                return -EINVAL;
        }
@@@ -925,6 -937,9 +937,9 @@@ int arizona_set_fll(struct arizona_fll 
        bool ena;
        int ret;
  
+       if (fll->fref == Fref && fll->fout == Fout)
+               return 0;
+ 
        ret = regmap_read(arizona->regmap, fll->base + 1, &reg);
        if (ret != 0) {
                arizona_fll_err(fll, "Failed to read current state: %d\n",
@@@ -970,6 -985,9 +985,9 @@@
                if (ena)
                        pm_runtime_put_autosuspend(arizona->dev);
  
+               fll->fref = Fref;
+               fll->fout = Fout;
+ 
                return 0;
        }
  
@@@ -1002,6 -1020,9 +1020,9 @@@
        if (ret == 0)
                arizona_fll_warn(fll, "Timed out waiting for lock\n");
  
+       fll->fref = Fref;
+       fll->fout = Fout;
+ 
        return 0;
  }
  EXPORT_SYMBOL_GPL(arizona_set_fll);