| Message ID | 20240322070353.2367300-1-Vijendar.Mukunda@amd.com (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | a806793f231e390510343837668d8f0eade75a72 |
| Headers | show |
| Series | [RESEND] ASoC: amd: simplify soundwire dependencies for | expand |
On 22/03/24 12:33, Vijendar Mukunda wrote: > The CONFIG_SOUNDWIRE_AMD is a user-visible option, it should be never > selected by another driver. > So replace the extra complexity with a normal Kconfig dependency in > SND_SOC_AMD_SOUNDWIRE. Please ignore this patch, as the commit title has not been posted completely. > > Signed-off-by: Vijendar Mukunda <Vijendar.Mukunda@amd.com> > --- > sound/soc/amd/Kconfig | 5 ++--- > 1 file changed, 2 insertions(+), 3 deletions(-) > > diff --git a/sound/soc/amd/Kconfig b/sound/soc/amd/Kconfig > index fa74635cee08..3508f5a96b75 100644 > --- a/sound/soc/amd/Kconfig > +++ b/sound/soc/amd/Kconfig > @@ -134,15 +134,14 @@ config SND_SOC_AMD_RPL_ACP6x > > config SND_SOC_AMD_SOUNDWIRE_LINK_BASELINE > tristate > - select SOUNDWIRE_AMD if SND_SOC_AMD_SOUNDWIRE != n > select SND_AMD_SOUNDWIRE_ACPI if ACPI > > config SND_SOC_AMD_SOUNDWIRE > tristate "Support for SoundWire based AMD platforms" > default SND_SOC_AMD_SOUNDWIRE_LINK_BASELINE > depends on SND_SOC_AMD_SOUNDWIRE_LINK_BASELINE > - depends on ACPI && SOUNDWIRE > - depends on !(SOUNDWIRE=m && SND_SOC_AMD_SOUNDWIRE_LINK_BASELINE=y) > + depends on ACPI > + depends on SOUNDWIRE_AMD > help > This adds support for SoundWire for AMD platforms. > Say Y if you want to enable SoundWire links with SOF.
diff --git a/sound/soc/amd/Kconfig b/sound/soc/amd/Kconfig index fa74635cee08..3508f5a96b75 100644 --- a/sound/soc/amd/Kconfig +++ b/sound/soc/amd/Kconfig @@ -134,15 +134,14 @@ config SND_SOC_AMD_RPL_ACP6x config SND_SOC_AMD_SOUNDWIRE_LINK_BASELINE tristate - select SOUNDWIRE_AMD if SND_SOC_AMD_SOUNDWIRE != n select SND_AMD_SOUNDWIRE_ACPI if ACPI config SND_SOC_AMD_SOUNDWIRE tristate "Support for SoundWire based AMD platforms" default SND_SOC_AMD_SOUNDWIRE_LINK_BASELINE depends on SND_SOC_AMD_SOUNDWIRE_LINK_BASELINE - depends on ACPI && SOUNDWIRE - depends on !(SOUNDWIRE=m && SND_SOC_AMD_SOUNDWIRE_LINK_BASELINE=y) + depends on ACPI + depends on SOUNDWIRE_AMD help This adds support for SoundWire for AMD platforms. Say Y if you want to enable SoundWire links with SOF.
The CONFIG_SOUNDWIRE_AMD is a user-visible option, it should be never selected by another driver. So replace the extra complexity with a normal Kconfig dependency in SND_SOC_AMD_SOUNDWIRE. Signed-off-by: Vijendar Mukunda <Vijendar.Mukunda@amd.com> --- sound/soc/amd/Kconfig | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-)