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

Commit ae70b190 authored by Lars-Peter Clausen's avatar Lars-Peter Clausen Committed by Mark Brown
Browse files

ASoC: ab8500-codec: Revert back to regmap 



Commit ff795d61 ("ASoC: ab8500: Convert register I/O to regmap")
initially converted the ab8500 CODEC driver to use regmap rather than
legacy ASoC IO. This was reverted though in commit 63e6d43b ("ASoC:
ab8500: Revert to using custom I/O functions") since the inital conversion
was not working properly. This was presumebly because the SOC_SINGLE_XR_SX
controls, which are used by this driver, did not properly support regmap at
that point. This has since been fixed in commit 6137a5ca ("ASoC: Prepare
SOC_SINGLE_XR_SX controls for regmap"). So revert back to regmap again.

Signed-off-by: default avatarLars-Peter Clausen <lars@metafoo.de>
Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent 6391fffb

sound/soc/codecs/ab8500-codec.c

+28 −34
Original line number Diff line number Diff line
@@ -125,6 +125,8 @@ struct ab8500_codec_drvdata_dbg { 


/* Private data for AB8500 device-driver */

struct ab8500_codec_drvdata {

	struct regmap *regmap;



	/* Sidetone */

	long *sid_fir_values;

	enum sid_state sid_status;
@@ -165,49 +167,35 @@ static inline const char *amic_type_str(enum amic_type type) 
 */



/* Read a register from the audio-bank of AB8500 */

static unsigned int ab8500_codec_read_reg(struct snd_soc_codec *codec,

					unsigned int reg)

static int ab8500_codec_read_reg(void *context, unsigned int reg,

				 unsigned int *value)

{

	struct device *dev = context;

	int status;

	unsigned int value = 0;



	u8 value8;

	status = abx500_get_register_interruptible(codec->dev, AB8500_AUDIO,

	status = abx500_get_register_interruptible(dev, AB8500_AUDIO,

						   reg, &value8);

	if (status < 0) {

		dev_err(codec->dev,

			"%s: ERROR: Register (0x%02x:0x%02x) read failed (%d).\n",

			__func__, (u8)AB8500_AUDIO, (u8)reg, status);

	} else {

		dev_dbg(codec->dev,

			"%s: Read 0x%02x from register 0x%02x:0x%02x\n",

			__func__, value8, (u8)AB8500_AUDIO, (u8)reg);

		value = (unsigned int)value8;

	}

	*value = (unsigned int)value8;



	return value;

	return status;

}



/* Write to a register in the audio-bank of AB8500 */

static int ab8500_codec_write_reg(struct snd_soc_codec *codec,

				unsigned int reg, unsigned int value)

static int ab8500_codec_write_reg(void *context, unsigned int reg,

				  unsigned int value)

{

	int status;

	struct device *dev = context;



	status = abx500_set_register_interruptible(codec->dev, AB8500_AUDIO,

	return abx500_set_register_interruptible(dev, AB8500_AUDIO,

						 reg, value);

	if (status < 0)

		dev_err(codec->dev,

			"%s: ERROR: Register (%02x:%02x) write failed (%d).\n",

			__func__, (u8)AB8500_AUDIO, (u8)reg, status);

	else

		dev_dbg(codec->dev,

			"%s: Wrote 0x%02x into register %02x:%02x\n",

			__func__, (u8)value, (u8)AB8500_AUDIO, (u8)reg);



	return status;

}



static const struct regmap_config ab8500_codec_regmap = {

	.reg_read = ab8500_codec_read_reg,

	.reg_write = ab8500_codec_write_reg,

};



/*

 * Controls - DAPM

 */
@@ -2564,9 +2552,6 @@ static int ab8500_codec_probe(struct snd_soc_codec *codec) 


static struct snd_soc_codec_driver ab8500_codec_driver = {

	.probe =		ab8500_codec_probe,

	.read =			ab8500_codec_read_reg,

	.write =		ab8500_codec_write_reg,

	.reg_word_size =	sizeof(u8),

	.controls =		ab8500_ctrls,

	.num_controls =		ARRAY_SIZE(ab8500_ctrls),

	.dapm_widgets =		ab8500_dapm_widgets,
@@ -2591,6 +2576,15 @@ static int ab8500_codec_driver_probe(struct platform_device *pdev) 
	drvdata->anc_status = ANC_UNCONFIGURED;

	dev_set_drvdata(&pdev->dev, drvdata);



	drvdata->regmap = devm_regmap_init(&pdev->dev, NULL, &pdev->dev,

					   &ab8500_codec_regmap);

	if (IS_ERR(drvdata->regmap)) {

		status = PTR_ERR(drvdata->regmap);

		dev_err(&pdev->dev, "%s: Failed to allocate regmap: %d\n",

			__func__, status);

		return status;

	}



	dev_dbg(&pdev->dev, "%s: Register codec.\n", __func__);

	status = snd_soc_register_codec(&pdev->dev, &ab8500_codec_driver,

				ab8500_codec_dai,