ASoC: cs35l56: Fixes for CS35L63 for production silicon
Subsystems (3)
PATCH 1/1 ASoC: cs35l56: Fixes for CS35L63 for production silicon
Production silicon for CS36L63 has some small differences compared to pre-production silicon. This requires small fixes in driver. Update firmware addresses and remove soundwire clock workaround as no longer necessary. In addition, different calibration and tuning algorithm IDs are required for CS35L63.
--- include/sound/cs35l56.h | 5 ++- sound/soc/codecs/cs35l56-sdw.c | 69 ------------------------------- sound/soc/codecs/cs35l56-shared.c | 29 +++++++++++-- sound/soc/codecs/cs35l56.c | 2 +- 4 files changed, 30 insertions(+), 75 deletions(-)
include/sound/cs35l56.h +3 -2
@@ -107,8 +107,8 @@#define CS35L56_DSP1_PMEM_5114 0x3804FE8#define CS35L63_DSP1_FW_VER CS35L56_DSP1_FW_VER -#define CS35L63_DSP1_HALO_STATE 0x280396C -#define CS35L63_DSP1_PM_CUR_STATE 0x28042C8 +#define CS35L63_DSP1_HALO_STATE 0x2803C04 +#define CS35L63_DSP1_PM_CUR_STATE 0x2804518#define CS35L63_PROTECTION_STATUS 0x340009C#define CS35L63_TRANSDUCER_ACTUAL_PS 0x34000F4#define CS35L63_MAIN_RENDER_USER_MUTE 0x3400020
@@ -306,6 +306,7 @@ struct cs35l56_base {struct gpio_desc *reset_gpio;struct cs35l56_spi_payload *spi_payload_buf;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)
sound/soc/codecs/cs35l56-sdw.c +0 -69
81 lines not on this page · raw message
sound/soc/codecs/cs35l56-shared.c +26 -3
@@ -838,6 +838,15 @@ const struct cirrus_amp_cal_controls cs35l56_calibration_controls = { };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) {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) {__be32 pid, sid, tid; +unsigned int alg_id;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) { 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));if (!ret) 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));if (!ret) 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)); }
@@ -974,8 +995,10 @@ int cs35l56_hw_init(struct cs35l56_base *cs35l56_base)case 0x35A54 :case 0x35A56 :case 0x35A57 : + cs35l56_base->calibration_controls = &cs35l56_calibration_controls;break ;case 0x35A630 : + cs35l56_base->calibration_controls = &cs35l63_calibration_controls; devid = devid >>4 ;break ;default :
sound/soc/codecs/cs35l56.c +1 -1
@@ -695,7 +695,7 @@ static int cs35l56_write_cal(struct cs35l56_private *cs35l56)return ret; ret =cs_amp_write_cal_coeffs (&cs35l56->dsp.cs_dsp, - &cs35l56_calibration_controls, + cs35l56->base.calibration_controls, &cs35l56->base.cal_data);wm_adsp_stop (&cs35l56->dsp);
Signature · 1 line
2.43.0
Mark Brown
maintainerQuoted 5 lines · Stefan Binding
Production silicon for CS36L63 has some small differences compared to pre-production silicon. This requires small fixes in driver. Update firmware addresses and remove soundwire clock workaround as no longer necessary. In addition, different calibration and tuning algorithm IDs are required for CS35L63.
There are multiple changes in here, this should be a patch series not a single patch.
sound/soc/codecs/cs35l56-sdw.c static int cs35l56_sdw_update_status(struct sdw_slave *peripheral, · line 462
Quoted 10 lines
sound/soc/codecs/cs35l56-sdw.c +0
-10-static int cs35l56_sdw_bus_config (struct sdw_slave *peripheral, -struct sdw_bus_params *params) -{ -struct cs35l56_private *cs35l56 =dev_get_drvdata (&peripheral->dev); - -if ((cs35l56->base.type ==0x63 ) && (cs35l56->base.rev <0xa1 )) -return cs35l63_sdw_kick_divider (cs35l56, peripheral); - -return 0 ; -}
Are you *positive* there's no preproduction silicon floating about out there?