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

Commit abd7c894 authored by Adam Thomson's avatar Adam Thomson Committed by Mark Brown
Browse files

ASoC: da7219: Add regmap patch to support old silicon 



Initial silicon did not have master bias enabled by default, unlike
later HW, so use regmap patch to align with newer defaults.

Signed-off-by: default avatarAdam Thomson <Adam.Thomson.Opensource@diasemi.com>
Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent 501f72e9

sound/soc/codecs/da7219.c

+25 −1
Original line number Diff line number Diff line
@@ -1592,9 +1592,14 @@ static void da7219_handle_pdata(struct snd_soc_codec *codec) 
	}

}



static struct reg_sequence da7219_rev_aa_patch[] = {

	{ DA7219_REFERENCES, 0x08 },

};



static int da7219_probe(struct snd_soc_codec *codec)

{

	struct da7219_priv *da7219 = snd_soc_codec_get_drvdata(codec);

	unsigned int rev;

	int ret;



	mutex_init(&da7219->lock);
@@ -1604,6 +1609,26 @@ static int da7219_probe(struct snd_soc_codec *codec) 
	if (ret)

		return ret;



	ret = regmap_read(da7219->regmap, DA7219_CHIP_REVISION, &rev);

	if (ret) {

		dev_err(codec->dev, "Failed to read chip revision: %d\n", ret);

		goto err_disable_reg;

	}



	switch (rev & DA7219_CHIP_MINOR_MASK) {

	case 0:

		ret = regmap_register_patch(da7219->regmap, da7219_rev_aa_patch,

					    ARRAY_SIZE(da7219_rev_aa_patch));

		if (ret) {

			dev_err(codec->dev, "Failed to register AA patch: %d\n",

				ret);

			goto err_disable_reg;

		}

		break;

	default:

		break;

	}



	/* Handle DT/Platform data */

	if (codec->dev->of_node)

		da7219->pdata = da7219_of_to_pdata(codec);
@@ -1774,7 +1799,6 @@ static struct reg_default da7219_reg_defaults[] = { 
	{ DA7219_MIXOUT_R_CTRL, 0x10 },

	{ DA7219_CHIP_ID1, 0x23 },

	{ DA7219_CHIP_ID2, 0x93 },

	{ DA7219_CHIP_REVISION, 0x00 },

	{ DA7219_IO_CTRL, 0x00 },

	{ DA7219_GAIN_RAMP_CTRL, 0x00 },

	{ DA7219_PC_COUNT, 0x02 },