Commit a92ea59b authored by Jie Yang's avatar Jie Yang Committed by Mark Brown
Browse files

ASoC: Intel: sst: only select sst-firmware when DW DMAC is built-in 



The previous commit ef3e199a ("ASoC: Intel: sst: only use
sst-firmware when DW DMAC is available") does not fix the 0day
building errors thoroughly:

   sound/built-in.o: In function 'dw_dma_remove'
   sound/built-in.o: In function 'dw_dma_probe'

Here we fallback to select sst-firmware only when DW DMAC
is built-in selected. We may need to refactor sst common
driver and split DW related codes to platform driver, but
ATM, this fallback may be the smallest fix.

Please be noticed that after applying this patch, we may
need select DW DMAC manually in DMA driver menu, before
we can prompt and select HSW/BDW and old BYT machines.

Signed-off-by: default avatarJie Yang <yang.jie@intel.com>
Cc: Vinod Koul <vinod.koul@intel.com>
Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent 9049a48a

sound/soc/intel/Kconfig

+4 −4
Original line number Diff line number Diff line
@@ -44,7 +44,7 @@ config SND_SOC_INTEL_BAYTRAIL 
config SND_SOC_INTEL_HASWELL_MACH

	tristate "ASoC Audio DSP support for Intel Haswell Lynxpoint"

	depends on X86_INTEL_LPSS && I2C && I2C_DESIGNWARE_PLATFORM

	depends on DW_DMAC_CORE

	depends on DW_DMAC_CORE=y

	select SND_SOC_INTEL_SST

	select SND_SOC_INTEL_HASWELL

	select SND_SOC_RT5640
@@ -57,7 +57,7 @@ config SND_SOC_INTEL_HASWELL_MACH 
config SND_SOC_INTEL_BYT_RT5640_MACH

	tristate "ASoC Audio driver for Intel Baytrail with RT5640 codec"

	depends on X86_INTEL_LPSS && I2C

	depends on DW_DMAC_CORE

	depends on DW_DMAC_CORE=y

	select SND_SOC_INTEL_SST

	select SND_SOC_INTEL_BAYTRAIL

	select SND_SOC_RT5640
@@ -68,7 +68,7 @@ config SND_SOC_INTEL_BYT_RT5640_MACH 
config SND_SOC_INTEL_BYT_MAX98090_MACH

	tristate "ASoC Audio driver for Intel Baytrail with MAX98090 codec"

	depends on X86_INTEL_LPSS && I2C

	depends on DW_DMAC_CORE

	depends on DW_DMAC_CORE=y

	select SND_SOC_INTEL_SST

	select SND_SOC_INTEL_BAYTRAIL

	select SND_SOC_MAX98090
@@ -80,7 +80,7 @@ config SND_SOC_INTEL_BROADWELL_MACH 
	tristate "ASoC Audio DSP support for Intel Broadwell Wildcatpoint"

	depends on X86_INTEL_LPSS && I2C && DW_DMAC && \

		   I2C_DESIGNWARE_PLATFORM

	depends on DW_DMAC_CORE

	depends on DW_DMAC_CORE=y

	select SND_SOC_INTEL_SST

	select SND_SOC_INTEL_HASWELL

	select SND_SOC_RT286

sound/soc/intel/common/Makefile

+1 −3
Original line number Diff line number Diff line
@@ -2,9 +2,7 @@ snd-soc-sst-dsp-objs := sst-dsp.o 
snd-soc-sst-acpi-objs := sst-acpi.o sst-match-acpi.o

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



ifneq ($(CONFIG_DW_DMAC_CORE),)

snd-soc-sst-dsp-objs += sst-firmware.o

endif

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

sound/soc/intel/common/sst-dsp.c

+1 −1
Original line number Diff line number Diff line
@@ -420,7 +420,7 @@ void sst_dsp_inbox_read(struct sst_dsp *sst, void *message, size_t bytes) 
}

EXPORT_SYMBOL_GPL(sst_dsp_inbox_read);



#if IS_ENABLED(CONFIG_DW_DMAC_CORE)

#ifdef CONFIG_DW_DMAC_CORE

struct sst_dsp *sst_dsp_new(struct device *dev,

	struct sst_dsp_device *sst_dev, struct sst_pdata *pdata)

{

sound/soc/intel/common/sst-dsp.h

+1 −1
Original line number Diff line number Diff line
@@ -216,7 +216,7 @@ struct sst_pdata { 
	void *dsp;

};



#if IS_ENABLED(CONFIG_DW_DMAC_CORE)

#ifdef CONFIG_DW_DMAC_CORE

/* Initialization */

struct sst_dsp *sst_dsp_new(struct device *dev,

	struct sst_dsp_device *sst_dev, struct sst_pdata *pdata);

CRA Git | Maintained and supported by SUSTech CRA and CCSE