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

ASoC: cs35l56: Only patch ASP registers if the DAI is part of a DAIlink 



Move the ASP register patches to a separate struct and apply this from the
ASP DAI probe() function so that the registers are only patched if the DAI
is part of a DAI link.

Some systems use the ASP as a special-purpose interconnect and on these
systems the ASP registers are configured by a third party (the firmware,
the BIOS, or another device using the amp's secondary host control
interface).

If the machine driver does not hook up the ASP DAI then the ASP registers
must be omitted from the patch to prevent overwriting the third party
configuration.

If the machine driver includes the ASP DAI in a DAI link, this implies that
the machine driver and higher components (such as alsa-ucm) are taking
ownership of the ASP. In this case the ASP registers are patched to known
defaults and the machine driver should configure the ASP.

Signed-off-by: default avatarRichard Fitzgerald <rf@opensource.cirrus.com>
Link: https://patch.msgid.link/20260226110137.1664562-1-rf@opensource.cirrus.com


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

include/sound/cs35l56.h

+1 −0
Original line number Diff line number Diff line
@@ -406,6 +406,7 @@ extern const char * const cs35l56_cal_set_status_text[3]; 
extern const char * const cs35l56_tx_input_texts[CS35L56_NUM_INPUT_SRC];

extern const unsigned int cs35l56_tx_input_values[CS35L56_NUM_INPUT_SRC];



int cs35l56_set_asp_patch(struct cs35l56_base *cs35l56_base);

int cs35l56_set_patch(struct cs35l56_base *cs35l56_base);

int cs35l56_mbox_send(struct cs35l56_base *cs35l56_base, unsigned int command);

int cs35l56_firmware_shutdown(struct cs35l56_base *cs35l56_base);

sound/soc/codecs/cs35l56-shared.c

+15 −1
Original line number Diff line number Diff line
@@ -26,7 +26,7 @@ 


#include "cs35l56.h"



static const struct reg_sequence cs35l56_patch[] = {

static const struct reg_sequence cs35l56_asp_patch[] = {

	/*

	 * Firmware can change these to non-defaults to satisfy SDCA.

	 * Ensure that they are at known defaults.
@@ -43,6 +43,20 @@ static const struct reg_sequence cs35l56_patch[] = { 
	{ CS35L56_ASP1TX2_INPUT,		0x00000000 },

	{ CS35L56_ASP1TX3_INPUT,		0x00000000 },

	{ CS35L56_ASP1TX4_INPUT,		0x00000000 },

};



int cs35l56_set_asp_patch(struct cs35l56_base *cs35l56_base)

{

	return regmap_register_patch(cs35l56_base->regmap, cs35l56_asp_patch,

				     ARRAY_SIZE(cs35l56_asp_patch));

}

EXPORT_SYMBOL_NS_GPL(cs35l56_set_asp_patch, "SND_SOC_CS35L56_SHARED");



static const struct reg_sequence cs35l56_patch[] = {

	/*

	 * Firmware can change these to non-defaults to satisfy SDCA.

	 * Ensure that they are at known defaults.

	 */

	{ CS35L56_SWIRE_DP3_CH1_INPUT,		0x00000018 },

	{ CS35L56_SWIRE_DP3_CH2_INPUT,		0x00000019 },

	{ CS35L56_SWIRE_DP3_CH3_INPUT,		0x00000029 },

sound/soc/codecs/cs35l56.c

+8 −0
Original line number Diff line number Diff line
@@ -348,6 +348,13 @@ static int cs35l56_dsp_event(struct snd_soc_dapm_widget *w, 
	return wm_adsp_event(w, kcontrol, event);

}



static int cs35l56_asp_dai_probe(struct snd_soc_dai *codec_dai)

{

	struct cs35l56_private *cs35l56 = snd_soc_component_get_drvdata(codec_dai->component);



	return cs35l56_set_asp_patch(&cs35l56->base);

}



static int cs35l56_asp_dai_set_fmt(struct snd_soc_dai *codec_dai, unsigned int fmt)

{

	struct cs35l56_private *cs35l56 = snd_soc_component_get_drvdata(codec_dai->component);
@@ -552,6 +559,7 @@ static int cs35l56_asp_dai_set_sysclk(struct snd_soc_dai *dai, 
}



static const struct snd_soc_dai_ops cs35l56_ops = {

	.probe = cs35l56_asp_dai_probe,

	.set_fmt = cs35l56_asp_dai_set_fmt,

	.set_tdm_slot = cs35l56_asp_dai_set_tdm_slot,

	.hw_params = cs35l56_asp_dai_hw_params,