Merge series "ASoC: SOF: adjust dmesg verbosity" from Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>:
Decrease the dmesg verbosity to remove unnecessary logs on SoundWire
platforms, and conversely add more information to help the community
and downstream distros with HDaudio/SOF support (DMIC detection and card
instanciation are the most prevalent issues on GitHub).
Pierre-Louis Bossart (3):
ASoC: codecs: rt1308-sdw: reduce verbosity
ASoC: SOF: Intel: hda: reduce verbosity on SoundWire detection
ASoC: SOF: Intel: hda: log number of microphones detected in NHLT
tables
Ranjani Sridharan (1):
ASoC: soc-core: Add dynamic debug logs in soc_dai_link_sanity_check()
sound/soc/codecs/rt1308-sdw.c | 4 ++--
sound/soc/soc-core.c | 18 +++++++++++++++---
sound/soc/sof/intel/hda.c | 10 ++++++----
3 files changed, 23 insertions(+), 9 deletions(-)
base-commit: dd8e871d4e
--
2.20.1
This commit is contained in:
Коммит
5c5118dc5d
|
@ -235,9 +235,9 @@ static int rt1308_io_init(struct device *dev, struct sdw_slave *slave)
|
|||
efuse_c_btl_r = tmp;
|
||||
regmap_read(rt1308->regmap, 0xc872, &tmp);
|
||||
efuse_c_btl_r = efuse_c_btl_r | (tmp << 8);
|
||||
dev_info(&slave->dev, "%s m_btl_l=0x%x, m_btl_r=0x%x\n", __func__,
|
||||
dev_dbg(&slave->dev, "%s m_btl_l=0x%x, m_btl_r=0x%x\n", __func__,
|
||||
efuse_m_btl_l, efuse_m_btl_r);
|
||||
dev_info(&slave->dev, "%s c_btl_l=0x%x, c_btl_r=0x%x\n", __func__,
|
||||
dev_dbg(&slave->dev, "%s c_btl_l=0x%x, c_btl_r=0x%x\n", __func__,
|
||||
efuse_c_btl_l, efuse_c_btl_r);
|
||||
|
||||
/* initial settings */
|
||||
|
|
|
@ -863,8 +863,12 @@ static int soc_dai_link_sanity_check(struct snd_soc_card *card,
|
|||
* Defer card registration if codec component is not added to
|
||||
* component list.
|
||||
*/
|
||||
if (!soc_find_component(codec))
|
||||
if (!soc_find_component(codec)) {
|
||||
dev_dbg(card->dev,
|
||||
"ASoC: codec component %s not found for link %s\n",
|
||||
codec->name, link->name);
|
||||
return -EPROBE_DEFER;
|
||||
}
|
||||
}
|
||||
|
||||
for_each_link_platforms(link, i, platform) {
|
||||
|
@ -884,8 +888,12 @@ static int soc_dai_link_sanity_check(struct snd_soc_card *card,
|
|||
* Defer card registration if platform component is not added to
|
||||
* component list.
|
||||
*/
|
||||
if (!soc_find_component(platform))
|
||||
if (!soc_find_component(platform)) {
|
||||
dev_dbg(card->dev,
|
||||
"ASoC: platform component %s not found for link %s\n",
|
||||
platform->name, link->name);
|
||||
return -EPROBE_DEFER;
|
||||
}
|
||||
}
|
||||
|
||||
for_each_link_cpus(link, i, cpu) {
|
||||
|
@ -906,8 +914,12 @@ static int soc_dai_link_sanity_check(struct snd_soc_card *card,
|
|||
* component list.
|
||||
*/
|
||||
if ((cpu->of_node || cpu->name) &&
|
||||
!soc_find_component(cpu))
|
||||
!soc_find_component(cpu)) {
|
||||
dev_dbg(card->dev,
|
||||
"ASoC: cpu component %s not found for link %s\n",
|
||||
cpu->name, link->name);
|
||||
return -EPROBE_DEFER;
|
||||
}
|
||||
|
||||
/*
|
||||
* At least one of CPU DAI name or CPU device name/node must be
|
||||
|
|
|
@ -135,10 +135,8 @@ static int hda_sdw_acpi_scan(struct snd_sof_dev *sdev)
|
|||
hdev = sdev->pdata->hw_pdata;
|
||||
|
||||
ret = sdw_intel_acpi_scan(handle, &hdev->info);
|
||||
if (ret < 0) {
|
||||
dev_err(sdev->dev, "%s failed\n", __func__);
|
||||
if (ret < 0)
|
||||
return -EINVAL;
|
||||
}
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
@ -604,7 +602,7 @@ static int hda_init_caps(struct snd_sof_dev *sdev)
|
|||
/* scan SoundWire capabilities exposed by DSDT */
|
||||
ret = hda_sdw_acpi_scan(sdev);
|
||||
if (ret < 0) {
|
||||
dev_dbg(sdev->dev, "skipping SoundWire, ACPI scan error\n");
|
||||
dev_dbg(sdev->dev, "skipping SoundWire, not detected with ACPI scan\n");
|
||||
goto skip_soundwire;
|
||||
}
|
||||
|
||||
|
@ -1008,6 +1006,10 @@ static int hda_generic_machine_select(struct snd_sof_dev *sdev)
|
|||
if (!tplg_filename)
|
||||
return -EINVAL;
|
||||
|
||||
dev_info(bus->dev,
|
||||
"DMICs detected in NHLT tables: %d\n",
|
||||
dmic_num);
|
||||
|
||||
pdata->machine = hda_mach;
|
||||
pdata->tplg_filename = tplg_filename;
|
||||
}
|
||||
|
|
Загрузка…
Ссылка в новой задаче