473281e91b66465714fcf0724b9faf031a34fcdb6fa0d1fdf96af35d.patch

From 0f3866c2cfcbf51fac77538c2771e33801a72923 Mon Sep 17 00:00:00 2001
From: Vijendar Mukunda <Vijendar.Mukunda@amd.com>
Date: Thu, 15 Apr 2021 12:49:31 +0530
Subject: [PATCH] CHROMIUM: ASoC: amd: enable renoir audio driver build

Modify Kconfig and Makefile to enable build for
renoir audio driver

Signed-off-by: Vijendar Mukunda <Vijendar.Mukunda@amd.com>
Signed-off-by: Vijendar Mukunda <Vijendar.Mukunda@amd.corp-partner.google.com>

BUG=b:184617007
TEST= Audio use cases should work

Change-Id: I3952ea41ffd1a570cfd97dbe96b74abe250804ce
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/third_party/kernel/+/2862747
Reviewed-by: Yu-Hsuan Hsu <yuhsuan@chromium.org>
Commit-Queue: Yu-Hsuan Hsu <yuhsuan@chromium.org>
Tested-by: Yu-Hsuan Hsu <yuhsuan@chromium.org>
---
 sound/soc/amd/Kconfig         |  5 +++--
 sound/soc/amd/renoir/Makefile | 13 +++++++++----
 2 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/sound/soc/amd/Kconfig b/sound/soc/amd/Kconfig
--- a/sound/soc/amd/Kconfig
+++ b/sound/soc/amd/Kconfig
@@ -49,9 +49,10 @@ config SND_SOC_AMD_RENOIR
 	 This option enables ACP support for Renoir platform
 
 config SND_SOC_AMD_RENOIR_MACH
-	tristate "AMD Renoir support for DMIC"
+	tristate "AMD Renoir support for DMIC RT5682"
 	select SND_SOC_DMIC
-	depends on SND_SOC_AMD_RENOIR && GPIOLIB
+	select SND_SOC_RT5682_I2C
+	depends on SND_SOC_AMD_RENOIR && GPIOLIB && I2C
 	help
 	 This option enables machine driver for DMIC
 
diff --git a/sound/soc/amd/renoir/Makefile b/sound/soc/amd/renoir/Makefile
--- a/sound/soc/amd/renoir/Makefile
+++ b/sound/soc/amd/renoir/Makefile
@@ -1,8 +1,13 @@
 # SPDX-License-Identifier: GPL-2.0+
 # Renoir platform Support
 snd-rn-pci-acp3x-objs	:= rn-pci-acp3x.o
-snd-acp3x-pdm-dma-objs	:= acp3x-pdm-dma.o
-snd-acp3x-rn-objs	:= acp3x-rn.o
+snd-acp3x-rn-pdm-dma-objs	:= acp3x-rn-pdm-dma.o
+snd-acp3x-rn-pcm-dma-objs  := acp3x-rn-pcm-dma.o
+snd-acp3x-rn-i2s-objs      := acp3x-rn-i2s.o
+snd-soc-acp-rn-rt5682-mach-objs := rn-rt5682-rt1015p.o
+
 obj-$(CONFIG_SND_SOC_AMD_RENOIR)	+= snd-rn-pci-acp3x.o
-obj-$(CONFIG_SND_SOC_AMD_RENOIR)	+= snd-acp3x-pdm-dma.o
-obj-$(CONFIG_SND_SOC_AMD_RENOIR_MACH)	+= snd-acp3x-rn.o
+obj-$(CONFIG_SND_SOC_AMD_RENOIR)	+= snd-acp3x-rn-pdm-dma.o
+obj-$(CONFIG_SND_SOC_AMD_RENOIR)	+= snd-acp3x-rn-pcm-dma.o
+obj-$(CONFIG_SND_SOC_AMD_RENOIR)	+= snd-acp3x-rn-i2s.o
+obj-$(CONFIG_SND_SOC_AMD_RENOIR_MACH)   += snd-soc-acp-rn-rt5682-mach.o
-- 
2.34.0.rc2.393.gf8c9666880-goog