Skip to content

Commit 0cb6a81

Browse files
brentlubroonie
authored andcommitted
ASoC: Intel: glk_rt5682_max98357a: delete driver
Delete this driver and use sof_rt5682 machine driver instead. Reviewed-by: Bard Liao <[email protected]> Signed-off-by: Brent Lu <[email protected]> Signed-off-by: Pierre-Louis Bossart <[email protected]> Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Mark Brown <[email protected]>
1 parent 5498a4e commit 0cb6a81

File tree

4 files changed

+4
-706
lines changed

4 files changed

+4
-706
lines changed

sound/soc/intel/boards/Kconfig

Lines changed: 3 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -438,18 +438,11 @@ config SND_SOC_INTEL_GLK_DA7219_MAX98357A_MACH
438438

439439
config SND_SOC_INTEL_GLK_RT5682_MAX98357A_MACH
440440
tristate "GLK with RT5682 and MAX98357A in I2S Mode"
441-
depends on I2C && ACPI
442-
depends on MFD_INTEL_LPSS || COMPILE_TEST
443-
depends on SND_HDA_CODEC_HDMI && SND_SOC_SOF_HDA_AUDIO_CODEC
444-
select SND_SOC_RT5682_I2C
445-
select SND_SOC_RT5682S
446-
select SND_SOC_MAX98357A
447-
select SND_SOC_DMIC
448-
select SND_SOC_HDAC_HDMI
449-
select SND_SOC_INTEL_HDA_DSP_COMMON
441+
imply SND_SOC_INTEL_SOF_RT5682_MACH
450442
help
451443
This adds support for ASoC machine driver for Geminilake platforms
452-
with RT5682 + MAX98357A I2S audio codec.
444+
with RT5682 + MAX98357A I2S audio codec. This option is deprecated
445+
and please use SND_SOC_INTEL_SOF_RT5682_MACH instead.
453446
Say Y if you have such a device.
454447
If unsure select "N".
455448

sound/soc/intel/boards/Makefile

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@ snd-soc-sst-bxt-da7219_max98357a-objs := bxt_da7219_max98357a.o
77
snd-soc-sst-bxt-rt298-objs := bxt_rt298.o
88
snd-soc-sst-sof-pcm512x-objs := sof_pcm512x.o
99
snd-soc-sst-sof-wm8804-objs := sof_wm8804.o
10-
snd-soc-sst-glk-rt5682_max98357a-objs := glk_rt5682_max98357a.o
1110
snd-soc-sst-bytcr-rt5640-objs := bytcr_rt5640.o
1211
snd-soc-sst-bytcr-rt5651-objs := bytcr_rt5651.o
1312
snd-soc-sst-bytcr-wm5102-objs := bytcr_wm5102.o
@@ -55,7 +54,6 @@ obj-$(CONFIG_SND_SOC_INTEL_BXT_DA7219_MAX98357A_MACH) += snd-soc-sst-bxt-da7219_
5554
obj-$(CONFIG_SND_SOC_INTEL_BXT_RT298_MACH) += snd-soc-sst-bxt-rt298.o
5655
obj-$(CONFIG_SND_SOC_INTEL_SOF_PCM512x_MACH) += snd-soc-sst-sof-pcm512x.o
5756
obj-$(CONFIG_SND_SOC_INTEL_SOF_WM8804_MACH) += snd-soc-sst-sof-wm8804.o
58-
obj-$(CONFIG_SND_SOC_INTEL_GLK_RT5682_MAX98357A_MACH) += snd-soc-sst-glk-rt5682_max98357a.o
5957
obj-$(CONFIG_SND_SOC_INTEL_BROADWELL_MACH) += snd-soc-bdw-rt286.o
6058
obj-$(CONFIG_SND_SOC_INTEL_BDW_RT5650_MACH) += snd-soc-sst-bdw-rt5650-mach.o
6159
obj-$(CONFIG_SND_SOC_INTEL_BDW_RT5677_MACH) += snd-soc-sst-bdw-rt5677-mach.o

0 commit comments

Comments
 (0)