Skip to content

Fix sdw machine drivers #1794

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
plbossart merged 4 commits into from
Feb 18, 2020
Merged

Fix sdw machine drivers #1794

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
b9bf35f
ASoC: Intel: sdw_rt700: remove support for HDAC_HDMI
plbossart Feb 14, 2020
0a80889
ASoC: Intel: sdw_rt711_rt1308_rt715: remove support for HDAC_HDMI
plbossart Feb 14, 2020
d988721
ASoC: Intel: sdw_rt711_rt1308_rt715: use correct Kconfig to disable H…
plbossart Feb 15, 2020
a5131b0
ASoC: Intel: remove sdw_rt711_i2s_rt1308 machine driver
plbossart Feb 15, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 0 additions & 21 deletions sound/soc/intel/boards/Kconfig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -518,25 +518,6 @@ config SND_SOC_INTEL_SOF_CML_RT1011_RT5682_MACH

endif ## SND_SOC_SOF_COMETLAKE_LP && SND_SOC_SOF_HDA_LINK

if SND_SOC_SOF_TIGERLAKE && SND_SOC_SOF_INTEL_SOUNDWIRE

config SND_SOC_INTEL_TGL_RT711_RT1308_MACH
tristate "TGL with RT711 in SDW mode and RT1308 in I2S Mode"
depends on I2C && ACPI
depends on MFD_INTEL_LPSS || COMPILE_TEST
select SND_SOC_RT711_SDW
select SND_SOC_RT1308
select SND_SOC_DMIC
select SND_HDA_CODEC_HDMI if SND_SOC_SOF_HDA_AUDIO_CODEC
select SND_SOC_HDAC_HDMI if SND_SOC_SOF_HDA_LINK
help
This adds support for ASoC machine driver for Tigerlake platforms
with SoundWire RT711 and RT1308 I2S audio codec.
Say Y if you have such a device.
If unsure select "N".

endif ## SND_SOC_SOF_TIGERLAKE && SND_SOC_SOF_INTEL_SOUNDWIRE

if SND_SOC_SOF_JASPERLAKE

config SND_SOC_INTEL_SOF_DA7219_MAX98373_MACH
Expand All @@ -563,7 +544,6 @@ config SND_SOC_INTEL_SOUNDWIRE_RT700_MACH
depends on SND_HDA_CODEC_HDMI
select SND_SOC_RT700_SDW
select SND_SOC_DMIC
select SND_SOC_HDAC_HDMI if SND_SOC_SOF_HDA_LINK

@lyakh lyakh Feb 17, 2020

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I still see #if IS_ENABLED(CONFIG_SND_SOC_HDAC_HDMI) in sound/soc/intel/boards/sdw_rt700.c - shouldn't all that code be converted or removed too?

@kv2019i kv2019i Feb 18, 2020

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ack @lyakh you are right, sdw_rt700.c needs further update with this patch.

@plbossart plbossart Feb 18, 2020

Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

we'll do this later in a follow-up patch. sdw_rt700 is only for Intel reference boards, there's no product based on it.

help
Add support for Intel SoundWire-based platforms connected to RT700
on link 0 or 1
Expand All @@ -576,7 +556,6 @@ config SND_SOC_INTEL_SOUNDWIRE_RT711_RT1308_RT715_MACH
select SND_SOC_RT711_SDW
select SND_SOC_RT1308_SDW
select SND_SOC_RT715_SDW
select SND_SOC_HDAC_HDMI if SND_SOC_SOF_HDA_LINK
help
Add support for Intel SoundWire-based platforms connected to RT711,
RT1308 and RT715
Expand Down
2 changes: 0 additions & 2 deletions sound/soc/intel/boards/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,6 @@ snd-soc-skl_hda_dsp-objs := skl_hda_dsp_generic.o skl_hda_dsp_common.o hda_dsp_c
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-tgl-rt711-rt1308-objs := sdw_rt711_i2s_rt1308.o hda_dsp_common.o
snd-soc-sdw-rt700-objs := sdw_rt700.o hda_dsp_common.o
snd-soc-sdw-rt711-rt1308-rt715-objs := sdw_rt711_rt1308_rt715.o hda_dsp_common.o

Expand Down Expand Up @@ -69,6 +68,5 @@ obj-$(CONFIG_SND_SOC_INTEL_SKL_NAU88L25_MAX98357A_MACH) += snd-skl_nau88l25_max9
obj-$(CONFIG_SND_SOC_INTEL_SKL_NAU88L25_SSM4567_MACH) += snd-soc-skl_nau88l25_ssm4567.o
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_TGL_RT711_RT1308_MACH) += snd-soc-tgl-rt711-rt1308.o
obj-$(CONFIG_SND_SOC_INTEL_SOUNDWIRE_RT700_MACH) += snd-soc-sdw-rt700.o
obj-$(CONFIG_SND_SOC_INTEL_SOUNDWIRE_RT711_RT1308_RT715_MACH) += snd-soc-sdw-rt711-rt1308-rt715.o
Loading