Unverified Commit f6081af6 authored by Pierre-Louis Bossart's avatar Pierre-Louis Bossart Committed by Mark Brown
Browse files

ASoC: Intel: boards: handle hda-dsp-common as a module 



hda-dsp-common.o is linked multiple times due to copy/paste and
inertia. Move to a dedicated module with a namespace.

Signed-off-by: default avatarPierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Reviewed-by: default avatarKai Vehmanen <kai.vehmanen@linux.intel.com>
Reviewed-by: default avatarGuennadi Liakhovetski <guennadi.liakhovetski@linux.intel.com>
Link: https://lore.kernel.org/r/20210505163705.305616-6-pierre-louis.bossart@linux.intel.com


Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent 35564e2b

sound/soc/intel/boards/Kconfig

+13 −0
Original line number Diff line number Diff line
@@ -26,6 +26,9 @@ config SND_SOC_INTEL_USER_FRIENDLY_LONG_NAMES 
	  interface.

	  If unsure select N.



config SND_SOC_INTEL_HDA_DSP_COMMON

	tristate



if SND_SOC_INTEL_CATPT



config SND_SOC_INTEL_HASWELL_MACH
@@ -278,6 +281,7 @@ config SND_SOC_INTEL_DA7219_MAX98357A_GENERIC 
	select SND_SOC_MAX98390

	select SND_SOC_DMIC

	select SND_SOC_HDAC_HDMI

	select SND_SOC_INTEL_HDA_DSP_COMMON



config SND_SOC_INTEL_BXT_DA7219_MAX98357A_COMMON

	tristate
@@ -304,6 +308,7 @@ config SND_SOC_INTEL_BXT_RT298_MACH 
	select SND_SOC_RT298

	select SND_SOC_DMIC

	select SND_SOC_HDAC_HDMI

	select SND_SOC_INTEL_HDA_DSP_COMMON

	help

	   This adds support for ASoC machine driver for Broxton platforms

	   with RT286 I2S audio codec.
@@ -422,6 +427,7 @@ config SND_SOC_INTEL_GLK_RT5682_MAX98357A_MACH 
	select SND_SOC_MAX98357A

	select SND_SOC_DMIC

	select SND_SOC_HDAC_HDMI

	select SND_SOC_INTEL_HDA_DSP_COMMON

	help

	   This adds support for ASoC machine driver for Geminilake platforms

	   with RT5682 + MAX98357A I2S audio codec.
@@ -437,6 +443,7 @@ config SND_SOC_INTEL_SKL_HDA_DSP_GENERIC_MACH 
	depends on SND_HDA_CODEC_HDMI

	depends on GPIOLIB

	select SND_SOC_HDAC_HDMI

	select SND_SOC_INTEL_HDA_DSP_COMMON

	select SND_SOC_DMIC

	# SND_SOC_HDAC_HDA is already selected

	help
@@ -461,6 +468,7 @@ config SND_SOC_INTEL_SOF_RT5682_MACH 
	select SND_SOC_RT5682_I2C

	select SND_SOC_DMIC

	select SND_SOC_HDAC_HDMI

	select SND_SOC_INTEL_HDA_DSP_COMMON

	help

	   This adds support for ASoC machine driver for SOF platforms

	   with rt5682 codec.
@@ -473,6 +481,7 @@ config SND_SOC_INTEL_SOF_PCM512x_MACH 
	depends on (SND_SOC_SOF_HDA_AUDIO_CODEC && (MFD_INTEL_LPSS || COMPILE_TEST)) ||\

		   (SND_SOC_SOF_BAYTRAIL && (X86_INTEL_LPSS || COMPILE_TEST))

	depends on SND_HDA_CODEC_HDMI

	select SND_SOC_INTEL_HDA_DSP_COMMON

	select SND_SOC_PCM512x_I2C

	help

	  This adds support for ASoC machine driver for SOF platforms
@@ -504,6 +513,7 @@ config SND_SOC_INTEL_SOF_CML_RT1011_RT5682_MACH 
	select SND_SOC_RT5682_I2C

	select SND_SOC_DMIC

	select SND_SOC_HDAC_HDMI

	select SND_SOC_INTEL_HDA_DSP_COMMON

	help

	  This adds support for ASoC machine driver for SOF platform with

	  RT1011 + RT5682 I2S codec.
@@ -519,6 +529,7 @@ config SND_SOC_INTEL_SOF_DA7219_MAX98373_MACH 
	depends on I2C && ACPI && GPIOLIB

	depends on MFD_INTEL_LPSS || COMPILE_TEST

	depends on SND_HDA_CODEC_HDMI && SND_SOC_SOF_HDA_AUDIO_CODEC

	select SND_SOC_INTEL_HDA_DSP_COMMON

	select SND_SOC_DA7219

	select SND_SOC_MAX98373_I2C

	select SND_SOC_DMIC
@@ -539,6 +550,7 @@ config SND_SOC_INTEL_EHL_RT5660_MACH 
	depends on SND_HDA_CODEC_HDMI && SND_SOC_SOF_HDA_AUDIO_CODEC

	select SND_SOC_RT5660

	select SND_SOC_DMIC

	select SND_SOC_INTEL_HDA_DSP_COMMON

	help

	  This adds support for ASoC machine driver for Elkhart Lake

	  platform with RT5660 I2S audio codec.
@@ -566,6 +578,7 @@ config SND_SOC_INTEL_SOUNDWIRE_SOF_MACH 
	select SND_SOC_RT715_SDCA_SDW

	select SND_SOC_RT5682_SDW

	select SND_SOC_DMIC

	select SND_SOC_INTEL_HDA_DSP_COMMON

	help

	  Add support for Intel SoundWire-based platforms connected to

	  MAX98373, RT700, RT711, RT1308 and RT715

sound/soc/intel/boards/Makefile

+14 −10
Original line number Diff line number Diff line
@@ -3,11 +3,11 @@ snd-soc-sst-haswell-objs := haswell.o 
snd-soc-sst-bdw-rt5650-mach-objs := bdw-rt5650.o

snd-soc-sst-bdw-rt5677-mach-objs := bdw-rt5677.o

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

snd-soc-sst-bxt-da7219_max98357a-objs := bxt_da7219_max98357a.o hda_dsp_common.o

snd-soc-sst-bxt-rt298-objs := bxt_rt298.o hda_dsp_common.o

snd-soc-sst-sof-pcm512x-objs := sof_pcm512x.o hda_dsp_common.o

snd-soc-sst-bxt-da7219_max98357a-objs := bxt_da7219_max98357a.o

snd-soc-sst-bxt-rt298-objs := bxt_rt298.o

snd-soc-sst-sof-pcm512x-objs := sof_pcm512x.o

snd-soc-sst-sof-wm8804-objs := sof_wm8804.o

snd-soc-sst-glk-rt5682_max98357a-objs := glk_rt5682_max98357a.o hda_dsp_common.o

snd-soc-sst-glk-rt5682_max98357a-objs := glk_rt5682_max98357a.o

snd-soc-sst-bytcr-rt5640-objs := bytcr_rt5640.o

snd-soc-sst-bytcr-rt5651-objs := bytcr_rt5651.o

snd-soc-sst-bytcr-wm5102-objs := bytcr_wm5102.o
@@ -19,19 +19,19 @@ snd-soc-sst-byt-cht-cx2072x-objs := bytcht_cx2072x.o 
snd-soc-sst-byt-cht-da7213-objs := bytcht_da7213.o

snd-soc-sst-byt-cht-es8316-objs := bytcht_es8316.o

snd-soc-sst-byt-cht-nocodec-objs := bytcht_nocodec.o

snd-soc-sof_rt5682-objs := sof_rt5682.o hda_dsp_common.o sof_maxim_common.o sof_realtek_common.o

snd-soc-cml_rt1011_rt5682-objs := cml_rt1011_rt5682.o hda_dsp_common.o

snd-soc-sof_rt5682-objs := sof_rt5682.o sof_maxim_common.o sof_realtek_common.o

snd-soc-cml_rt1011_rt5682-objs := cml_rt1011_rt5682.o

snd-soc-kbl_da7219_max98357a-objs := kbl_da7219_max98357a.o

snd-soc-kbl_da7219_max98927-objs := kbl_da7219_max98927.o

snd-soc-kbl_rt5663_max98927-objs := kbl_rt5663_max98927.o

snd-soc-kbl_rt5663_rt5514_max98927-objs := kbl_rt5663_rt5514_max98927.o

snd-soc-kbl_rt5660-objs := kbl_rt5660.o

snd-soc-skl_rt286-objs := skl_rt286.o

snd-soc-skl_hda_dsp-objs := skl_hda_dsp_generic.o skl_hda_dsp_common.o hda_dsp_common.o

snd-soc-skl_hda_dsp-objs := skl_hda_dsp_generic.o skl_hda_dsp_common.o

snd-skl_nau88l25_max98357a-objs := skl_nau88l25_max98357a.o

snd-soc-skl_nau88l25_ssm4567-objs := skl_nau88l25_ssm4567.o

snd-soc-sof_da7219_max98373-objs := sof_da7219_max98373.o hda_dsp_common.o

snd-soc-ehl-rt5660-objs := ehl_rt5660.o hda_dsp_common.o

snd-soc-sof_da7219_max98373-objs := sof_da7219_max98373.o

snd-soc-ehl-rt5660-objs := ehl_rt5660.o

snd-soc-sof-sdw-objs += sof_sdw.o				\

			sof_sdw_max98373.o			\

			sof_sdw_rt1308.o sof_sdw_rt1316.o	\
@@ -39,7 +39,7 @@ snd-soc-sof-sdw-objs += sof_sdw.o \ 
			sof_sdw_rt711.o sof_sdw_rt711_sdca.o 	\

			sof_sdw_rt715.o	sof_sdw_rt715_sdca.o 	\

			sof_maxim_common.o                      \

			sof_sdw_dmic.o sof_sdw_hdmi.o hda_dsp_common.o

			sof_sdw_dmic.o sof_sdw_hdmi.o

obj-$(CONFIG_SND_SOC_INTEL_SOF_RT5682_MACH) += snd-soc-sof_rt5682.o

obj-$(CONFIG_SND_SOC_INTEL_HASWELL_MACH) += snd-soc-sst-haswell.o

obj-$(CONFIG_SND_SOC_INTEL_BXT_DA7219_MAX98357A_COMMON) += snd-soc-sst-bxt-da7219_max98357a.o
@@ -74,3 +74,7 @@ obj-$(CONFIG_SND_SOC_INTEL_SKL_HDA_DSP_GENERIC_MACH) += snd-soc-skl_hda_dsp.o 
obj-$(CONFIG_SND_SOC_INTEL_SOF_DA7219_MAX98373_MACH) += snd-soc-sof_da7219_max98373.o

obj-$(CONFIG_SND_SOC_INTEL_EHL_RT5660_MACH) += snd-soc-ehl-rt5660.o

obj-$(CONFIG_SND_SOC_INTEL_SOUNDWIRE_SOF_MACH) += snd-soc-sof-sdw.o



# common modules

snd-soc-intel-hda-dsp-common-objs := hda_dsp_common.o

obj-$(CONFIG_SND_SOC_INTEL_HDA_DSP_COMMON) += snd-soc-intel-hda-dsp-common.o

sound/soc/intel/boards/bxt_da7219_max98357a.c

+1 −0
Original line number Diff line number Diff line
@@ -869,3 +869,4 @@ MODULE_LICENSE("GPL v2"); 
MODULE_ALIAS("platform:bxt_da7219_max98357a");

MODULE_ALIAS("platform:glk_da7219_max98357a");

MODULE_ALIAS("platform:cml_da7219_max98357a");

MODULE_IMPORT_NS(SND_SOC_INTEL_HDA_DSP_COMMON);

sound/soc/intel/boards/bxt_rt298.c

+1 −0
Original line number Diff line number Diff line
@@ -667,3 +667,4 @@ MODULE_DESCRIPTION("Intel SST Audio for Broxton"); 
MODULE_LICENSE("GPL v2");

MODULE_ALIAS("platform:bxt_alc298s_i2s");

MODULE_ALIAS("platform:glk_alc298s_i2s");

MODULE_IMPORT_NS(SND_SOC_INTEL_HDA_DSP_COMMON);

sound/soc/intel/boards/cml_rt1011_rt5682.c

+1 −0
Original line number Diff line number Diff line
@@ -594,3 +594,4 @@ MODULE_AUTHOR("Shuming Fan <shumingf@realtek.com>"); 
MODULE_AUTHOR("Mac Chiang <mac.chiang@intel.com>");

MODULE_LICENSE("GPL v2");

MODULE_ALIAS("platform:cml_rt1011_rt5682");

MODULE_IMPORT_NS(SND_SOC_INTEL_HDA_DSP_COMMON);