| Message ID | 20240209082044.3981-1-lukas.bulwahn@gmail.com (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | e5aa6d51a2ef8c7ef7e3fe76bebe530fb68e7f08 |
| Headers | show |
| Series | ALSA: hda/cs35l56: select intended config FW_CS_DSP | expand |
> -----Original Message----- > From: Lukas Bulwahn <lukas.bulwahn@gmail.com> > > Commit 73cfbfa9caea ("ALSA: hda/cs35l56: Add driver for Cirrus Logic > CS35L56 amplifier") adds configs SND_HDA_SCODEC_CS35L56_{I2C,SPI}, > which selects the non-existing config CS_DSP. Note the renaming in > commit d7cfdf17cb9d ("firmware: cs_dsp: Rename KConfig symbol CS_DSP -> > FW_CS_DSP"), though. > > Select the intended config FW_CS_DSP. > > This broken select command probably was not noticed as the configs also > select SND_HDA_CS_DSP_CONTROLS and this then selects FW_CS_DSP. So, > the > select FW_CS_DSP could actually be dropped, but we will keep this > redundancy in place as the author originally also intended to have this > redundancy of selects in place. > > Signed-off-by: Lukas Bulwahn <lukas.bulwahn@gmail.com> Thanks! Reviewed-by: Simon Trimmer <simont@opensource.cirrus.com>
On Fri, 09 Feb 2024 09:20:44 +0100, Lukas Bulwahn wrote: > > Commit 73cfbfa9caea ("ALSA: hda/cs35l56: Add driver for Cirrus Logic > CS35L56 amplifier") adds configs SND_HDA_SCODEC_CS35L56_{I2C,SPI}, > which selects the non-existing config CS_DSP. Note the renaming in > commit d7cfdf17cb9d ("firmware: cs_dsp: Rename KConfig symbol CS_DSP -> > FW_CS_DSP"), though. > > Select the intended config FW_CS_DSP. > > This broken select command probably was not noticed as the configs also > select SND_HDA_CS_DSP_CONTROLS and this then selects FW_CS_DSP. So, the > select FW_CS_DSP could actually be dropped, but we will keep this > redundancy in place as the author originally also intended to have this > redundancy of selects in place. > > Signed-off-by: Lukas Bulwahn <lukas.bulwahn@gmail.com> Thanks, applied. Takashi
diff --git a/sound/pci/hda/Kconfig b/sound/pci/hda/Kconfig index 20d757e38f94..26da739eea82 100644 --- a/sound/pci/hda/Kconfig +++ b/sound/pci/hda/Kconfig @@ -159,7 +159,7 @@ config SND_HDA_SCODEC_CS35L56_I2C depends on I2C depends on ACPI || COMPILE_TEST depends on SND_SOC - select CS_DSP + select FW_CS_DSP select SND_HDA_GENERIC select SND_SOC_CS35L56_SHARED select SND_HDA_SCODEC_CS35L56 @@ -174,7 +174,7 @@ config SND_HDA_SCODEC_CS35L56_SPI depends on SPI_MASTER depends on ACPI || COMPILE_TEST depends on SND_SOC - select CS_DSP + select FW_CS_DSP select SND_HDA_GENERIC select SND_SOC_CS35L56_SHARED select SND_HDA_SCODEC_CS35L56
Commit 73cfbfa9caea ("ALSA: hda/cs35l56: Add driver for Cirrus Logic CS35L56 amplifier") adds configs SND_HDA_SCODEC_CS35L56_{I2C,SPI}, which selects the non-existing config CS_DSP. Note the renaming in commit d7cfdf17cb9d ("firmware: cs_dsp: Rename KConfig symbol CS_DSP -> FW_CS_DSP"), though. Select the intended config FW_CS_DSP. This broken select command probably was not noticed as the configs also select SND_HDA_CS_DSP_CONTROLS and this then selects FW_CS_DSP. So, the select FW_CS_DSP could actually be dropped, but we will keep this redundancy in place as the author originally also intended to have this redundancy of selects in place. Signed-off-by: Lukas Bulwahn <lukas.bulwahn@gmail.com> --- sound/pci/hda/Kconfig | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)