Merge series "ASoC: Add common modules support for ACP hw block" from Ajit Kumar...

changes since v3:
- rebase and fixes merge conflict.
- Fixed kernel autobot warning.

Ajit Kumar Pandey (8):
  ASoC: amd: Add common framework to support I2S on ACP SOC
  ASoC: amd: acp: Add I2S support on Renoir platform
  ASoC: amd: acp: Add callback for machine driver on ACP
  ASoC: amd: acp: Add generic machine driver support for ACP cards
  ASoC: amd: acp: Add legacy sound card support for Chrome audio
  ASoC: amd: acp: Add SOF audio support on Chrome board
  ASoC: amd: acp: Add support for Maxim amplifier codec
  ASoC: amd: acp: Add support for RT5682-VS codec

 sound/soc/amd/Kconfig                |   2 +
 sound/soc/amd/Makefile               |   1 +
 sound/soc/amd/acp/Kconfig            |  51 +++
 sound/soc/amd/acp/Makefile           |  26 ++
 sound/soc/amd/acp/acp-i2s.c          | 340 +++++++++++++++
 sound/soc/amd/acp/acp-legacy-mach.c  | 104 +++++
 sound/soc/amd/acp/acp-mach-common.c  | 600 +++++++++++++++++++++++++++
 sound/soc/amd/acp/acp-mach.h         |  57 +++
 sound/soc/amd/acp/acp-platform.c     | 315 ++++++++++++++
 sound/soc/amd/acp/acp-renoir.c       | 144 +++++++
 sound/soc/amd/acp/acp-sof-mach.c     | 131 ++++++
 sound/soc/amd/acp/amd.h              | 146 +++++++
 sound/soc/amd/acp/chip_offset_byte.h |  76 ++++
 13 files changed, 1993 insertions(+)
 create mode 100644 sound/soc/amd/acp/Kconfig
 create mode 100644 sound/soc/amd/acp/Makefile
 create mode 100644 sound/soc/amd/acp/acp-i2s.c
 create mode 100644 sound/soc/amd/acp/acp-legacy-mach.c
 create mode 100644 sound/soc/amd/acp/acp-mach-common.c
 create mode 100644 sound/soc/amd/acp/acp-mach.h
 create mode 100644 sound/soc/amd/acp/acp-platform.c
 create mode 100644 sound/soc/amd/acp/acp-renoir.c
 create mode 100644 sound/soc/amd/acp/acp-sof-mach.c
 create mode 100644 sound/soc/amd/acp/amd.h
 create mode 100644 sound/soc/amd/acp/chip_offset_byte.h

--
2.25.1

diff --cc sound/soc/amd/Kconfig
index a01ade3,f430b9a..56e7c07
--- 1/sound/soc/amd/Kconfig
--- 2/sound/soc/amd/Kconfig
+++ b/sound/soc/amd/Kconfig
@@@ -75,23 -75,4 +75,25 @@@ config SND_SOC_AMD_VANGOGH_MAC
          Say m if you have such a device.
          If unsure select "N".
  
 +config SND_SOC_AMD_ACP6x
 +      tristate "AMD Audio Coprocessor-v6.x Yellow Carp support"
 +      depends on X86 && PCI
 +      help
 +        This option enables Audio Coprocessor i.e ACP v6.x support on
 +        AMD Yellow Carp platform. By enabling this flag build will be
 +        triggered for ACP PCI driver, ACP PDM DMA driver.
 +        Say m if you have such a device.
 +        If unsure select "N".
 +
 +config SND_SOC_AMD_YC_MACH
 +      tristate "AMD YC support for DMIC"
 +      select SND_SOC_DMIC
 +      depends on SND_SOC_AMD_ACP6x
 +      help
 +        This option enables machine driver for Yellow Carp platform
 +        using dmic. ACP IP has PDM Decoder block with DMA controller.
 +        DMIC can be connected directly to ACP IP.
 +        Say m if you have such a device.
 +        If unsure select "N".
++
+ source "sound/soc/amd/acp/Kconfig"

diff --cc sound/soc/amd/Makefile
index c5b900d,9878907..f1d42bb
--- 1/sound/soc/amd/Makefile
--- 2/sound/soc/amd/Makefile
+++ b/sound/soc/amd/Makefile
@@@ -11,4 -11,4 +11,5 @@@ obj-$(CONFIG_SND_SOC_AMD_ACP3x) += rave
  obj-$(CONFIG_SND_SOC_AMD_RV_RT5682_MACH) += snd-soc-acp-rt5682-mach.o
  obj-$(CONFIG_SND_SOC_AMD_RENOIR) += renoir/
  obj-$(CONFIG_SND_SOC_AMD_ACP5x) += vangogh/
 +obj-$(CONFIG_SND_SOC_AMD_ACP6x) += yc/
+ obj-$(CONFIG_SND_SOC_AMD_ACP_COMMON) += acp/