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

ASoC: Intel: Skylake: Add more platform granularity 



The current SKYLAKE kconfig is a all-you-can-eat selection that will
support all known plaforms. This is however not necessarily a good
thing: most platforms for SKL and KBL don't support the DSP, but a
number of CNL/WHL ones do. Selecting this driver in all cases isn't
really smart and will require users to muck with blacklists.

Partition the configs to allow distributions to select on which
platform this driver is used. Keep the existing SND_SOC_INTEL_SKYLAKE
config to select everything for backwards compatibility. This patch does
not provide new functionality, only finer-grained choices in supported
platforms.

Signed-off-by: default avatarPierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent ae38d267

sound/soc/intel/Kconfig

+66 −7
Original line number Diff line number Diff line
@@ -102,15 +102,74 @@ config SND_SST_ATOM_HIFI2_PLATFORM_ACPI 
	  recommended option



config SND_SOC_INTEL_SKYLAKE

	tristate "SKL/BXT/KBL/GLK/CNL... Platforms"

	tristate "All Skylake/SST Platforms"

	depends on PCI && ACPI

	select SND_SOC_INTEL_SKYLAKE_COMMON

	select SND_SOC_INTEL_SKL

	select SND_SOC_INTEL_APL

	select SND_SOC_INTEL_KBL

	select SND_SOC_INTEL_GLK

	select SND_SOC_INTEL_CNL

	select SND_SOC_INTEL_CFL

	help

	  If you have a Intel Skylake/Broxton/ApolloLake/KabyLake/

	  GeminiLake or CannonLake platform with the DSP enabled in the BIOS

	  then enable this option by saying Y or m.

          This is a backwards-compatible option to select all devices

	  supported by the Intel SST/Skylake driver. This option is no

	  longer recommended and will be deprecated when the SOF

	  driver is introduced.  Distributions should explicitly

	  select which platform uses this driver.



config SND_SOC_INTEL_SKL

	tristate "Skylake Platforms"

	depends on PCI && ACPI

	select SND_SOC_INTEL_SKYLAKE_FAMILY

	help

	  If you have a Intel Skylake platform with the DSP enabled

	  in the BIOS then enable this option by saying Y or m.



config SND_SOC_INTEL_APL

	tristate "Broxton/ApolloLake Platforms"

	depends on PCI && ACPI

	select SND_SOC_INTEL_SKYLAKE_FAMILY

	help

	  If you have a Intel Broxton/ApolloLake platform with the DSP

	  enabled in the BIOS then enable this option by saying Y or m.



config SND_SOC_INTEL_KBL

	tristate "Kabylake Platforms"

	depends on PCI && ACPI

	select SND_SOC_INTEL_SKYLAKE_FAMILY

	help

	  If you have a Intel Kabylake platform with the DSP

	  enabled in the BIOS then enable this option by saying Y or m.



config SND_SOC_INTEL_GLK

	tristate "GeminiLake Platforms"

	depends on PCI && ACPI

	select SND_SOC_INTEL_SKYLAKE_FAMILY

	help

	  If you have a Intel GeminiLake platform with the DSP

	  enabled in the BIOS then enable this option by saying Y or m.



config SND_SOC_INTEL_CNL

	tristate "CannonLake/WhiskyLake Platforms"

	depends on PCI && ACPI

	select SND_SOC_INTEL_SKYLAKE_FAMILY

	help

	  If you have a Intel CNL/WHL platform with the DSP

	  enabled in the BIOS then enable this option by saying Y or m.



config SND_SOC_INTEL_CFL

	tristate "CoffeeLake Platforms"

	depends on PCI && ACPI

	select SND_SOC_INTEL_SKYLAKE_FAMILY

	help

	  If you have a Intel CoffeeLake platform with the DSP

	  enabled in the BIOS then enable this option by saying Y or m.



config SND_SOC_INTEL_SKYLAKE_FAMILY

	tristate

	select SND_SOC_INTEL_SKYLAKE_COMMON



if  SND_SOC_INTEL_SKYLAKE

if SND_SOC_INTEL_SKYLAKE_FAMILY



config SND_SOC_INTEL_SKYLAKE_SSP_CLK

	tristate
@@ -135,7 +194,7 @@ config SND_SOC_INTEL_SKYLAKE_COMMON 
	  GeminiLake or CannonLake platform with the DSP enabled in the BIOS

	  then enable this option by saying Y or m.



endif ## SND_SOC_INTEL_SKYLAKE

endif ## SND_SOC_INTEL_SKYLAKE_FAMILY



config SND_SOC_ACPI_INTEL_MATCH

	tristate

sound/soc/intel/boards/Kconfig

+14 −2
Original line number Diff line number Diff line
@@ -172,7 +172,7 @@ config SND_SOC_INTEL_BYT_CHT_NOCODEC_MACH 


endif ## SND_SST_ATOM_HIFI2_PLATFORM



if SND_SOC_INTEL_SKYLAKE

if SND_SOC_INTEL_SKL



config SND_SOC_INTEL_SKL_RT286_MACH

	tristate "SKL with RT286 I2S mode"
@@ -212,6 +212,10 @@ config SND_SOC_INTEL_SKL_NAU88L25_MAX98357A_MACH 
	  Say Y or m if you have such a device. This is a recommended option.

	  If unsure select "N".



endif ## SND_SOC_INTEL_SKL



if SND_SOC_INTEL_APL



config SND_SOC_INTEL_BXT_DA7219_MAX98357A_MACH

	tristate "Broxton with DA7219 and MAX98357A in I2S Mode"

	depends on MFD_INTEL_LPSS && I2C && ACPI
@@ -239,6 +243,10 @@ config SND_SOC_INTEL_BXT_RT298_MACH 
	   Say Y or m if you have such a device. This is a recommended option.

	   If unsure select "N".



endif ## SND_SOC_INTEL_APL



if SND_SOC_INTEL_KBL



config SND_SOC_INTEL_KBL_RT5663_MAX98927_MACH

	tristate "KBL with RT5663 and MAX98927 in I2S Mode"

	depends on MFD_INTEL_LPSS && I2C && ACPI
@@ -303,6 +311,10 @@ config SND_SOC_INTEL_KBL_RT5660_MACH 
	  create an alsa sound card for RT5660 I2S audio codec.

	  Say Y if you have such a device.



endif ## SND_SOC_INTEL_KBL



if SND_SOC_INTEL_GLK



config SND_SOC_INTEL_GLK_RT5682_MAX98357A_MACH

	tristate "GLK with RT5682 and MAX98357A in I2S Mode"

	depends on MFD_INTEL_LPSS && I2C && ACPI
@@ -317,7 +329,7 @@ config SND_SOC_INTEL_GLK_RT5682_MAX98357A_MACH 
	   Say Y if you have such a device.

	   If unsure select "N".



endif ## SND_SOC_INTEL_SKYLAKE

endif ## SND_SOC_INTEL_GLK



if SND_SOC_INTEL_SKYLAKE_HDAUDIO_CODEC

sound/soc/intel/skylake/skl.c

+12 −0
Original line number Diff line number Diff line
@@ -1142,24 +1142,36 @@ static void skl_remove(struct pci_dev *pci) 


/* PCI IDs */

static const struct pci_device_id skl_ids[] = {

#if IS_ENABLED(CONFIG_SND_SOC_INTEL_SKL)

	/* Sunrise Point-LP */

	{ PCI_DEVICE(0x8086, 0x9d70),

		.driver_data = (unsigned long)&snd_soc_acpi_intel_skl_machines},

#endif

#if IS_ENABLED(CONFIG_SND_SOC_INTEL_APL)

	/* BXT-P */

	{ PCI_DEVICE(0x8086, 0x5a98),

		.driver_data = (unsigned long)&snd_soc_acpi_intel_bxt_machines},

#endif

#if IS_ENABLED(CONFIG_SND_SOC_INTEL_KBL)

	/* KBL */

	{ PCI_DEVICE(0x8086, 0x9D71),

		.driver_data = (unsigned long)&snd_soc_acpi_intel_kbl_machines},

#endif

#if IS_ENABLED(CONFIG_SND_SOC_INTEL_GLK)

	/* GLK */

	{ PCI_DEVICE(0x8086, 0x3198),

		.driver_data = (unsigned long)&snd_soc_acpi_intel_glk_machines},

#endif

#if IS_ENABLED(CONFIG_SND_SOC_INTEL_CNL)

	/* CNL */

	{ PCI_DEVICE(0x8086, 0x9dc8),

		.driver_data = (unsigned long)&snd_soc_acpi_intel_cnl_machines},

#endif

#if IS_ENABLED(CONFIG_SND_SOC_INTEL_CFL)

	/* CFL */

	{ PCI_DEVICE(0x8086, 0xa348),

		.driver_data = (unsigned long)&snd_soc_acpi_intel_cnl_machines},

#endif

	{ 0, }

};

MODULE_DEVICE_TABLE(pci, skl_ids);

CRA Git | Maintained and supported by SUSTech CRA and CCSE