Unverified Commit 927ce5c7 authored by Evan Green's avatar Evan Green Committed by Mark Brown
Browse files

ASoC: SOF: Add Comet Lake PCI IDs 



Add support for Intel Comet Lake platforms by adding a new Kconfig
for CometLake and the appropriate PCI IDs.

Signed-off-by: default avatarEvan Green <evgreen@chromium.org>
Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent 35a7086e

sound/soc/sof/intel/Kconfig

+32 −0
Original line number Diff line number Diff line
@@ -24,6 +24,8 @@ 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

	help

	  This option is not user-selectable but automagically handled by

	  'select' statements at a higher level
@@ -179,6 +181,36 @@ 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

	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_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"

	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.

	  If unsure select "N".



config SND_SOC_SOF_HDA_COMMON

	tristate

	select SND_SOC_SOF_INTEL_COMMON

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

+28 −0
Original line number Diff line number Diff line
@@ -129,6 +129,26 @@ 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)



static const struct sof_dev_desc cml_desc = {

	.machines		= snd_soc_acpi_intel_cnl_machines,

	.resindex_lpe_base	= 0,

	.resindex_pcicfg_base	= -1,

	.resindex_imr_base	= -1,

	.irqindex_host_ipc	= -1,

	.resindex_dma_base	= -1,

	.chip_info = &cnl_chip_info,

	.default_fw_path = "intel/sof",

	.default_tplg_path = "intel/sof-tplg",

	.nocodec_fw_filename = "sof-cnl.ri",

	.nocodec_tplg_filename = "sof-cnl-nocodec.tplg",

	.ops = &sof_cnl_ops,

	.arch_ops = &sof_xtensa_arch_ops

};

#endif



#if IS_ENABLED(CONFIG_SND_SOC_SOF_ICELAKE)

static const struct sof_dev_desc icl_desc = {

	.machines               = snd_soc_acpi_intel_icl_machines,
@@ -353,6 +373,14 @@ static const struct pci_device_id sof_pci_ids[] = { 
#if IS_ENABLED(CONFIG_SND_SOC_SOF_ICELAKE)

	{ PCI_DEVICE(0x8086, 0x34C8),

		.driver_data = (unsigned long)&icl_desc},

#endif

#if IS_ENABLED(CONFIG_SND_SOC_SOF_COMETLAKE_LP)

	{ PCI_DEVICE(0x8086, 0x02c8),

		.driver_data = (unsigned long)&cml_desc},

#endif

#if IS_ENABLED(CONFIG_SND_SOC_SOF_COMETLAKE_H)

	{ PCI_DEVICE(0x8086, 0x06c8),

		.driver_data = (unsigned long)&cml_desc},

#endif

	{ 0, }

};