Skip to content

Commit aa78570

Browse files
stevesleebroonie
authored andcommitted
ASoC: max98390: Update dsm init sequence and condition.
Modify dsm_init sequence and dsm param bin check condition. - Move dsm_init() to after amp init setting to make sure dsm init is last setting. - dsm param bin check condition changed for extended register setting. Signed-off-by: Steve Lee <[email protected]> Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Mark Brown <[email protected]>
1 parent cc4d8ce commit aa78570

File tree

1 file changed

+3
-3
lines changed

1 file changed

+3
-3
lines changed

sound/soc/codecs/max98390.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -790,7 +790,7 @@ static int max98390_dsm_init(struct snd_soc_component *component)
790790
param_start_addr = (dsm_param[0] & 0xff) | (dsm_param[1] & 0xff) << 8;
791791
param_size = (dsm_param[2] & 0xff) | (dsm_param[3] & 0xff) << 8;
792792
if (param_size > MAX98390_DSM_PARAM_MAX_SIZE ||
793-
param_start_addr < DSM_STBASS_HPF_B0_BYTE0 ||
793+
param_start_addr < MAX98390_IRQ_CTRL ||
794794
fw->size < param_size + MAX98390_DSM_PAYLOAD_OFFSET) {
795795
dev_err(component->dev,
796796
"param fw is invalid.\n");
@@ -864,11 +864,11 @@ static int max98390_probe(struct snd_soc_component *component)
864864
regmap_write(max98390->regmap, MAX98390_SOFTWARE_RESET, 0x01);
865865
/* Sleep reset settle time */
866866
msleep(20);
867-
/* Update dsm bin param */
868-
max98390_dsm_init(component);
869867

870868
/* Amp init setting */
871869
max98390_init_regs(component);
870+
/* Update dsm bin param */
871+
max98390_dsm_init(component);
872872

873873
/* Dsm Setting */
874874
if (max98390->ref_rdc_value) {

0 commit comments

Comments
 (0)