torvalds/linux
torvalds/linux
2
0
Fork 0
mirror of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git synced 2025-09-04 20:19:47 +08:00
Code

ASoC: cs35l56: Handle new algorithms IDs for CS35L63

Browse Source 
CS35L63 uses different algorithm IDs from CS35L56.
Add a new mechanism to handle different alg IDs between parts in the
CS35L56 driver.

Fixes: 978858791c ("ASoC: cs35l56: Add initial support for CS35L63 for I2C and SoundWire")

Signed-off-by: Richard Fitzgerald <rf@opensource.cirrus.com>
Signed-off-by: Stefan Binding <sbinding@opensource.cirrus.com>
Link: https://patch.msgid.link/20250820142209.127575-3-sbinding@opensource.cirrus.com
Signed-off-by: Mark Brown <broonie@kernel.org>
This commit is contained in:
Richard Fitzgerald 2025-08-20 15:22:01 +01:00 committed by Mark Brown
parent f135fb24ef
commit 8dadc11b67
No known key found for this signature in database
GPG Key ID: 24D68B725D5487D0
3 changed files with 28 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
include/sound/cs35l56.h
View File

@ -306,6 +306,7 @@ struct cs35l56_base {
struct gpio_desc *reset_gpio; struct gpio_desc *reset_gpio;
struct cs35l56_spi_payload *spi_payload_buf; struct cs35l56_spi_payload *spi_payload_buf;
const struct cs35l56_fw_reg *fw_reg; const struct cs35l56_fw_reg *fw_reg;
const struct cirrus_amp_cal_controls *calibration_controls;
}; };
static inline bool cs35l56_is_otp_register(unsigned int reg) static inline bool cs35l56_is_otp_register(unsigned int reg)

29
sound/soc/codecs/cs35l56-shared.c
View File

@ -838,6 +838,15 @@ const struct cirrus_amp_cal_controls cs35l56_calibration_controls = {
}; };
EXPORT_SYMBOL_NS_GPL(cs35l56_calibration_controls, "SND_SOC_CS35L56_SHARED"); EXPORT_SYMBOL_NS_GPL(cs35l56_calibration_controls, "SND_SOC_CS35L56_SHARED");
static const struct cirrus_amp_cal_controls cs35l63_calibration_controls = {
.alg_id = 0xbf210,
.mem_region = WMFW_ADSP2_YM,
.ambient = "CAL_AMBIENT",
.calr = "CAL_R",
.status = "CAL_STATUS",
.checksum = "CAL_CHECKSUM",
};
int cs35l56_get_calibration(struct cs35l56_base *cs35l56_base) int cs35l56_get_calibration(struct cs35l56_base *cs35l56_base)
{ {
u64 silicon_uid = 0; u64 silicon_uid = 0;
@ -912,19 +921,31 @@ EXPORT_SYMBOL_NS_GPL(cs35l56_read_prot_status, "SND_SOC_CS35L56_SHARED");
void cs35l56_log_tuning(struct cs35l56_base *cs35l56_base, struct cs_dsp *cs_dsp) void cs35l56_log_tuning(struct cs35l56_base *cs35l56_base, struct cs_dsp *cs_dsp)
{ {
__be32 pid, sid, tid; __be32 pid, sid, tid;
unsigned int alg_id;
int ret; int ret;
switch (cs35l56_base->type) {
case 0x54:
case 0x56:
case 0x57:
alg_id = 0x9f212;
break;
default:
alg_id = 0xbf212;
break;
}
scoped_guard(mutex, &cs_dsp->pwr_lock) { scoped_guard(mutex, &cs_dsp->pwr_lock) {
ret = cs_dsp_coeff_read_ctrl(cs_dsp_get_ctl(cs_dsp, "AS_PRJCT_ID", ret = cs_dsp_coeff_read_ctrl(cs_dsp_get_ctl(cs_dsp, "AS_PRJCT_ID",
WMFW_ADSP2_XM, 0x9f212), WMFW_ADSP2_XM, alg_id),
0, &pid, sizeof(pid)); 0, &pid, sizeof(pid));
if (!ret) if (!ret)
ret = cs_dsp_coeff_read_ctrl(cs_dsp_get_ctl(cs_dsp, "AS_CHNNL_ID", ret = cs_dsp_coeff_read_ctrl(cs_dsp_get_ctl(cs_dsp, "AS_CHNNL_ID",
WMFW_ADSP2_XM, 0x9f212), WMFW_ADSP2_XM, alg_id),
0, &sid, sizeof(sid)); 0, &sid, sizeof(sid));
if (!ret) if (!ret)
ret = cs_dsp_coeff_read_ctrl(cs_dsp_get_ctl(cs_dsp, "AS_SNPSHT_ID", ret = cs_dsp_coeff_read_ctrl(cs_dsp_get_ctl(cs_dsp, "AS_SNPSHT_ID",
WMFW_ADSP2_XM, 0x9f212), WMFW_ADSP2_XM, alg_id),
0, &tid, sizeof(tid)); 0, &tid, sizeof(tid));
} }
@ -974,8 +995,10 @@ int cs35l56_hw_init(struct cs35l56_base *cs35l56_base)
case 0x35A54: case 0x35A54:
case 0x35A56: case 0x35A56:
case 0x35A57: case 0x35A57:
cs35l56_base->calibration_controls = &cs35l56_calibration_controls;
break; break;
case 0x35A630: case 0x35A630:
cs35l56_base->calibration_controls = &cs35l63_calibration_controls;
devid = devid >> 4; devid = devid >> 4;
break; break;
default: default:

2
sound/soc/codecs/cs35l56.c
View File

@ -695,7 +695,7 @@ static int cs35l56_write_cal(struct cs35l56_private *cs35l56)
return ret; return ret;
ret = cs_amp_write_cal_coeffs(&cs35l56->dsp.cs_dsp, ret = cs_amp_write_cal_coeffs(&cs35l56->dsp.cs_dsp,
&cs35l56_calibration_controls, cs35l56->base.calibration_controls,
&cs35l56->base.cal_data); &cs35l56->base.cal_data);
wm_adsp_stop(&cs35l56->dsp); wm_adsp_stop(&cs35l56->dsp);