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>
This commit is contained in:
parent
19c891924b
commit
62bb710468
@ -2188,13 +2188,13 @@ static void arizona_apply_fll(struct arizona *arizona, unsigned int base,
|
|||||||
ARIZONA_FLL1_CTRL_UPD | cfg->n);
|
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;
|
struct arizona *arizona = fll->arizona;
|
||||||
unsigned int reg;
|
unsigned int reg;
|
||||||
int ret;
|
int ret;
|
||||||
|
|
||||||
ret = regmap_read(arizona->regmap, fll->base + 1, ®);
|
ret = regmap_read(arizona->regmap, base + 1, ®);
|
||||||
if (ret != 0) {
|
if (ret != 0) {
|
||||||
arizona_fll_err(fll, "Failed to read current state: %d\n",
|
arizona_fll_err(fll, "Failed to read current state: %d\n",
|
||||||
ret);
|
ret);
|
||||||
@ -2208,7 +2208,7 @@ static int arizona_enable_fll(struct arizona_fll *fll)
|
|||||||
{
|
{
|
||||||
struct arizona *arizona = fll->arizona;
|
struct arizona *arizona = fll->arizona;
|
||||||
bool use_sync = false;
|
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;
|
struct arizona_fll_cfg cfg;
|
||||||
int i;
|
int i;
|
||||||
unsigned int val;
|
unsigned int val;
|
||||||
|
Loading…
Reference in New Issue
Block a user