Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Unverified Commit 4772c16e authored by Pierre-Louis Bossart's avatar Pierre-Louis Bossart Committed by Mark Brown
Browse files

ASoC: Intel: Kconfig: Simplify-clarify ACPI/PCI dependencies 



PCI/ACPI selections should not happen in Kconfig for machine drivers,
move to SOC selections.

Add distinction between PCI and ACPI HiFi2 platforms and help text.

There should be no functionality change.

The PCI-based platforms may be removed at some point since Medfield
is not really supported by anyone, and with Edison now defunct support for
Merrifield/Edison is to be determined.

The dependency on SND_DMA_SGBUF for Haswell is not clear at this
point and may have to be further updated.

Signed-off-by: default avatarPierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Reviewed-by: default avatarAndy Shevchenko <andriy.shevchenko@linux.intel.com>
Acked-By: default avatarVinod Koul <vinod.koul@intel.com>
Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent c6059879

sound/soc/intel/Kconfig

+23 −4
Original line number Diff line number Diff line
@@ -41,7 +41,7 @@ config SND_SOC_INTEL_SST_ACPI 
config SND_SOC_INTEL_HASWELL

	tristate "Intel ASoC SST driver for Haswell/Broadwell"

	depends on SND_DMA_SGBUF

	depends on DMADEVICES

	depends on DMADEVICES && ACPI

	select SND_SOC_INTEL_SST

	select SND_SOC_INTEL_SST_FIRMWARE

	select SND_SOC_ACPI_INTEL_MATCH
@@ -52,7 +52,7 @@ config SND_SOC_INTEL_HASWELL 


config SND_SOC_INTEL_BAYTRAIL

	tristate "Intel ASoC SST driver for Baytrail (legacy)"

	depends on DMADEVICES

	depends on DMADEVICES && ACPI

	select SND_SOC_INTEL_SST

	select SND_SOC_INTEL_SST_FIRMWARE

	select SND_SOC_ACPI_INTEL_MATCH
@@ -62,11 +62,30 @@ 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_PCI

	tristate "Intel ASoC SST driver for PCI HiFi2 platforms (Medfield, Merrifield)"

	depends on X86 && PCI

	select SND_SST_IPC_PCI

	select SND_SOC_COMPRESS

	select SND_SOC_INTEL_COMMON

	help

	  If you have a Intel Medfield or 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



config SND_SST_ATOM_HIFI2_PLATFORM

	tristate "Intel ASoC SST driver for HiFi2 platforms (*field, *trail)"

	depends on X86

	tristate "Intel ASoC SST driver for ACPI HiFi2 platforms (Baytrail, Cherrytrail)"

	depends on X86 && ACPI

	select SND_SST_IPC_ACPI

	select SND_SOC_COMPRESS

	select SND_SOC_ACPI_INTEL_MATCH

	help

	  If you have a Intel Baytrail or Cherrytrail platform with an I2S

	  codec, then enable this option by saying Y or m. This is a

	  recommended option



config SND_SOC_INTEL_SKYLAKE

	tristate "Intel ASoC SST driver for SKL/BXT/KBL/GLK/CNL"

sound/soc/intel/boards/Kconfig

+4 −10
Original line number Diff line number Diff line
@@ -12,18 +12,20 @@ menuconfig SND_SOC_INTEL_MACH 


if SND_SOC_INTEL_MACH



if SND_SST_ATOM_HIFI2_PLATFORM_PCI



config SND_MFLD_MACHINE

	tristate "SOC Machine Audio driver for Intel Medfield MID platform"

	depends on INTEL_SCU_IPC

	select SND_SOC_SN95031

	depends on SND_SST_ATOM_HIFI2_PLATFORM

	select SND_SST_IPC_PCI

	help

          This adds support for ASoC machine driver for Intel(R) MID Medfield platform

          used as alsa device in audio substem in Intel(R) MID devices

          Say Y if you have such a device.

          If unsure select "N".



endif



if SND_SOC_INTEL_HASWELL



config SND_SOC_INTEL_HASWELL_MACH
@@ -86,7 +88,6 @@ config SND_SOC_INTEL_BYTCR_RT5640_MACH 
        tristate "ASoC Audio driver for Intel Baytrail and Baytrail-CR with RT5640 codec"

	depends on X86 && I2C && ACPI

	select SND_SOC_RT5640

	select SND_SST_IPC_ACPI

	help

          This adds support for ASoC machine driver for Intel(R) Baytrail and Baytrail-CR

          platforms with RT5640 audio codec.
@@ -97,7 +98,6 @@ config SND_SOC_INTEL_BYTCR_RT5651_MACH 
        tristate "ASoC Audio driver for Intel Baytrail and Baytrail-CR with RT5651 codec"

	depends on X86 && I2C && ACPI

	select SND_SOC_RT5651

	select SND_SST_IPC_ACPI

	help

          This adds support for ASoC machine driver for Intel(R) Baytrail and Baytrail-CR

          platforms with RT5651 audio codec.
@@ -108,7 +108,6 @@ config SND_SOC_INTEL_CHT_BSW_RT5672_MACH 
        tristate "ASoC Audio driver for Intel Cherrytrail & Braswell with RT5672 codec"

	depends on X86_INTEL_LPSS && I2C && ACPI

        select SND_SOC_RT5670

        select SND_SST_IPC_ACPI

        help

          This adds support for ASoC machine driver for Intel(R) Cherrytrail & Braswell

          platforms with RT5672 audio codec.
@@ -119,7 +118,6 @@ config SND_SOC_INTEL_CHT_BSW_RT5645_MACH 
	tristate "ASoC Audio driver for Intel Cherrytrail & Braswell with RT5645/5650 codec"

	depends on X86_INTEL_LPSS && I2C && ACPI

	select SND_SOC_RT5645

	select SND_SST_IPC_ACPI

	help

	  This adds support for ASoC machine driver for Intel(R) Cherrytrail & Braswell

	  platforms with RT5645/5650 audio codec.
@@ -131,7 +129,6 @@ config SND_SOC_INTEL_CHT_BSW_MAX98090_TI_MACH 
	depends on X86_INTEL_LPSS && I2C && ACPI

	select SND_SOC_MAX98090

	select SND_SOC_TS3A227E

	select SND_SST_IPC_ACPI

	help

	  This adds support for ASoC machine driver for Intel(R) Cherrytrail & Braswell

	  platforms with MAX98090 audio codec it also can support TI jack chip as aux device.
@@ -142,7 +139,6 @@ config SND_SOC_INTEL_BYT_CHT_DA7213_MACH 
	tristate "ASoC Audio driver for Intel Baytrail & Cherrytrail with DA7212/7213 codec"

	depends on X86_INTEL_LPSS && I2C && ACPI

	select SND_SOC_DA7213

	select SND_SST_IPC_ACPI

	help

	  This adds support for ASoC machine driver for Intel(R) Baytrail & CherryTrail

	  platforms with DA7212/7213 audio codec.
@@ -153,7 +149,6 @@ config SND_SOC_INTEL_BYT_CHT_ES8316_MACH 
	tristate "ASoC Audio driver for Intel Baytrail & Cherrytrail with ES8316 codec"

	depends on X86_INTEL_LPSS && I2C && ACPI

	select SND_SOC_ES8316

	select SND_SST_IPC_ACPI

	help

	  This adds support for ASoC machine driver for Intel(R) Baytrail &

	  Cherrytrail platforms with ES8316 audio codec.
@@ -163,7 +158,6 @@ config SND_SOC_INTEL_BYT_CHT_ES8316_MACH 
config SND_SOC_INTEL_BYT_CHT_NOCODEC_MACH

	tristate "ASoC Audio driver for Intel Baytrail & Cherrytrail platform with no codec (MinnowBoard MAX, Up)"

	depends on X86_INTEL_LPSS && I2C && ACPI

	select SND_SST_IPC_ACPI

	help

	  This adds support for ASoC machine driver for the MinnowBoard Max or

	  Up boards and provides access to I2S signals on the Low-Speed