Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 342676
b: refs/heads/master
c: 1cbe4bc
h: refs/heads/master
v: v3
  • Loading branch information
Mark Brown committed Nov 27, 2012
1 parent 5d39741 commit 8898a78
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 1 deletion.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: ba6b047ab9af433fb53939032858b196d05e6a18
refs/heads/master: 1cbe4bcae342973e36447aa03a609bc25804f416
6 changes: 6 additions & 0 deletions trunk/sound/soc/codecs/arizona.c
Original file line number Diff line number Diff line change
Expand Up @@ -937,6 +937,9 @@ int arizona_set_fll(struct arizona_fll *fll, int source,
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",
Expand Down Expand Up @@ -1014,6 +1017,9 @@ int arizona_set_fll(struct arizona_fll *fll, int source,
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);
Expand Down
2 changes: 2 additions & 0 deletions trunk/sound/soc/codecs/arizona.h
Original file line number Diff line number Diff line change
Expand Up @@ -191,6 +191,8 @@ struct arizona_fll {
unsigned int vco_mult;
struct completion lock;
struct completion ok;
unsigned int fref;
unsigned int fout;

char lock_name[ARIZONA_FLL_NAME_LEN];
char clock_ok_name[ARIZONA_FLL_NAME_LEN];
Expand Down

0 comments on commit 8898a78

Please sign in to comment.