diff options
| author | Mark Brown <broonie@kernel.org> | 2021-06-25 16:08:01 +0300 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2021-06-25 16:08:01 +0300 |
| commit | c073a58a7ec59145f8a0b87403d559645bfd9edb (patch) | |
| tree | 769095ab7e460656d6d9169c113893efb7e557b6 /sound/soc/codecs/rt715-sdca.c | |
| parent | 13311e74253fe64329390df80bed3f07314ddd61 (diff) | |
| parent | a7a0a2feb957e446b2bcf732f245ba04fc8b6314 (diff) | |
| download | linux-c073a58a7ec59145f8a0b87403d559645bfd9edb.tar.xz | |
Merge remote-tracking branch 'asoc/for-5.13' into asoc-linus
Diffstat (limited to 'sound/soc/codecs/rt715-sdca.c')
| -rw-r--r-- | sound/soc/codecs/rt715-sdca.c | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/sound/soc/codecs/rt715-sdca.c b/sound/soc/codecs/rt715-sdca.c index 7db76c19e048..66e166568c50 100644 --- a/sound/soc/codecs/rt715-sdca.c +++ b/sound/soc/codecs/rt715-sdca.c @@ -997,7 +997,7 @@ int rt715_sdca_init(struct device *dev, struct regmap *mbq_regmap, * HW init will be performed when device reports present */ rt715->hw_init = false; - rt715->first_init = false; + rt715->first_hw_init = false; ret = devm_snd_soc_register_component(dev, &soc_codec_dev_rt715_sdca, @@ -1018,7 +1018,7 @@ int rt715_sdca_io_init(struct device *dev, struct sdw_slave *slave) /* * PM runtime is only enabled when a Slave reports as Attached */ - if (!rt715->first_init) { + if (!rt715->first_hw_init) { /* set autosuspend parameters */ pm_runtime_set_autosuspend_delay(&slave->dev, 3000); pm_runtime_use_autosuspend(&slave->dev); @@ -1031,7 +1031,7 @@ int rt715_sdca_io_init(struct device *dev, struct sdw_slave *slave) pm_runtime_enable(&slave->dev); - rt715->first_init = true; + rt715->first_hw_init = true; } pm_runtime_get_noresume(&slave->dev); @@ -1054,6 +1054,9 @@ int rt715_sdca_io_init(struct device *dev, struct sdw_slave *slave) rt715_sdca_index_update_bits(rt715, RT715_VENDOR_REG, RT715_REV_1, 0x40, 0x40); } + /* DFLL Calibration trigger */ + rt715_sdca_index_update_bits(rt715, RT715_VENDOR_REG, + RT715_DFLL_VAD, 0x1, 0x1); /* trigger mode = VAD enable */ regmap_write(rt715->regmap, SDW_SDCA_CTL(FUN_MIC_ARRAY, RT715_SDCA_SMPU_TRIG_ST_EN, |