From: Fedora Kernel Team <kernel-team(a)fedoraproject.org&gt; Hi, As part of the ongoing rebase effort, the following configuration options need to be reviewed. As a reminder, the ARK configuration flow involves moving unreviewed configuration options from the pending directory to the ark directory. In the diff below, options are removed from the pending directory and added to the ark hierarchy. The final options that need to be ACKed are the files that are being added to the ark hierarchy. If the value for a file that is added should be changed, please reply with a better option. CONFIG_SND_SOC_AMD_RENOIR: This option enables ACP support for Renoir platform Symbol: SND_SOC_AMD_RENOIR [=n] Type : tristate Defined at sound/soc/amd/Kconfig:40 Prompt: AMD Audio Coprocessor - Renoir support Depends on: SOUND [=m] && !UML && SND [=m] && SND_SOC [=m] && X86 [=y] && PCI [=y] Location: -> Device Drivers -> Sound card support (SOUND [=m]) -> Advanced Linux Sound Architecture (SND [=m]) -> ALSA for SoC audio support (SND_SOC [=m]) --- CONFIG_SND_SOC_INTEL_EHL_RT5660_MACH: This adds support for ASoC machine driver for Elkhart Lake platform with RT5660 I2S audio codec. Symbol: SND_SOC_INTEL_EHL_RT5660_MACH [=n] Type : tristate Defined at sound/soc/intel/boards/Kconfig:545 Prompt: EHL with RT5660 in I2S mode Depends on: SOUND [=m] && !UML && SND [=m] && SND_SOC [=m] && SND_SOC_INTEL_MACH [=y] && SND_SOC_SOF_ELKHARTLAKE [=m] && I2C [=y] && ACPI [=y] && GPIOLIB [=y] && (MFD_INTEL_LPSS [=y] || COMPILE_TEST [=n]) && SND_HDA_CODEC_HDMI [=m] && SND_SOC_SOF_HDA_AUDIO_CODEC [=y] Location: -> Device Drivers -> Sound card support (SOUND [=m]) -> Advanced Linux Sound Architecture (SND [=m]) -> ALSA for SoC audio support (SND_SOC [=m]) -> Intel Machine drivers (SND_SOC_INTEL_MACH [=y]) Selects: SND_SOC_RT5660 [=m] && SND_SOC_DMIC [=m] --- CONFIG_SND_SOC_INTEL_SOF_WM8804_MACH: This adds support for ASoC machine driver for Intel platforms with the Wolfson/Cirrus WM8804 I2S audio codec. Say Y or m if you have such a device. This is a recommended option. If unsure select "N". Symbol: SND_SOC_INTEL_SOF_WM8804_MACH [=n] Type : tristate Defined at sound/soc/intel/boards/Kconfig:329 Prompt: SOF with Wolfson/Cirrus WM8804 codec Depends on: SOUND [=m] && !UML && SND [=m] && SND_SOC [=m] && SND_SOC_INTEL_MACH [=y] && SND_SOC_SOF_APOLLOLAKE [=m] && I2C [=y] && ACPI [=y] && (MFD_INTEL_LPSS [=y] || COMPILE_TEST [=n]) Location: -> Device Drivers -> Sound card support (SOUND [=m]) -> Advanced Linux Sound Architecture (SND [=m]) -> ALSA for SoC audio support (SND_SOC [=m]) -> Intel Machine drivers (SND_SOC_INTEL_MACH [=y]) Selects: SND_SOC_WM8804_I2C [=n] --- CONFIG_SND_SOC_ZL38060: Support for ZL38060 Connected Home Audio Processor from Microsemi, which consists of a Digital Signal Processor (DSP), several Digital Audio Interfaces (DAIs), analog outputs, and a block of 14 GPIOs. Symbol: SND_SOC_ZL38060 [=n] Type : tristate Defined at sound/soc/codecs/Kconfig:1660 Prompt: Microsemi ZL38060 Connected Home Audio Processor Depends on: SOUND [=m] && !UML && SND [=m] && SND_SOC [=m] && SPI_MASTER [=y] Location: -> Device Drivers -> Sound card support (SOUND [=m]) -> Advanced Linux Sound Architecture (SND [=m]) -> ALSA for SoC audio support (SND_SOC [=m]) -> CODEC drivers Selects: GPIOLIB [=y] && REGMAP [=y] Implied by [n]: - SND_SOC_ALL_CODECS [=n] && SOUND [=m] && !UML && SND [=m] && SND_SOC [=m] && COMPILE_TEST [=n] --- Cc: Jaroslav Kysela <jkysela(a)redhat.com&gt; Signed-off-by: Fedora Kernel Team <kernel-team(a)fedoraproject.org&gt; --- .../common/generic/CONFIG_SND_SOC_AMD_RENOIR | 1 + .../CONFIG_SND_SOC_INTEL_EHL_RT5660_MACH | 1 + .../CONFIG_SND_SOC_INTEL_SOF_WM8804_MACH | 1 + .../common/generic/CONFIG_SND_SOC_ZL38060 | 1 + .../generic/CONFIG_SND_SOC_AMD_RENOIR | 18 -------------- .../CONFIG_SND_SOC_INTEL_EHL_RT5660_MACH | 21 ---------------- .../CONFIG_SND_SOC_INTEL_SOF_WM8804_MACH | 23 ------------------ .../generic/CONFIG_SND_SOC_ZL38060 | 24 ------------------- 8 files changed, 4 insertions(+), 86 deletions(-) create mode 100644 redhat/configs/common/generic/CONFIG_SND_SOC_AMD_RENOIR create mode 100644 redhat/configs/common/generic/CONFIG_SND_SOC_INTEL_EHL_RT5660_MACH create mode 100644 redhat/configs/common/generic/CONFIG_SND_SOC_INTEL_SOF_WM8804_MACH create mode 100644 redhat/configs/common/generic/CONFIG_SND_SOC_ZL38060 delete mode 100644 redhat/configs/pending-common/generic/CONFIG_SND_SOC_AMD_RENOIR delete mode 100644 redhat/configs/pending-common/generic/CONFIG_SND_SOC_INTEL_EHL_RT5660_MACH delete mode 100644 redhat/configs/pending-common/generic/CONFIG_SND_SOC_INTEL_SOF_WM8804_MACH delete mode 100644 redhat/configs/pending-common/generic/CONFIG_SND_SOC_ZL38060 diff --git a/redhat/configs/common/generic/CONFIG_SND_SOC_AMD_RENOIR b/redhat/configs/common/generic/CONFIG_SND_SOC_AMD_RENOIR new file mode 100644 index 000000000000..e13be681fb15 --- /dev/null +++ b/redhat/configs/common/generic/CONFIG_SND_SOC_AMD_RENOIR @@ -0,0 +1 @@ +# CONFIG_SND_SOC_AMD_RENOIR is not set diff --git a/redhat/configs/common/generic/CONFIG_SND_SOC_INTEL_EHL_RT5660_MACH b/redhat/configs/common/generic/CONFIG_SND_SOC_INTEL_EHL_RT5660_MACH new file mode 100644 index 000000000000..0d02c9c93e6e --- /dev/null +++ b/redhat/configs/common/generic/CONFIG_SND_SOC_INTEL_EHL_RT5660_MACH @@ -0,0 +1 @@ +# CONFIG_SND_SOC_INTEL_EHL_RT5660_MACH is not set diff --git a/redhat/configs/common/generic/CONFIG_SND_SOC_INTEL_SOF_WM8804_MACH b/redhat/configs/common/generic/CONFIG_SND_SOC_INTEL_SOF_WM8804_MACH new file mode 100644 index 000000000000..cdb94d2f1aed --- /dev/null +++ b/redhat/configs/common/generic/CONFIG_SND_SOC_INTEL_SOF_WM8804_MACH @@ -0,0 +1 @@ +# CONFIG_SND_SOC_INTEL_SOF_WM8804_MACH is not set diff --git a/redhat/configs/common/generic/CONFIG_SND_SOC_ZL38060 b/redhat/configs/common/generic/CONFIG_SND_SOC_ZL38060 new file mode 100644 index 000000000000..f860fb7e7444 --- /dev/null +++ b/redhat/configs/common/generic/CONFIG_SND_SOC_ZL38060 @@ -0,0 +1 @@ +# CONFIG_SND_SOC_ZL38060 is not set diff --git a/redhat/configs/pending-common/generic/CONFIG_SND_SOC_AMD_RENOIR b/redhat/configs/pending-common/generic/CONFIG_SND_SOC_AMD_RENOIR deleted file mode 100644 index cd2ab90407fb..000000000000 --- a/redhat/configs/pending-common/generic/CONFIG_SND_SOC_AMD_RENOIR +++ /dev/null @@ -1,18 +0,0 @@ -# CONFIG_SND_SOC_AMD_RENOIR: -# -# This option enables ACP support for Renoir platform -# -# Symbol: SND_SOC_AMD_RENOIR [=n] -# Type : tristate -# Defined at sound/soc/amd/Kconfig:40 -# Prompt: AMD Audio Coprocessor - Renoir support -# Depends on: SOUND [=m] && !UML && SND [=m] && SND_SOC [=m] && X86 [=y] && PCI [=y] -# Location: -# -> Device Drivers -# -> Sound card support (SOUND [=m]) -# -> Advanced Linux Sound Architecture (SND [=m]) -# -> ALSA for SoC audio support (SND_SOC [=m]) -# -# -# -# CONFIG_SND_SOC_AMD_RENOIR is not set diff --git a/redhat/configs/pending-common/generic/CONFIG_SND_SOC_INTEL_EHL_RT5660_MACH b/redhat/configs/pending-common/generic/CONFIG_SND_SOC_INTEL_EHL_RT5660_MACH deleted file mode 100644 index bc1e5017ded1..000000000000 --- a/redhat/configs/pending-common/generic/CONFIG_SND_SOC_INTEL_EHL_RT5660_MACH +++ /dev/null @@ -1,21 +0,0 @@ -# CONFIG_SND_SOC_INTEL_EHL_RT5660_MACH: -# -# This adds support for ASoC machine driver for Elkhart Lake -# platform with RT5660 I2S audio codec. -# -# Symbol: SND_SOC_INTEL_EHL_RT5660_MACH [=n] -# Type : tristate -# Defined at sound/soc/intel/boards/Kconfig:545 -# Prompt: EHL with RT5660 in I2S mode -# Depends on: SOUND [=m] && !UML && SND [=m] && SND_SOC [=m] && SND_SOC_INTEL_MACH [=y] && SND_SOC_SOF_ELKHARTLAKE [=m] && I2C [=y] && ACPI [=y] && GPIOLIB [=y] && (MFD_INTEL_LPSS [=y] || COMPILE_TEST [=n]) && SND_HDA_CODEC_HDMI [=m] && SND_SOC_SOF_HDA_AUDIO_CODEC [=y] -# Location: -# -> Device Drivers -# -> Sound card support (SOUND [=m]) -# -> Advanced Linux Sound Architecture (SND [=m]) -# -> ALSA for SoC audio support (SND_SOC [=m]) -# -> Intel Machine drivers (SND_SOC_INTEL_MACH [=y]) -# Selects: SND_SOC_RT5660 [=m] && SND_SOC_DMIC [=m] -# -# -# -# CONFIG_SND_SOC_INTEL_EHL_RT5660_MACH is not set diff --git a/redhat/configs/pending-common/generic/CONFIG_SND_SOC_INTEL_SOF_WM8804_MACH b/redhat/configs/pending-common/generic/CONFIG_SND_SOC_INTEL_SOF_WM8804_MACH deleted file mode 100644 index 202eaec68d54..000000000000 --- a/redhat/configs/pending-common/generic/CONFIG_SND_SOC_INTEL_SOF_WM8804_MACH +++ /dev/null @@ -1,23 +0,0 @@ -# CONFIG_SND_SOC_INTEL_SOF_WM8804_MACH: -# -# This adds support for ASoC machine driver for Intel platforms -# with the Wolfson/Cirrus WM8804 I2S audio codec. -# Say Y or m if you have such a device. This is a recommended option. -# If unsure select "N". -# -# Symbol: SND_SOC_INTEL_SOF_WM8804_MACH [=n] -# Type : tristate -# Defined at sound/soc/intel/boards/Kconfig:329 -# Prompt: SOF with Wolfson/Cirrus WM8804 codec -# Depends on: SOUND [=m] && !UML && SND [=m] && SND_SOC [=m] && SND_SOC_INTEL_MACH [=y] && SND_SOC_SOF_APOLLOLAKE [=m] && I2C [=y] && ACPI [=y] && (MFD_INTEL_LPSS [=y] || COMPILE_TEST [=n]) -# Location: -# -> Device Drivers -# -> Sound card support (SOUND [=m]) -# -> Advanced Linux Sound Architecture (SND [=m]) -# -> ALSA for SoC audio support (SND_SOC [=m]) -# -> Intel Machine drivers (SND_SOC_INTEL_MACH [=y]) -# Selects: SND_SOC_WM8804_I2C [=n] -# -# -# -# CONFIG_SND_SOC_INTEL_SOF_WM8804_MACH is not set diff --git a/redhat/configs/pending-common/generic/CONFIG_SND_SOC_ZL38060 b/redhat/configs/pending-common/generic/CONFIG_SND_SOC_ZL38060 deleted file mode 100644 index d5d86c32b886..000000000000 --- a/redhat/configs/pending-common/generic/CONFIG_SND_SOC_ZL38060 +++ /dev/null @@ -1,24 +0,0 @@ -# CONFIG_SND_SOC_ZL38060: -# -# Support for ZL38060 Connected Home Audio Processor from Microsemi, -# which consists of a Digital Signal Processor (DSP), several Digital -# Audio Interfaces (DAIs), analog outputs, and a block of 14 GPIOs. -# -# Symbol: SND_SOC_ZL38060 [=n] -# Type : tristate -# Defined at sound/soc/codecs/Kconfig:1660 -# Prompt: Microsemi ZL38060 Connected Home Audio Processor -# Depends on: SOUND [=m] && !UML && SND [=m] && SND_SOC [=m] && SPI_MASTER [=y] -# Location: -# -> Device Drivers -# -> Sound card support (SOUND [=m]) -# -> Advanced Linux Sound Architecture (SND [=m]) -# -> ALSA for SoC audio support (SND_SOC [=m]) -# -> CODEC drivers -# Selects: GPIOLIB [=y] && REGMAP [=y] -# Implied by [n]: -# - SND_SOC_ALL_CODECS [=n] && SOUND [=m] && !UML && SND [=m] && SND_SOC [=m] && COMPILE_TEST [=n] -# -# -# -# CONFIG_SND_SOC_ZL38060 is not set -- 2.26.2