aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--sound/soc/codecs/arizona.c8
-rw-r--r--sound/soc/codecs/arizona.h1
2 files changed, 5 insertions, 4 deletions
diff --git a/sound/soc/codecs/arizona.c b/sound/soc/codecs/arizona.c
index 2bebfae3485f..6837863b582d 100644
--- a/sound/soc/codecs/arizona.c
+++ b/sound/soc/codecs/arizona.c
@@ -1185,7 +1185,7 @@ int arizona_set_fll(struct arizona_fll *fll, int source,
1185 int ret; 1185 int ret;
1186 1186
1187 if (fll->ref_src < 0 || fll->ref_src == source) { 1187 if (fll->ref_src < 0 || fll->ref_src == source) {
1188 if (fll->sync_src == -1 && 1188 if (fll->sync_src == ARIZONA_FLL_SRC_NONE &&
1189 fll->ref_src == source && fll->ref_freq == Fref && 1189 fll->ref_src == source && fll->ref_freq == Fref &&
1190 fll->fout == Fout) 1190 fll->fout == Fout)
1191 return 0; 1191 return 0;
@@ -1196,7 +1196,7 @@ int arizona_set_fll(struct arizona_fll *fll, int source,
1196 return ret; 1196 return ret;
1197 } 1197 }
1198 1198
1199 fll->sync_src = -1; 1199 fll->sync_src = ARIZONA_FLL_SRC_NONE;
1200 fll->ref_src = source; 1200 fll->ref_src = source;
1201 fll->ref_freq = Fref; 1201 fll->ref_freq = Fref;
1202 } else { 1202 } else {
@@ -1240,7 +1240,7 @@ int arizona_init_fll(struct arizona *arizona, int id, int base, int lock_irq,
1240 fll->id = id; 1240 fll->id = id;
1241 fll->base = base; 1241 fll->base = base;
1242 fll->arizona = arizona; 1242 fll->arizona = arizona;
1243 fll->sync_src = -1; 1243 fll->sync_src = ARIZONA_FLL_SRC_NONE;
1244 1244
1245 /* Configure default refclk to 32kHz if we have one */ 1245 /* Configure default refclk to 32kHz if we have one */
1246 regmap_read(arizona->regmap, ARIZONA_CLOCK_32K_1, &val); 1246 regmap_read(arizona->regmap, ARIZONA_CLOCK_32K_1, &val);
@@ -1250,7 +1250,7 @@ int arizona_init_fll(struct arizona *arizona, int id, int base, int lock_irq,
1250 fll->ref_src = val & ARIZONA_CLK_32K_SRC_MASK; 1250 fll->ref_src = val & ARIZONA_CLK_32K_SRC_MASK;
1251 break; 1251 break;
1252 default: 1252 default:
1253 fll->ref_src = -1; 1253 fll->ref_src = ARIZONA_FLL_SRC_NONE;
1254 } 1254 }
1255 fll->ref_freq = 32768; 1255 fll->ref_freq = 32768;
1256 1256
diff --git a/sound/soc/codecs/arizona.h b/sound/soc/codecs/arizona.h
index f2ca41f8dc83..3f84943b23bf 100644
--- a/sound/soc/codecs/arizona.h
+++ b/sound/soc/codecs/arizona.h
@@ -32,6 +32,7 @@
32#define ARIZONA_CLK_SRC_AIF2BCLK 0x9 32#define ARIZONA_CLK_SRC_AIF2BCLK 0x9
33#define ARIZONA_CLK_SRC_AIF3BCLK 0xa 33#define ARIZONA_CLK_SRC_AIF3BCLK 0xa
34 34
35#define ARIZONA_FLL_SRC_NONE -1
35#define ARIZONA_FLL_SRC_MCLK1 0 36#define ARIZONA_FLL_SRC_MCLK1 0
36#define ARIZONA_FLL_SRC_MCLK2 1 37#define ARIZONA_FLL_SRC_MCLK2 1
37#define ARIZONA_FLL_SRC_SLIMCLK 3 38#define ARIZONA_FLL_SRC_SLIMCLK 3