Skip to content

Commit ca571e5

Browse files
brentlubroonie
authored andcommitted
ASoC: Intel: cml_rt1011_rt5682: delete driver
Delete this driver and use sof_rt5682 machine driver instead. Reviewed-by: Chao Song <chao.song@linux.intel.com> Signed-off-by: Brent Lu <brent.lu@intel.com> Signed-off-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com> Link: https://lore.kernel.org/r/20240411220347.131267-12-pierre-louis.bossart@linux.intel.com Signed-off-by: Mark Brown <broonie@kernel.org>
1 parent 6136d87 commit ca571e5

4 files changed

Lines changed: 4 additions & 621 deletions

File tree

sound/soc/intel/boards/Kconfig

Lines changed: 3 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -595,17 +595,11 @@ config SND_SOC_INTEL_CML_LP_DA7219_MAX98357A_MACH
595595

596596
config SND_SOC_INTEL_SOF_CML_RT1011_RT5682_MACH
597597
tristate "CML with RT1011 and RT5682 in I2S Mode"
598-
depends on I2C && ACPI
599-
depends on MFD_INTEL_LPSS || COMPILE_TEST
600-
depends on SND_HDA_CODEC_HDMI && SND_SOC_SOF_HDA_AUDIO_CODEC
601-
select SND_SOC_RT1011
602-
select SND_SOC_RT5682_I2C
603-
select SND_SOC_DMIC
604-
select SND_SOC_HDAC_HDMI
605-
select SND_SOC_INTEL_HDA_DSP_COMMON
598+
imply SND_SOC_INTEL_SOF_RT5682_MACH
606599
help
607600
This adds support for ASoC machine driver for SOF platform with
608-
RT1011 + RT5682 I2S codec.
601+
RT1011 + RT5682 I2S codec. This option is deprecated and please used
602+
SND_SOC_INTEL_SOF_RT5682_MACH instead.
609603
Say Y if you have such a device.
610604
If unsure select "N".
611605

sound/soc/intel/boards/Makefile

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,6 @@ snd-soc-sof_cs42l42-objs := sof_cs42l42.o
2424
snd-soc-sof_es8336-objs := sof_es8336.o
2525
snd-soc-sof_nau8825-objs := sof_nau8825.o
2626
snd-soc-sof_da7219-objs := sof_da7219.o
27-
snd-soc-cml_rt1011_rt5682-objs := cml_rt1011_rt5682.o
2827
snd-soc-kbl_da7219_max98357a-objs := kbl_da7219_max98357a.o
2928
snd-soc-kbl_da7219_max98927-objs := kbl_da7219_max98927.o
3029
snd-soc-kbl_rt5663_max98927-objs := kbl_rt5663_max98927.o
@@ -71,7 +70,6 @@ obj-$(CONFIG_SND_SOC_INTEL_BYT_CHT_CX2072X_MACH) += snd-soc-sst-byt-cht-cx2072x.
7170
obj-$(CONFIG_SND_SOC_INTEL_BYT_CHT_DA7213_MACH) += snd-soc-sst-byt-cht-da7213.o
7271
obj-$(CONFIG_SND_SOC_INTEL_BYT_CHT_ES8316_MACH) += snd-soc-sst-byt-cht-es8316.o
7372
obj-$(CONFIG_SND_SOC_INTEL_BYT_CHT_NOCODEC_MACH) += snd-soc-sst-byt-cht-nocodec.o
74-
obj-$(CONFIG_SND_SOC_INTEL_SOF_CML_RT1011_RT5682_MACH) += snd-soc-cml_rt1011_rt5682.o
7573
obj-$(CONFIG_SND_SOC_INTEL_KBL_DA7219_MAX98357A_MACH) += snd-soc-kbl_da7219_max98357a.o
7674
obj-$(CONFIG_SND_SOC_INTEL_KBL_DA7219_MAX98927_MACH) += snd-soc-kbl_da7219_max98927.o
7775
obj-$(CONFIG_SND_SOC_INTEL_KBL_RT5663_MAX98927_MACH) += snd-soc-kbl_rt5663_max98927.o

0 commit comments

Comments
 (0)