]> git.baikalelectronics.ru Git - kernel.git/commit
ASoC: cs4265: Fix the duplicated control name
authorFabio Estevam <festevam@denx.de>
Tue, 15 Feb 2022 12:05:14 +0000 (09:05 -0300)
committerMark Brown <broonie@kernel.org>
Wed, 16 Feb 2022 16:34:16 +0000 (16:34 +0000)
commitf71f14c03273a7f76982abc6c26ae89227a05056
treed21cd9f2208bae5cc08fca34e0cbd1388eff9f63
parent78ac324ff08385349efd58e4323cac03930112df
ASoC: cs4265: Fix the duplicated control name

Currently, the following error messages are seen during boot:

asoc-simple-card sound: control 2:0:0:SPDIF Switch:0 is already present
cs4265 1-004f: ASoC: failed to add widget SPDIF dapm kcontrol SPDIF Switch: -16

Quoting Mark Brown:

"The driver is just plain buggy, it defines both a regular SPIDF Switch
control and a SND_SOC_DAPM_SWITCH() called SPDIF both of which will
create an identically named control, it can never have loaded without
error.  One or both of those has to be renamed or they need to be
merged into one thing."

Fix the duplicated control name by combining the two SPDIF controls here
and move the register bits onto the DAPM widget and have DAPM control them.

Fixes: ca351c49e090 ("ASoC: cs4265: Add a S/PDIF enable switch")
Signed-off-by: Fabio Estevam <festevam@denx.de>
Acked-by: Charles Keepax <ckeepax@opensource.cirrus.com>
Link: https://lore.kernel.org/r/20220215120514.1760628-1-festevam@gmail.com
Signed-off-by: Mark Brown <broonie@kernel.org>
sound/soc/codecs/cs4265.c