Merge branch 'asoc-4.17' into asoc-4.18 to get adau17x1 changes so
further patches can be applied.
This commit is contained in:
@@ -72,24 +72,28 @@ config SND_SOC_INTEL_BAYTRAIL
|
||||
for Baytrail Chromebooks but this option is now deprecated and is
|
||||
not recommended, use SND_SST_ATOM_HIFI2_PLATFORM instead.
|
||||
|
||||
config SND_SST_ATOM_HIFI2_PLATFORM
|
||||
tristate
|
||||
select SND_SOC_COMPRESS
|
||||
|
||||
config SND_SST_ATOM_HIFI2_PLATFORM_PCI
|
||||
tristate "PCI HiFi2 (Medfield, Merrifield) Platforms"
|
||||
tristate "PCI HiFi2 (Merrifield) Platforms"
|
||||
depends on X86 && PCI
|
||||
select SND_SST_IPC_PCI
|
||||
select SND_SOC_COMPRESS
|
||||
select SND_SST_ATOM_HIFI2_PLATFORM
|
||||
help
|
||||
If you have a Intel Medfield or Merrifield/Edison platform, then
|
||||
If you have a Intel Merrifield/Edison platform, then
|
||||
enable this option by saying Y or m. Distros will typically not
|
||||
enable this option: Medfield devices are not available to
|
||||
developers and while Merrifield/Edison can run a mainline kernel with
|
||||
limited functionality it will require a firmware file which
|
||||
is not in the standard firmware tree
|
||||
enable this option: while Merrifield/Edison can run a mainline
|
||||
kernel with limited functionality it will require a firmware file
|
||||
which is not in the standard firmware tree
|
||||
|
||||
config SND_SST_ATOM_HIFI2_PLATFORM
|
||||
config SND_SST_ATOM_HIFI2_PLATFORM_ACPI
|
||||
tristate "ACPI HiFi2 (Baytrail, Cherrytrail) Platforms"
|
||||
default ACPI
|
||||
depends on X86 && ACPI
|
||||
select SND_SST_IPC_ACPI
|
||||
select SND_SOC_COMPRESS
|
||||
select SND_SST_ATOM_HIFI2_PLATFORM
|
||||
select SND_SOC_ACPI_INTEL_MATCH
|
||||
select IOSF_MBI
|
||||
help
|
||||
|
Reference in New Issue
Block a user