]> git.proxmox.com Git - mirror_ubuntu-focal-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)
committerStefan Bader <stefan.bader@canonical.com>
Fri, 20 May 2022 13:17:29 +0000 (15:17 +0200)
commitfdea13cdc0226a279c43e3a048de68f8577aa629
tree954330a49c6d597741a35831478f51bf6b81ac07
parenta90bfe1a9c1bf87e14a3868a2dc78c2cc358936c
ASoC: cs4265: Fix the duplicated control name

BugLink: https://bugs.launchpad.net/bugs/1969239
commit c5487b9cdea5c1ede38a7ec94db0fc59963c8e86 upstream.

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: f853d6b3ba34 ("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>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: Kamal Mostafa <kamal@canonical.com>
Signed-off-by: Stefan Bader <stefan.bader@canonical.com>
sound/soc/codecs/cs4265.c