On Wed, Jan 13, 2021 at 8:43 AM Patrick Talbert <ptalbert(a)redhat.com> wrote:
On Tue, Jan 12, 2021 at 12:24 PM GitLab Bridge on behalf of pbrobinson
<cki-gitlab(a)redhat.com> wrote:
>
> From: Peter Robinson <pbrobinson(a)redhat.com>
>
> The WM8804 codec is required for Intel Apollo Lake support so enable it
> as it's a supported RHEL for Edge platform.
>
> Some minor cleanups for the WM8804 codec configs while we're at it.
>
> Signed-off-by: Peter Robinson <pbrobinson(a)redhat.com>
> ---
> .../generic/x86/CONFIG_SND_SOC_WM8804_I2C | 0
> .../fedora/generic/CONFIG_SND_SOC_WM8804 | 1 -
> .../fedora/generic/arm/CONFIG_SND_SOC_WM8804 | 1 -
> .../x86/CONFIG_SND_SOC_INTEL_SOF_WM8804_MACH | 23 -------------------
> .../fedora/generic/x86/CONFIG_SND_SOC_WM8804 | 1 -
> 5 files changed, 26 deletions(-)
> rename redhat/configs/{fedora => common}/generic/x86/CONFIG_SND_SOC_WM8804_I2C
(100%)
> delete mode 100644 redhat/configs/fedora/generic/CONFIG_SND_SOC_WM8804
> delete mode 100644 redhat/configs/fedora/generic/arm/CONFIG_SND_SOC_WM8804
> delete mode 100644
redhat/configs/fedora/generic/x86/CONFIG_SND_SOC_INTEL_SOF_WM8804_MACH
> delete mode 100644 redhat/configs/fedora/generic/x86/CONFIG_SND_SOC_WM8804
>
> diff --git a/redhat/configs/fedora/generic/x86/CONFIG_SND_SOC_WM8804_I2C
b/redhat/configs/common/generic/x86/CONFIG_SND_SOC_WM8804_I2C
> similarity index 100%
> rename from redhat/configs/fedora/generic/x86/CONFIG_SND_SOC_WM8804_I2C
> rename to redhat/configs/common/generic/x86/CONFIG_SND_SOC_WM8804_I2C
> diff --git a/redhat/configs/fedora/generic/CONFIG_SND_SOC_WM8804
b/redhat/configs/fedora/generic/CONFIG_SND_SOC_WM8804
> deleted file mode 100644
> index 074702b5ef5e..000000000000
> --- a/redhat/configs/fedora/generic/CONFIG_SND_SOC_WM8804
> +++ /dev/null
> @@ -1 +0,0 @@
> -# CONFIG_SND_SOC_WM8804 is not set
> diff --git a/redhat/configs/fedora/generic/arm/CONFIG_SND_SOC_WM8804
b/redhat/configs/fedora/generic/arm/CONFIG_SND_SOC_WM8804
> deleted file mode 100644
> index 04b89d9ff78b..000000000000
> --- a/redhat/configs/fedora/generic/arm/CONFIG_SND_SOC_WM8804
> +++ /dev/null
> @@ -1 +0,0 @@
> -CONFIG_SND_SOC_WM8804=m
> diff --git a/redhat/configs/fedora/generic/x86/CONFIG_SND_SOC_INTEL_SOF_WM8804_MACH
b/redhat/configs/fedora/generic/x86/CONFIG_SND_SOC_INTEL_SOF_WM8804_MACH
> deleted file mode 100644
> index bb7ee45866a6..000000000000
> --- a/redhat/configs/fedora/generic/x86/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=m
> diff --git a/redhat/configs/fedora/generic/x86/CONFIG_SND_SOC_WM8804
b/redhat/configs/fedora/generic/x86/CONFIG_SND_SOC_WM8804
> deleted file mode 100644
> index 04b89d9ff78b..000000000000
> --- a/redhat/configs/fedora/generic/x86/CONFIG_SND_SOC_WM8804
> +++ /dev/null
> @@ -1 +0,0 @@
> -CONFIG_SND_SOC_WM8804=m
> --
> GitLab
>
Jaroslav can you give your input here please?
I was going to rebase this on top of the other change that just went
in, I hadn't seen that PR when I submitted this.