Unverified Commit dcb231e8 authored by Mark Brown's avatar Mark Brown
Browse files

Merge series "ASoC: SOF: Intel: update PCI IDs" from Pierre-Louis Bossart... 

Merge series "ASoC: SOF: Intel: update PCI IDs" from Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>:

Clean-up CometLake and add missing PCI IDs. Changes for the legacy
driver are sent separately.

Pierre-Louis Bossart (3):
  ASoC: Intel: SOF: merge COMETLAKE_LP and COMETLAKE_H
  ASoC: SOF: Intel: add PCI ID for CometLake-S
  ASoC: SOF: Intel: add PCI IDs for ICL-H and TGL-H

 sound/hda/intel-dsp-config.c   |  4 +---
 sound/soc/intel/boards/Kconfig |  4 ++--
 sound/soc/sof/intel/Kconfig    | 29 ++++++++---------------------
 sound/soc/sof/sof-pci-dev.c    | 24 ++++++++++++++----------
 4 files changed, 25 insertions(+), 36 deletions(-)

--
2.20.1
parents a94eacce c8d2e2bf

sound/hda/intel-dsp-config.c

+1 −3
Original line number Diff line number Diff line
@@ -192,8 +192,8 @@ static const struct config_entry config_table[] = { 
	},

#endif



#if IS_ENABLED(CONFIG_SND_SOC_SOF_COMETLAKE)

/* Cometlake-LP */

#if IS_ENABLED(CONFIG_SND_SOC_SOF_COMETLAKE_LP)

	{

		.flags = FLAG_SOF,

		.device = 0x02c8,
@@ -211,9 +211,7 @@ static const struct config_entry config_table[] = { 
		.flags = FLAG_SOF | FLAG_SOF_ONLY_IF_DMIC,

		.device = 0x02c8,

	},

#endif

/* Cometlake-H */

#if IS_ENABLED(CONFIG_SND_SOC_SOF_COMETLAKE_H)

	{

		.flags = FLAG_SOF | FLAG_SOF_ONLY_IF_DMIC,

		.device = 0x06c8,

sound/soc/intel/boards/Kconfig

+2 −2
Original line number Diff line number Diff line
@@ -492,7 +492,7 @@ config SND_SOC_INTEL_SOF_PCM512x_MACH 


endif ## SND_SOC_SOF_HDA_LINK || SND_SOC_SOF_BAYTRAIL



if (SND_SOC_SOF_COMETLAKE_LP && SND_SOC_SOF_HDA_LINK)

if (SND_SOC_SOF_COMETLAKE && SND_SOC_SOF_HDA_LINK)



config SND_SOC_INTEL_CML_LP_DA7219_MAX98357A_MACH

	tristate "CML_LP with DA7219 and MAX98357A in I2S Mode"
@@ -520,7 +520,7 @@ config SND_SOC_INTEL_SOF_CML_RT1011_RT5682_MACH 
	  Say Y if you have such a device.

	  If unsure select "N".



endif ## SND_SOC_SOF_COMETLAKE_LP && SND_SOC_SOF_HDA_LINK

endif ## SND_SOC_SOF_COMETLAKE && SND_SOC_SOF_HDA_LINK



if SND_SOC_SOF_JASPERLAKE

sound/soc/sof/intel/Kconfig

+8 −21
Original line number Diff line number Diff line
@@ -25,8 +25,7 @@ config SND_SOC_SOF_INTEL_PCI 
	select SND_SOC_SOF_CANNONLAKE  if SND_SOC_SOF_CANNONLAKE_SUPPORT

	select SND_SOC_SOF_COFFEELAKE  if SND_SOC_SOF_COFFEELAKE_SUPPORT

	select SND_SOC_SOF_ICELAKE     if SND_SOC_SOF_ICELAKE_SUPPORT

	select SND_SOC_SOF_COMETLAKE_LP if SND_SOC_SOF_COMETLAKE_LP_SUPPORT

	select SND_SOC_SOF_COMETLAKE_H if SND_SOC_SOF_COMETLAKE_H_SUPPORT

	select SND_SOC_SOF_COMETLAKE   if SND_SOC_SOF_COMETLAKE_SUPPORT

	select SND_SOC_SOF_TIGERLAKE   if SND_SOC_SOF_TIGERLAKE_SUPPORT

	select SND_SOC_SOF_ELKHARTLAKE if SND_SOC_SOF_ELKHARTLAKE_SUPPORT

	select SND_SOC_SOF_JASPERLAKE  if SND_SOC_SOF_JASPERLAKE_SUPPORT
@@ -201,34 +200,22 @@ config SND_SOC_SOF_ICELAKE 
	  This option is not user-selectable but automagically handled by

	  'select' statements at a higher level



config SND_SOC_SOF_COMETLAKE_LP

config SND_SOC_SOF_COMETLAKE

	tristate

	select SND_SOC_SOF_HDA_COMMON

	help

	  This option is not user-selectable but automagically handled by

	  'select' statements at a higher level



config SND_SOC_SOF_COMETLAKE_LP_SUPPORT

	bool "SOF support for CometLake-LP"

	help

	  This adds support for Sound Open Firmware for Intel(R) platforms

	  using the Cometlake-LP processors.

	  Say Y if you have such a device.

	  If unsure select "N".

config SND_SOC_SOF_COMETLAKE_SUPPORT

	bool



config SND_SOC_SOF_COMETLAKE_H

	tristate

	select SND_SOC_SOF_HDA_COMMON

	help

	  This option is not user-selectable but automagically handled by

	  'select' statements at a higher level



config SND_SOC_SOF_COMETLAKE_H_SUPPORT

	bool "SOF support for CometLake-H"

config SND_SOC_SOF_COMETLAKE_LP_SUPPORT

	bool "SOF support for CometLake"

	select SND_SOC_SOF_COMETLAKE_SUPPORT

	help

	  This adds support for Sound Open Firmware for Intel(R) platforms

	  using the Cometlake-H processors.

	  Say Y if you have such a device.

	  using the Cometlake processors.

	  If unsure select "N".



config SND_SOC_SOF_TIGERLAKE_SUPPORT

sound/soc/sof/sof-pci-dev.c

+14 −10
Original line number Diff line number Diff line
@@ -151,9 +151,7 @@ static const struct sof_dev_desc cfl_desc = { 
};

#endif



#if IS_ENABLED(CONFIG_SND_SOC_SOF_COMETLAKE_LP) || \

	IS_ENABLED(CONFIG_SND_SOC_SOF_COMETLAKE_H)



#if IS_ENABLED(CONFIG_SND_SOC_SOF_COMETLAKE)

static const struct sof_dev_desc cml_desc = {

	.machines		= snd_soc_acpi_intel_cml_machines,

	.alt_machines		= snd_soc_acpi_intel_cml_sdw_machines,
@@ -411,8 +409,11 @@ static const struct pci_device_id sof_pci_ids[] = { 
		.driver_data = (unsigned long)&cfl_desc},

#endif

#if IS_ENABLED(CONFIG_SND_SOC_SOF_ICELAKE)

	{ PCI_DEVICE(0x8086, 0x34C8),

	{ PCI_DEVICE(0x8086, 0x34C8), /* ICL-LP */

		.driver_data = (unsigned long)&icl_desc},

	{ PCI_DEVICE(0x8086, 0x3dc8), /* ICL-H */

		.driver_data = (unsigned long)&icl_desc},



#endif

#if IS_ENABLED(CONFIG_SND_SOC_SOF_JASPERLAKE)

	{ PCI_DEVICE(0x8086, 0x38c8),
@@ -420,17 +421,20 @@ static const struct pci_device_id sof_pci_ids[] = { 
	{ PCI_DEVICE(0x8086, 0x4dc8),

		.driver_data = (unsigned long)&jsl_desc},

#endif

#if IS_ENABLED(CONFIG_SND_SOC_SOF_COMETLAKE_LP)

	{ PCI_DEVICE(0x8086, 0x02c8),

#if IS_ENABLED(CONFIG_SND_SOC_SOF_COMETLAKE)

	{ PCI_DEVICE(0x8086, 0x02c8), /* CML-LP */

		.driver_data = (unsigned long)&cml_desc},

#endif

#if IS_ENABLED(CONFIG_SND_SOC_SOF_COMETLAKE_H)

	{ PCI_DEVICE(0x8086, 0x06c8),

	{ PCI_DEVICE(0x8086, 0x06c8), /* CML-H */

		.driver_data = (unsigned long)&cml_desc},

	{ PCI_DEVICE(0x8086, 0xa3f0), /* CML-S */

		.driver_data = (unsigned long)&cml_desc},

#endif

#if IS_ENABLED(CONFIG_SND_SOC_SOF_TIGERLAKE)

	{ PCI_DEVICE(0x8086, 0xa0c8),

	{ PCI_DEVICE(0x8086, 0xa0c8), /* TGL-LP */

		.driver_data = (unsigned long)&tgl_desc},

	{ PCI_DEVICE(0x8086, 0x43c8), /* TGL-H */

		.driver_data = (unsigned long)&tgl_desc},



#endif

#if IS_ENABLED(CONFIG_SND_SOC_SOF_ELKHARTLAKE)

	{ PCI_DEVICE(0x8086, 0x4b55),

CRA Git | Maintained and supported by SUSTech CRA and CCSE