Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 62bb7104 authored by Charles Keepax's avatar Charles Keepax Committed by Mark Brown
Browse files

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: default avatarCharles Keepax <ckeepax@opensource.wolfsonmicro.com>
Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent 19c89192

sound/soc/codecs/arizona.c

+3 −3
Original line number Diff line number Diff line
@@ -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, &reg);

	ret = regmap_read(arizona->regmap, base + 1, &reg);

	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;