diff options
| -rw-r--r-- | sound/soc/amd/acp/Kconfig | 25 | ||||
| -rw-r--r-- | sound/soc/codecs/Kconfig | 2 | ||||
| -rw-r--r-- | sound/soc/ti/ams-delta.c | 4 |
3 files changed, 19 insertions, 12 deletions
diff --git a/sound/soc/amd/acp/Kconfig b/sound/soc/amd/acp/Kconfig index c0b2a2df8f80..5fb322212938 100644 --- a/sound/soc/amd/acp/Kconfig +++ b/sound/soc/amd/acp/Kconfig @@ -30,13 +30,15 @@ config SND_SOC_AMD_ACP_PCM config SND_SOC_AMD_ACP_PCI tristate "AMD ACP PCI Driver Support" - select SND_SOC_AMD_ACP_LEGACY_COMMON depends on X86 && PCI + depends on ACPI + select SND_SOC_AMD_ACP_LEGACY_COMMON help This options enables generic PCI driver for ACP device. config SND_AMD_ASOC_RENOIR tristate "AMD ACP ASOC Renoir Support" + depends on ACPI select SND_SOC_AMD_ACP_PCM select SND_SOC_AMD_ACP_I2S select SND_SOC_AMD_ACP_PDM @@ -47,6 +49,7 @@ config SND_AMD_ASOC_RENOIR config SND_AMD_ASOC_REMBRANDT tristate "AMD ACP ASOC Rembrandt Support" + depends on ACPI select SND_SOC_AMD_ACP_PCM select SND_SOC_AMD_ACP_I2S select SND_SOC_AMD_ACP_PDM @@ -58,15 +61,17 @@ config SND_AMD_ASOC_REMBRANDT If unsure select "N". config SND_AMD_ASOC_ACP63 - tristate "AMD ACP ASOC ACP6.3 Support" - select SND_SOC_AMD_ACP_PCM - select SND_SOC_AMD_ACP_I2S - select SND_SOC_AMD_ACP_PDM - depends on X86 && PCI - help - This option enables Acp6.3 I2S support on AMD platform. - Say Y if you want to enable AUDIO on ACP6.3 - If unsure select "N". + tristate "AMD ACP ASOC ACP6.3 Support" + depends on X86 && PCI + depends on ACPI + select SND_SOC_AMD_ACP_PCM + select SND_SOC_AMD_ACP_I2S + select SND_SOC_AMD_ACP_PDM + select SND_SOC_AMD_ACP_LEGACY_COMMON + help + This option enables Acp6.3 I2S support on AMD platform. + Say Y if you want to enable AUDIO on ACP6.3 + If unsure select "N". config SND_SOC_AMD_MACH_COMMON tristate diff --git a/sound/soc/codecs/Kconfig b/sound/soc/codecs/Kconfig index cc4026d93654..3429419ca694 100644 --- a/sound/soc/codecs/Kconfig +++ b/sound/soc/codecs/Kconfig @@ -687,7 +687,7 @@ config SND_SOC_AW88399 select CRC8 select REGMAP_I2C select GPIOLIB - select SND_SOC_AW88399_LIB + select SND_SOC_AW88395_LIB help This option enables support for aw88399 Smart PA. The awinic AW88399 is an I2S/TDM input, high efficiency diff --git a/sound/soc/ti/ams-delta.c b/sound/soc/ti/ams-delta.c index b32cc03dc1c2..76bda188e992 100644 --- a/sound/soc/ti/ams-delta.c +++ b/sound/soc/ti/ams-delta.c @@ -301,7 +301,7 @@ static int cx81801_open(struct tty_struct *tty) static void cx81801_close(struct tty_struct *tty) { struct snd_soc_component *component = tty->disc_data; - struct snd_soc_dapm_context *dapm = &component->card->dapm; + struct snd_soc_dapm_context *dapm; del_timer_sync(&cx81801_timer); @@ -313,6 +313,8 @@ static void cx81801_close(struct tty_struct *tty) v253_ops.close(tty); + dapm = &component->card->dapm; + /* Revert back to default audio input/output constellation */ snd_soc_dapm_mutex_lock(dapm); |