Unverified Commit 01ad2782 authored by Mark Brown's avatar Mark Brown
Browse files

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
parents 095d6211 4de6cea0

sound/soc/fsl/fsl_asrc_dma.c

+3 −0
Original line number Diff line number Diff line
@@ -473,5 +473,8 @@ struct snd_soc_component_driver fsl_asrc_component = { 
	.pointer	= fsl_asrc_dma_pcm_pointer,

	.pcm_construct	= fsl_asrc_dma_pcm_new,

	.legacy_dai_naming = 1,

#ifdef CONFIG_DEBUG_FS

	.debugfs_prefix	= "asrc",

#endif

};

EXPORT_SYMBOL_GPL(fsl_asrc_component);

sound/soc/fsl/fsl_easrc.c

+3 −0
Original line number Diff line number Diff line
@@ -1577,6 +1577,9 @@ static const struct snd_soc_component_driver fsl_easrc_component = { 
	.controls		= fsl_easrc_snd_controls,

	.num_controls		= ARRAY_SIZE(fsl_easrc_snd_controls),

	.legacy_dai_naming	= 1,

#ifdef CONFIG_DEBUG_FS

	.debugfs_prefix		= "easrc",

#endif

};



static const struct reg_default fsl_easrc_reg_defaults[] = {