Skip to content

Split Baytrail and Edison support #448

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
Dec 18, 2018
Merged

Split Baytrail and Edison support #448

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
a7df132
ASoC: SOF: Intel: Baytrail: prepare Edison cleanup
plbossart Dec 15, 2018
6abe01e
ASoC: SOF: Intel: add Edison support
plbossart Dec 15, 2018
ea8d88f
ASoC: SOF: Intel: prepare Edison support without BAYTRAIL
plbossart Dec 15, 2018
5031018
ASoC: SOF: Intel: compile out EDISON or BAYTRAIL if needed
plbossart Dec 15, 2018
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
25 changes: 24 additions & 1 deletion sound/soc/sof/intel/Kconfig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ config SND_SOC_SOF_INTEL_ACPI

config SND_SOC_SOF_INTEL_PCI
tristate
select SND_SOC_SOF_EDISON if SND_SOC_SOF_EDISON_SUPPORT
select SND_SOC_SOF_APOLLOLAKE if SND_SOC_SOF_APOLLOLAKE_SUPPORT
select SND_SOC_SOF_GEMINILAKE if SND_SOC_SOF_GEMINILAKE_SUPPORT
select SND_SOC_SOF_CANNONLAKE if SND_SOC_SOF_CANNONLAKE_SUPPORT
Expand All @@ -29,6 +30,13 @@ config SND_SOC_SOF_INTEL_PCI
This option is not user-selectable but automagically handled by
'select' statements at a higher level

config SND_SOC_SOF_INTEL_ATOM_HIFI_EP
tristate
select SND_SOC_INTEL_COMMON
help
This option is not user-selectable but automagically handled by
'select' statements at a higher level

config SND_SOC_SOF_INTEL_COMMON
tristate
select SND_SOC_ACPI_INTEL_MATCH
Expand All @@ -51,7 +59,7 @@ config SND_SOC_SOF_BAYTRAIL_SUPPORT

config SND_SOC_SOF_BAYTRAIL
tristate
select SND_SOC_INTEL_COMMON
select SND_SOC_SOF_INTEL_ATOM_HIFI_EP
help
This option is not user-selectable but automagically handled by
'select' statements at a higher level
Expand Down Expand Up @@ -90,6 +98,21 @@ endif ## SND_SOC_SOF_INTEL_ACPI

if SND_SOC_SOF_INTEL_PCI

config SND_SOC_SOF_EDISON_SUPPORT
bool "SOF support for Tangier/Edison"
help
This adds support for Sound Open Firmware for Intel(R) platforms
using the Baytrail, Braswell or Cherrytrail processors.
Say Y if you have such a device.
If unsure select "N".

config SND_SOC_SOF_EDISON
tristate
select SND_SOC_SOF_INTEL_ATOM_HIFI_EP
help
This option is not user-selectable but automagically handled by
'select' statements at a higher level

config SND_SOC_SOF_APOLLOLAKE_SUPPORT
bool "SOF support for Apollolake"
help
Expand Down
2 changes: 1 addition & 1 deletion sound/soc/sof/intel/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ snd-sof-intel-hda-common-objs := hda.o hda-loader.o hda-stream.o hda-trace.o \

snd-sof-intel-hda-objs := hda-codec.o

obj-$(CONFIG_SND_SOC_SOF_BAYTRAIL) += snd-sof-intel-byt.o
obj-$(CONFIG_SND_SOC_SOF_INTEL_ATOM_HIFI_EP) += snd-sof-intel-byt.o
obj-$(CONFIG_SND_SOC_SOF_HASWELL) += snd-sof-intel-hsw.o
obj-$(CONFIG_SND_SOC_SOF_BROADWELL) += snd-sof-intel-bdw.o
obj-$(CONFIG_SND_SOC_SOF_HDA_COMMON) += snd-sof-intel-hda-common.o
Expand Down
Loading