diff options
| author | Mark Brown <broonie@kernel.org> | 2025-01-08 11:58:49 +0000 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2025-01-08 11:58:49 +0000 |
| commit | 309caeef4381e8777f65030dccabc71456650269 (patch) | |
| tree | f726473c478fca19db793ebe27a3da0162fd23bc /sound/soc/codecs | |
| parent | c51187903fe4523fd7f521662c1ae1f1f3174036 (diff) | |
| parent | 9d89551994a430b50c4fffcb1e617a057fa76e20 (diff) | |
| download | linux-309caeef4381e8777f65030dccabc71456650269.tar.gz linux-309caeef4381e8777f65030dccabc71456650269.tar.bz2 linux-309caeef4381e8777f65030dccabc71456650269.zip | |
ASoC: Merge up v6.13-rc6
This helps several of my boards in CI.
Diffstat (limited to 'sound/soc/codecs')
| -rw-r--r-- | sound/soc/codecs/rt722-sdca.c | 7 | ||||
| -rw-r--r-- | sound/soc/codecs/tas2781-i2c.c | 2 |
2 files changed, 7 insertions, 2 deletions
diff --git a/sound/soc/codecs/rt722-sdca.c b/sound/soc/codecs/rt722-sdca.c index 908846e994df..e17a142d03b9 100644 --- a/sound/soc/codecs/rt722-sdca.c +++ b/sound/soc/codecs/rt722-sdca.c @@ -1468,13 +1468,18 @@ static void rt722_sdca_jack_preset(struct rt722_sdca_priv *rt722) 0x008d); /* check HP calibration FSM status */ for (loop_check = 0; loop_check < chk_cnt; loop_check++) { + usleep_range(10000, 11000); ret = rt722_sdca_index_read(rt722, RT722_VENDOR_CALI, RT722_DAC_DC_CALI_CTL3, &calib_status); - if (ret < 0 || loop_check == chk_cnt) + if (ret < 0) dev_dbg(&rt722->slave->dev, "calibration failed!, ret=%d\n", ret); if ((calib_status & 0x0040) == 0x0) break; } + + if (loop_check == chk_cnt) + dev_dbg(&rt722->slave->dev, "%s, calibration time-out!\n", __func__); + /* Set ADC09 power entity floating control */ rt722_sdca_index_write(rt722, RT722_VENDOR_HDA_CTL, RT722_ADC0A_08_PDE_FLOAT_CTL, 0x2a12); diff --git a/sound/soc/codecs/tas2781-i2c.c b/sound/soc/codecs/tas2781-i2c.c index 7478c6b5d968..127e2be07318 100644 --- a/sound/soc/codecs/tas2781-i2c.c +++ b/sound/soc/codecs/tas2781-i2c.c @@ -370,7 +370,7 @@ static void sngl_calib_start(struct tasdevice_priv *tas_priv, int i, tasdevice_dev_read(tas_priv, i, p[j].reg, (int *)&p[j].val[0]); } else { - switch (p[j].reg) { + switch (tas2781_cali_start_reg[j].reg) { case 0: { if (!reg[0]) continue; |