diff options
| author | Charles Keepax <ckeepax@opensource.wolfsonmicro.com> | 2016-09-02 16:52:44 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2016-09-14 18:07:10 +0100 |
| commit | 62bb7104687c0ac1e85b1cf45a85a20b492b06a6 (patch) | |
| tree | 18bd30d77a705de23481ef4cbd115d5c0cea18b7 /sound/soc/codecs/arizona.c | |
| parent | 19c891924b764fe192d0ad57b7dc676316a85250 (diff) | |
| download | lwn-62bb7104687c0ac1e85b1cf45a85a20b492b06a6.tar.gz lwn-62bb7104687c0ac1e85b1cf45a85a20b492b06a6.zip | |
ASoC: arizona: Allow specification of base for arizona_is_enabled_fll
In preparation for future improvements allow a base to be passed to
arizona_is_enabled_fll, this will allow it to be used to check the state
of the synchroniser path as well.
Signed-off-by: Charles Keepax <ckeepax@opensource.wolfsonmicro.com>
Signed-off-by: Mark Brown <broonie@kernel.org>
Diffstat (limited to 'sound/soc/codecs/arizona.c')
| -rw-r--r-- | sound/soc/codecs/arizona.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sound/soc/codecs/arizona.c b/sound/soc/codecs/arizona.c index ecfdbfcae366..5455d0e87f0f 100644 --- a/sound/soc/codecs/arizona.c +++ b/sound/soc/codecs/arizona.c @@ -2188,13 +2188,13 @@ static void arizona_apply_fll(struct arizona *arizona, unsigned int base, ARIZONA_FLL1_CTRL_UPD | cfg->n); } -static int arizona_is_enabled_fll(struct arizona_fll *fll) +static int arizona_is_enabled_fll(struct arizona_fll *fll, int base) { struct arizona *arizona = fll->arizona; unsigned int reg; int ret; - ret = regmap_read(arizona->regmap, fll->base + 1, ®); + ret = regmap_read(arizona->regmap, base + 1, ®); if (ret != 0) { arizona_fll_err(fll, "Failed to read current state: %d\n", ret); @@ -2208,7 +2208,7 @@ static int arizona_enable_fll(struct arizona_fll *fll) { struct arizona *arizona = fll->arizona; bool use_sync = false; - int already_enabled = arizona_is_enabled_fll(fll); + int already_enabled = arizona_is_enabled_fll(fll, fll->base); struct arizona_fll_cfg cfg; int i; unsigned int val; |