Skip to content

Commit 01ad278

Browse files
committed
ASoC: fsl_easrc: Fix duplicate debufs entries
Merge series from Alexander Stein <alexander.stein@ew.tq-group.com>: this series fixes the error regarding duplicate debugfs directory creation on TQMa8MPxL (imx8mp) when easrc is enabled: debugfs: '30c90000.easrc' already exists in 'tqm-tlv320aic32' This is caused because fsl_easrc adds two components which use the device name as component name. Debugfs directories for each component is created, resulting on name conflict. Fix this by adding the debugfs_prefix for both component drivers. Before: $ ls /sys/kernel/debug/asoc/tqm-tlv320aic32/ 30c30000.sai 30c90000.easrc HiFi-ASRC-FE dapm dapm_pop_time dma:30c30000.sai tlv320aic32x4.1-0018 After: $ ls /sys/kernel/debug/asoc/tqm-tlv320aic32/ 30c30000.sai HiFi-ASRC-FE asrc:30c90000.easrc dapm dapm_pop_time dma:30c30000.sai easrc:30c90000.easrc tlv320aic32x4.1-0018
2 parents 095d621 + 4de6cea commit 01ad278

2 files changed

Lines changed: 6 additions & 0 deletions

File tree

sound/soc/fsl/fsl_asrc_dma.c

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -473,5 +473,8 @@ struct snd_soc_component_driver fsl_asrc_component = {
473473
.pointer = fsl_asrc_dma_pcm_pointer,
474474
.pcm_construct = fsl_asrc_dma_pcm_new,
475475
.legacy_dai_naming = 1,
476+
#ifdef CONFIG_DEBUG_FS
477+
.debugfs_prefix = "asrc",
478+
#endif
476479
};
477480
EXPORT_SYMBOL_GPL(fsl_asrc_component);

sound/soc/fsl/fsl_easrc.c

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1577,6 +1577,9 @@ static const struct snd_soc_component_driver fsl_easrc_component = {
15771577
.controls = fsl_easrc_snd_controls,
15781578
.num_controls = ARRAY_SIZE(fsl_easrc_snd_controls),
15791579
.legacy_dai_naming = 1,
1580+
#ifdef CONFIG_DEBUG_FS
1581+
.debugfs_prefix = "easrc",
1582+
#endif
15801583
};
15811584

15821585
static const struct reg_default fsl_easrc_reg_defaults[] = {

0 commit comments

Comments
 (0)