Skip to content

Clean up cnl_rt700 machine driver #2

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

Closed
bardliao wants to merge 2 commits into from
Closed

Clean up cnl_rt700 machine driver #2

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
54f17aa
ASoC: Intel: icl-match: add rt700 matching table
bardliao Jun 20, 2019
a7ea113
ASoC: intel: clean up cnl_rt700 machine driver
bardliao Jun 20, 2019
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
10 changes: 5 additions & 5 deletions sound/soc/intel/boards/Kconfig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -436,13 +436,13 @@ config SND_SOC_INTEL_SOF_RT5682_MACH
If unsure select "N".
endif ## SND_SOC_SOF_HDA_COMMON || SND_SOC_SOF_BAYTRAIL

if SND_SOC_INTEL_SKYLAKE
config SND_SOC_INTEL_CNL_RT700_MACH
tristate "SOC Machine Audio driver for CNL Platform"
depends on X86 && ACPI
if SND_SOC_SOF_SOUNDWIRE
config SND_SOC_INTEL_SOUNDWIRE_RT700_MACH
tristate "CNL with RT700 codec"
depends on SOUNDWIRE && ACPI
select SND_SOC_RT700
select SND_SOC_RT700_SDW
select SND_SOC_DMIC
select SND_SOC_HDAC_HDMI if SND_SOC_SOF_HDA
help
This adds support for ASoC machine driver . This will create an alsa
sound card.
Expand Down
2 changes: 1 addition & 1 deletion sound/soc/intel/boards/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,5 +61,5 @@ obj-$(CONFIG_SND_SOC_INTEL_SKL_RT286_MACH) += snd-soc-skl_rt286.o
obj-$(CONFIG_SND_SOC_INTEL_SKL_NAU88L25_MAX98357A_MACH) += snd-skl_nau88l25_max98357a.o
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_CNL_RT700_MACH) += snd-soc-cnl_rt700.o
obj-$(CONFIG_SND_SOC_INTEL_SOUNDWIRE_RT700_MACH) += snd-soc-cnl_rt700.o

Loading