Unverified Commit df4167d6 authored by Richard Fitzgerald's avatar Richard Fitzgerald Committed by Mark Brown
Browse files

ASoC: cs35l56: Patch soft registers to defaults 



The soft (firmware) registers for volume/mute/posture are not reset by
a chip soft-reset, so use a regmap patch to set them to defaults.

cs35l56_reread_firmware_registers() has been removed. Its intent was to
use whatever the firmware set as a default. But the driver now patches the
defaults to the registers.

Signed-off-by: default avatarRichard Fitzgerald <rf@opensource.cirrus.com>
Link: https://lore.kernel.org/r/20230718144625.39634-1-rf@opensource.cirrus.com


Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent 4da4a746

include/sound/cs35l56.h

+1 −1
Original line number Diff line number Diff line
@@ -260,7 +260,7 @@ extern const struct cs_dsp_region cs35l56_dsp1_regions[CS35L56_NUM_DSP_REGIONS]; 
extern const char * const cs35l56_tx_input_texts[CS35L56_NUM_INPUT_SRC];

extern const unsigned int cs35l56_tx_input_values[CS35L56_NUM_INPUT_SRC];



void cs35l56_reread_firmware_registers(struct device *dev, struct regmap *regmap);

int cs35l56_set_patch(struct regmap *regmap);

int cs35l56_get_bclk_freq_id(unsigned int freq);

void cs35l56_fill_supply_names(struct regulator_bulk_data *data);

sound/soc/codecs/cs35l56-shared.c

+16 −22
Original line number Diff line number Diff line
@@ -11,6 +11,19 @@ 


#include "cs35l56.h"



static const struct reg_sequence cs35l56_patch[] = {

	/* These are not reset by a soft-reset, so patch to defaults. */

	{ CS35L56_MAIN_RENDER_USER_MUTE,	0x00000000 },

	{ CS35L56_MAIN_RENDER_USER_VOLUME,	0x00000000 },

	{ CS35L56_MAIN_POSTURE_NUMBER,		0x00000000 },

};



int cs35l56_set_patch(struct regmap *regmap)

{

	return regmap_register_patch(regmap, cs35l56_patch, ARRAY_SIZE(cs35l56_patch));

}

EXPORT_SYMBOL_NS_GPL(cs35l56_set_patch, SND_SOC_CS35L56_SHARED);



static const struct reg_default cs35l56_reg_defaults[] = {

	{ CS35L56_ASP1_ENABLES1,		0x00000000 },

	{ CS35L56_ASP1_CONTROL1,		0x00000028 },
@@ -35,9 +48,9 @@ static const struct reg_default cs35l56_reg_defaults[] = { 
	{ CS35L56_IRQ1_MASK_8,			0xfc000fff },

	{ CS35L56_IRQ1_MASK_18,			0x1f7df0ff },

	{ CS35L56_IRQ1_MASK_20,			0x15c00000 },

	/* CS35L56_MAIN_RENDER_USER_MUTE - soft register, no default	*/

	/* CS35L56_MAIN_RENDER_USER_VOLUME - soft register, no default	*/

	/* CS35L56_MAIN_POSTURE_NUMBER - soft register, no default	*/

	{ CS35L56_MAIN_RENDER_USER_MUTE,	0x00000000 },

	{ CS35L56_MAIN_RENDER_USER_VOLUME,	0x00000000 },

	{ CS35L56_MAIN_POSTURE_NUMBER,		0x00000000 },

};



static bool cs35l56_is_dsp_memory(unsigned int reg)
@@ -181,25 +194,6 @@ static bool cs35l56_volatile_reg(struct device *dev, unsigned int reg) 
	}

}



static const u32 cs35l56_firmware_registers[] = {

	CS35L56_MAIN_RENDER_USER_MUTE,

	CS35L56_MAIN_RENDER_USER_VOLUME,

	CS35L56_MAIN_POSTURE_NUMBER,

};



void cs35l56_reread_firmware_registers(struct device *dev, struct regmap *regmap)

{

	int i;

	unsigned int val;



	for (i = 0; i < ARRAY_SIZE(cs35l56_firmware_registers); i++) {

		regmap_read(regmap, cs35l56_firmware_registers[i], &val);

		dev_dbg(dev, "%s: %d: %#x: %#x\n", __func__,

			i, cs35l56_firmware_registers[i], val);

	}

}

EXPORT_SYMBOL_NS_GPL(cs35l56_reread_firmware_registers, SND_SOC_CS35L56_SHARED);



const struct cs_dsp_region cs35l56_dsp1_regions[] = {

	{ .type = WMFW_HALO_PM_PACKED,	.base = CS35L56_DSP1_PMEM_0 },

	{ .type = WMFW_HALO_XM_PACKED,	.base = CS35L56_DSP1_XMEM_PACKED_0 },

sound/soc/codecs/cs35l56.c

+3 −2
Original line number Diff line number Diff line
@@ -1572,8 +1572,9 @@ int cs35l56_init(struct cs35l56_private *cs35l56) 
	if (ret)

		return ret;



	/* Populate soft registers in the regmap cache */

	cs35l56_reread_firmware_registers(cs35l56->dev, cs35l56->regmap);

	ret = cs35l56_set_patch(cs35l56->regmap);

	if (ret)

		return ret;



	/* Registers could be dirty after soft reset or SoundWire enumeration */

	regcache_sync(cs35l56->regmap);