UBUNTU: [Config] arm64: snapdragon: SND_SOC=y

BugLink: http://bugs.launchpad.net/bugs/1763040
Signed-off-by: Paolo Pisati <paolo.pisati@canonical.com>
Acked-by: Seth Forshee <seth.forshee@canonical.com>
Acked-by: Thadeu Lima de Souza Cascardo <cascardo@canonical.com>
Signed-off-by: Thadeu Lima de Souza Cascardo <cascardo@canonical.com>

diff --git a/debian.master/config/amd64/config.common.amd64 b/debian.master/config/amd64/config.common.amd64
index ae0166bb870c9c7674ca3d9aa9257d2618a121eb..6a236e86b4018654bb737aa73359a076d49d2821 100644 (file)
--- a/debian.master/config/amd64/config.common.amd64
+++ b/debian.master/config/amd64/config.common.amd64
@@ -450,6 +450,7 @@ CONFIG_SND_EMU10K1_SEQ=m
 CONFIG_SND_PCM=m
 CONFIG_SND_SOC=m
 CONFIG_SND_SOC_FSL_SSI=m
+CONFIG_SND_SOC_HDMI_CODEC=m
 CONFIG_SND_SOC_I2C_AND_SPI=m
 CONFIG_SND_SOC_IMX_AUDMUX=m
 CONFIG_SND_SOC_RT5677_SPI=m

diff --git a/debian.master/config/arm64/config.common.arm64 b/debian.master/config/arm64/config.common.arm64
index 82a7516e967b572472fdd251432eec0339ef0ca9..ffcb050b3463e093a78fe622eed475f9e38f04be 100644 (file)
--- a/debian.master/config/arm64/config.common.arm64
+++ b/debian.master/config/arm64/config.common.arm64
@@ -4,7 +4,6 @@
 CONFIG_64BIT=y
 CONFIG_6LOWPAN=m
 CONFIG_ABX500_CORE=y
-CONFIG_AC97_BUS=m
 # CONFIG_ACPI_DEBUG is not set
 # CONFIG_ACPI_DEBUGGER is not set
 CONFIG_ACPI_REDUCED_HARDWARE_ONLY=y
@@ -446,22 +445,15 @@ CONFIG_SGI_PARTITION=y
 # CONFIG_SH_TIMER_TMU is not set
 CONFIG_SLIP=m
 CONFIG_SMC91X=y
-CONFIG_SND=m
-CONFIG_SND_DMAENGINE_PCM=m
 CONFIG_SND_EMU10K1_SEQ=m
 # CONFIG_SND_OPL4_LIB_SEQ is not set
-CONFIG_SND_PCM=m
-CONFIG_SND_SOC=m
 CONFIG_SND_SOC_FSL_SSI=m
-CONFIG_SND_SOC_I2C_AND_SPI=m
 CONFIG_SND_SOC_IMX_AUDMUX=m
 # CONFIG_SND_SOC_RT5677_SPI is not set
 CONFIG_SND_SOC_SGTL5000=m
-CONFIG_SND_TIMER=m
 CONFIG_SOC_BRCMSTB=y
 CONFIG_SOC_TI=y
 CONFIG_SOLARIS_X86_PARTITION=y
-CONFIG_SOUND=m
 CONFIG_SPI=y
 CONFIG_SPI_PXA2XX_PCI=m
 CONFIG_SPI_ROCKCHIP=m

diff --git a/debian.master/config/arm64/config.flavour.generic b/debian.master/config/arm64/config.flavour.generic
index 92d717342875858ed403686dd766774594ad3db0..2e9bda5aabb2577f495d2409c6c9a66ad2f93782 100644 (file)
--- a/debian.master/config/arm64/config.flavour.generic
+++ b/debian.master/config/arm64/config.flavour.generic
@@ -1,6 +1,7 @@
 #
 # Config options for config.flavour.generic automatically generated by splitconfig.pl
 #
+CONFIG_AC97_BUS=m
 CONFIG_COMMON_CLK_QCOM=m
 CONFIG_DRM=m
 CONFIG_DRM_KMS_HELPER=m
@@ -40,6 +41,14 @@ CONFIG_REGULATOR_QCOM_SMD_RPM=m
 CONFIG_REGULATOR_QCOM_SPMI=m
 CONFIG_RPMSG=m
 CONFIG_RPMSG_QCOM_SMD=m
+CONFIG_SND=m
+CONFIG_SND_DMAENGINE_PCM=m
+CONFIG_SND_PCM=m
+CONFIG_SND_SOC=m
+CONFIG_SND_SOC_HDMI_CODEC=m
+CONFIG_SND_SOC_I2C_AND_SPI=m
+CONFIG_SND_TIMER=m
+CONFIG_SOUND=m
 CONFIG_SPI_QUP=m
 CONFIG_SPMI=m
 CONFIG_SPMI_MSM_PMIC_ARB=m

diff --git a/debian.master/config/arm64/config.flavour.snapdragon b/debian.master/config/arm64/config.flavour.snapdragon
index 2e01fc4e6702f41b0355a7ed61552a22b58a7c86..1ea3421680adc24aa7184b1c379241b3d670a4ba 100644 (file)
--- a/debian.master/config/arm64/config.flavour.snapdragon
+++ b/debian.master/config/arm64/config.flavour.snapdragon
@@ -1,6 +1,7 @@
 #
 # Config options for config.flavour.snapdragon automatically generated by splitconfig.pl
 #
+CONFIG_AC97_BUS=y
 CONFIG_COMMON_CLK_QCOM=y
 CONFIG_DRM=y
 CONFIG_DRM_KMS_HELPER=y
@@ -40,6 +41,14 @@ CONFIG_REGULATOR_QCOM_SMD_RPM=y
 CONFIG_REGULATOR_QCOM_SPMI=y
 CONFIG_RPMSG=y
 CONFIG_RPMSG_QCOM_SMD=y
+CONFIG_SND=y
+CONFIG_SND_DMAENGINE_PCM=y
+CONFIG_SND_PCM=y
+CONFIG_SND_SOC=y
+CONFIG_SND_SOC_HDMI_CODEC=y
+CONFIG_SND_SOC_I2C_AND_SPI=y
+CONFIG_SND_TIMER=y
+CONFIG_SOUND=y
 CONFIG_SPI_QUP=y
 CONFIG_SPMI=y
 CONFIG_SPMI_MSM_PMIC_ARB=y

diff --git a/debian.master/config/armhf/config.common.armhf b/debian.master/config/armhf/config.common.armhf
index b988438cfd3fdae7fafc8de8195e7b82074d7ad1..ce55cb0eb0fd174dc338186c0643931513b5ed01 100644 (file)
--- a/debian.master/config/armhf/config.common.armhf
+++ b/debian.master/config/armhf/config.common.armhf
@@ -464,6 +464,7 @@ CONFIG_SND_DMAENGINE_PCM=y
 # CONFIG_SND_OPL4_LIB_SEQ is not set
 CONFIG_SND_PCM=y
 CONFIG_SND_SOC=y
+CONFIG_SND_SOC_HDMI_CODEC=m
 CONFIG_SND_SOC_I2C_AND_SPI=y
 CONFIG_SND_TIMER=y
 # CONFIG_SOC_BRCMSTB is not set

diff --git a/debian.master/config/config.common.ubuntu b/debian.master/config/config.common.ubuntu
index cba04b110c0f94e30bb5bda7cc422f169f572cfd..e73de513f3ff235ecbacf380181e73cb4768f793 100644 (file)
--- a/debian.master/config/config.common.ubuntu
+++ b/debian.master/config/config.common.ubuntu
@@ -8452,7 +8452,6 @@ CONFIG_SND_SOC_FSL_UTILS=m
 CONFIG_SND_SOC_GENERIC_DMAENGINE_PCM=y
 CONFIG_SND_SOC_GTM601=m
 CONFIG_SND_SOC_HDAC_HDMI=m
-CONFIG_SND_SOC_HDMI_CODEC=m
 CONFIG_SND_SOC_IMG=y
 CONFIG_SND_SOC_IMG_I2S_IN=m
 CONFIG_SND_SOC_IMG_I2S_OUT=m

diff --git a/debian.master/config/i386/config.common.i386 b/debian.master/config/i386/config.common.i386
index dcfaf031d9673eca89320e93a7dff9442a52163f..89b2655042bcc16437e01a4e4dae633507f8fbe9 100644 (file)
--- a/debian.master/config/i386/config.common.i386
+++ b/debian.master/config/i386/config.common.i386
@@ -442,6 +442,7 @@ CONFIG_SND_OPL4_LIB_SEQ=m
 CONFIG_SND_PCM=m
 CONFIG_SND_SOC=m
 CONFIG_SND_SOC_FSL_SSI=m
+CONFIG_SND_SOC_HDMI_CODEC=m
 CONFIG_SND_SOC_I2C_AND_SPI=m
 CONFIG_SND_SOC_IMX_AUDMUX=m
 CONFIG_SND_SOC_RT5677_SPI=m

diff --git a/debian.master/config/ppc64el/config.common.ppc64el b/debian.master/config/ppc64el/config.common.ppc64el
index 31609f65d00ce8e9c456fa1c690acde7d18a16a6..e97756bddf8ef130cd5d8ed27ae55df1d43e8ac9 100644 (file)
--- a/debian.master/config/ppc64el/config.common.ppc64el
+++ b/debian.master/config/ppc64el/config.common.ppc64el
@@ -447,6 +447,7 @@ CONFIG_SND_EMU10K1_SEQ=m
 CONFIG_SND_PCM=m
 CONFIG_SND_SOC=m
 CONFIG_SND_SOC_FSL_SSI=m
+CONFIG_SND_SOC_HDMI_CODEC=m
 CONFIG_SND_SOC_I2C_AND_SPI=m
 CONFIG_SND_SOC_IMX_AUDMUX=m
 # CONFIG_SND_SOC_RT5677_SPI is not set