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

Unverified Commit 5f740b24 authored by Evan Green's avatar Evan Green Committed by Mark Brown
Browse files

ASoC: Intel: Skylake: Add Cometlake PCI IDs 



Add PCI IDs for Intel CometLake platforms, which from a software
point of view are extremely similar to Cannonlake platforms.

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

sound/soc/intel/Kconfig

+16 −0
Original line number Diff line number Diff line
@@ -165,6 +165,22 @@ config SND_SOC_INTEL_CFL 
	  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_CML_H

	tristate "CometLake-H Platforms"

	depends on PCI && ACPI

	select SND_SOC_INTEL_SKYLAKE_FAMILY

	help

	  If you have a Intel CometLake-H platform with the DSP

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



config SND_SOC_INTEL_CML_LP

	tristate "CometLake-LP Platforms"

	depends on PCI && ACPI

	select SND_SOC_INTEL_SKYLAKE_FAMILY

	help

	  If you have a Intel CometLake-LP 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

sound/soc/intel/skylake/skl-messages.c

+16 −0
Original line number Diff line number Diff line
@@ -255,6 +255,22 @@ static const struct skl_dsp_ops dsp_ops[] = { 
		.init_fw = cnl_sst_init_fw,

		.cleanup = cnl_sst_dsp_cleanup

	},

	{

		.id = 0x02c8,

		.num_cores = 4,

		.loader_ops = bxt_get_loader_ops,

		.init = cnl_sst_dsp_init,

		.init_fw = cnl_sst_init_fw,

		.cleanup = cnl_sst_dsp_cleanup

	},

	{

		.id = 0x06c8,

		.num_cores = 4,

		.loader_ops = bxt_get_loader_ops,

		.init = cnl_sst_dsp_init,

		.init_fw = cnl_sst_init_fw,

		.cleanup = cnl_sst_dsp_cleanup

	},

};



const struct skl_dsp_ops *skl_get_dsp_ops(int pci_id)

sound/soc/intel/skylake/skl.c

+10 −0
Original line number Diff line number Diff line
@@ -1166,6 +1166,16 @@ static const struct pci_device_id skl_ids[] = { 
	/* CFL */

	{ PCI_DEVICE(0x8086, 0xa348),

		.driver_data = (unsigned long)&snd_soc_acpi_intel_cnl_machines},

#endif

#if IS_ENABLED(CONFIG_SND_SOC_INTEL_CML_LP)

	/* CML-LP */

	{ PCI_DEVICE(0x8086, 0x02c8),

		.driver_data = (unsigned long)&snd_soc_acpi_intel_cnl_machines},

#endif

#if IS_ENABLED(CONFIG_SND_SOC_INTEL_CML_H)

	/* CML-H */

	{ PCI_DEVICE(0x8086, 0x06c8),

		.driver_data = (unsigned long)&snd_soc_acpi_intel_cnl_machines},

#endif

	{ 0, }

};