Commit 2dcffcee authored by Vinod Koul's avatar Vinod Koul Committed by Mark Brown
Browse files

ASoC: Intel: Create independent acpi match module 



The ACPI match module is common to all three drivers, HSW, SKL
and Atom-DPCM driver. But Atom-DPCM driver does not use common
sst code so we cannot include the common SST module in Atom-DPCM
driver.

So the solution is to have a independent sst-match-acpi module
which helps in matching for all the three drivers. Now all driver
can be inbuilt in a single image

This patch really fixes the regression introduced by the
commit 95f09801 ("ASoC: Intel: Move apci find machine routines")

Acked-by: default avatarJie Yang <yang.jie@intel.com>
Acked-by: default avatarPierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Signed-off-by: default avatarVinod Koul <vinod.koul@intel.com>
Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent 902c136f

sound/soc/intel/Kconfig

+9 −0
Original line number Diff line number Diff line
@@ -30,11 +30,15 @@ config SND_SST_IPC_ACPI 
config SND_SOC_INTEL_SST

	tristate

	select SND_SOC_INTEL_SST_ACPI if ACPI

	select SND_SOC_INTEL_SST_MATCH if ACPI

	depends on (X86 || COMPILE_TEST)



config SND_SOC_INTEL_SST_ACPI

	tristate



config SND_SOC_INTEL_SST_MATCH

	tristate



config SND_SOC_INTEL_HASWELL

	tristate
@@ -97,6 +101,7 @@ config SND_SOC_INTEL_BYTCR_RT5640_MACH 
	select SND_SOC_RT5640

	select SND_SST_MFLD_PLATFORM

	select SND_SST_IPC_ACPI

	select SND_SOC_INTEL_SST_MATCH if ACPI

	help

          This adds support for ASoC machine driver for Intel(R) Baytrail and Baytrail-CR

          platforms with RT5640 audio codec.
@@ -109,6 +114,7 @@ config SND_SOC_INTEL_BYTCR_RT5651_MACH 
	select SND_SOC_RT5651

	select SND_SST_MFLD_PLATFORM

	select SND_SST_IPC_ACPI

	select SND_SOC_INTEL_SST_MATCH if ACPI

	help

          This adds support for ASoC machine driver for Intel(R) Baytrail and Baytrail-CR

          platforms with RT5651 audio codec.
@@ -121,6 +127,7 @@ config SND_SOC_INTEL_CHT_BSW_RT5672_MACH 
        select SND_SOC_RT5670

        select SND_SST_MFLD_PLATFORM

        select SND_SST_IPC_ACPI

	select SND_SOC_INTEL_SST_MATCH if ACPI

        help

          This adds support for ASoC machine driver for Intel(R) Cherrytrail & Braswell

          platforms with RT5672 audio codec.
@@ -133,6 +140,7 @@ config SND_SOC_INTEL_CHT_BSW_RT5645_MACH 
	select SND_SOC_RT5645

	select SND_SST_MFLD_PLATFORM

	select SND_SST_IPC_ACPI

	select SND_SOC_INTEL_SST_MATCH if ACPI

	help

	  This adds support for ASoC machine driver for Intel(R) Cherrytrail & Braswell

	  platforms with RT5645/5650 audio codec.
@@ -145,6 +153,7 @@ config SND_SOC_INTEL_CHT_BSW_MAX98090_TI_MACH 
	select SND_SOC_TS3A227E

	select SND_SST_MFLD_PLATFORM

	select SND_SST_IPC_ACPI

	select SND_SOC_INTEL_SST_MATCH if ACPI

	help

      This adds support for ASoC machine driver for Intel(R) Cherrytrail & Braswell

      platforms with MAX98090 audio codec it also can support TI jack chip as aux device.

sound/soc/intel/common/Makefile

+3 −1
Original line number Diff line number Diff line 
snd-soc-sst-dsp-objs := sst-dsp.o

snd-soc-sst-acpi-objs := sst-acpi.o sst-match-acpi.o

snd-soc-sst-acpi-objs := sst-acpi.o

snd-soc-sst-match-objs := sst-match-acpi.o

snd-soc-sst-ipc-objs := sst-ipc.o



snd-soc-sst-dsp-$(CONFIG_DW_DMAC_CORE) += sst-firmware.o



obj-$(CONFIG_SND_SOC_INTEL_SST) += snd-soc-sst-dsp.o snd-soc-sst-ipc.o

obj-$(CONFIG_SND_SOC_INTEL_SST_ACPI) += snd-soc-sst-acpi.o

obj-$(CONFIG_SND_SOC_INTEL_SST_MATCH) += snd-soc-sst-match.o

CRA Git | Maintained and supported by SUSTech CRA and CCSE