Commit d04ce411 authored by Stefan Binding's avatar Stefan Binding Committed by Takashi Iwai
Browse files

ALSA: cs35l41: Fix for old systems which do not support command 



Some older laptops using cs35l41 use firmware which does not support
the CSPL_MBOX_CMD_SPK_OUT_ENABLE command.
Firmware versions v0.28.0 and older do not support this command.

Fixes: fa3efcc3 ("ALSA: cs35l41: Use mbox command to enable speaker output for external boost")
Signed-off-by: default avatarStefan Binding <sbinding@opensource.cirrus.com>
Link: https://lore.kernel.org/r/20231117163609.823627-3-sbinding@opensource.cirrus.com


Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
parent 37f67abe

include/sound/cs35l41.h

+1 −1
Original line number Diff line number Diff line
@@ -906,6 +906,6 @@ int cs35l41_init_boost(struct device *dev, struct regmap *regmap, 
bool cs35l41_safe_reset(struct regmap *regmap, enum cs35l41_boost_type b_type);

int cs35l41_mdsync_up(struct regmap *regmap);

int cs35l41_global_enable(struct device *dev, struct regmap *regmap, enum cs35l41_boost_type b_type,

			  int enable, bool firmware_running);

			  int enable, struct cs_dsp *dsp);



#endif /* __CS35L41_H */

sound/pci/hda/cs35l41_hda.c

+2 −2
Original line number Diff line number Diff line
@@ -598,7 +598,7 @@ static void cs35l41_hda_play_done(struct device *dev) 
	dev_dbg(dev, "Play (Complete)\n");



	cs35l41_global_enable(dev, reg, cs35l41->hw_cfg.bst_type, 1,

			      cs35l41->cs_dsp.running);

			      &cs35l41->cs_dsp);

	cs35l41_mute(dev, false);

}
@@ -611,7 +611,7 @@ static void cs35l41_hda_pause_start(struct device *dev) 


	cs35l41_mute(dev, true);

	cs35l41_global_enable(dev, reg, cs35l41->hw_cfg.bst_type, 0,

			      cs35l41->cs_dsp.running);

			      &cs35l41->cs_dsp);

}



static void cs35l41_hda_pause_done(struct device *dev)

sound/soc/codecs/cs35l41-lib.c

+4 −2
Original line number Diff line number Diff line
@@ -16,6 +16,8 @@ 


#include <sound/cs35l41.h>



#define CS35L41_FIRMWARE_OLD_VERSION 0x001C00 /* v0.28.0 */



static const struct reg_default cs35l41_reg[] = {

	{ CS35L41_PWR_CTRL1,			0x00000000 },

	{ CS35L41_PWR_CTRL2,			0x00000000 },
@@ -1214,7 +1216,7 @@ EXPORT_SYMBOL_GPL(cs35l41_safe_reset); 
 * the PLL Lock interrupt, in the IRQ handler.

 */

int cs35l41_global_enable(struct device *dev, struct regmap *regmap, enum cs35l41_boost_type b_type,

			  int enable, bool firmware_running)

			  int enable, struct cs_dsp *dsp)

{

	int ret;

	unsigned int gpio1_func, pad_control, pwr_ctrl1, pwr_ctrl3, int_status, pup_pdn_mask;
@@ -1309,7 +1311,7 @@ int cs35l41_global_enable(struct device *dev, struct regmap *regmap, enum cs35l4 
			}

			regmap_write(regmap, CS35L41_IRQ1_STATUS1, CS35L41_PUP_DONE_MASK);



			if (firmware_running)

			if (dsp->running && dsp->fw_id_version > CS35L41_FIRMWARE_OLD_VERSION)

				ret = cs35l41_set_cspl_mbox_cmd(dev, regmap,

								CSPL_MBOX_CMD_SPK_OUT_ENABLE);

			else

sound/soc/codecs/cs35l41.c

+2 −2
Original line number Diff line number Diff line
@@ -519,11 +519,11 @@ static int cs35l41_main_amp_event(struct snd_soc_dapm_widget *w, 
						ARRAY_SIZE(cs35l41_pup_patch));



		ret = cs35l41_global_enable(cs35l41->dev, cs35l41->regmap, cs35l41->hw_cfg.bst_type,

					    1, cs35l41->dsp.cs_dsp.running);

					    1, &cs35l41->dsp.cs_dsp);

		break;

	case SND_SOC_DAPM_POST_PMD:

		ret = cs35l41_global_enable(cs35l41->dev, cs35l41->regmap, cs35l41->hw_cfg.bst_type,

					    0, cs35l41->dsp.cs_dsp.running);

					    0, &cs35l41->dsp.cs_dsp);



		regmap_multi_reg_write_bypassed(cs35l41->regmap,

						cs35l41_pdn_patch,