Commit a2db8743 authored by Amadeusz Sławiński's avatar Amadeusz Sławiński Committed by Takashi Iwai
Browse files

ASoC: Intel: Skylake: Convert to PCI device IDs defines 



Use PCI device IDs from pci_ids.h header and while at it change to using
PCI_DEVICE_DATA() macro, to simplify declarations. As Apollolake is
Broxton-P successor that made it to the market, be precise and use APL
shortcut.

Acked-by: default avatarMark Brown <broonie@kernel.org>
Reviewed-by: default avatarAndy Shevchenko <andriy.shevchenko@linux.intel.com>
Reviewed-by: default avatarCezary Rojewski <cezary.rojewski@intel.com>
Signed-off-by: default avatarAmadeusz Sławiński <amadeuszx.slawinski@linux.intel.com>
Link: https://lore.kernel.org/r/20230717114511.484999-14-amadeuszx.slawinski@linux.intel.com


Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
parent ea15d602

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

+8 −8
Original line number Diff line number Diff line
@@ -169,7 +169,7 @@ static struct skl_dsp_loader_ops bxt_get_loader_ops(void) 


static const struct skl_dsp_ops dsp_ops[] = {

	{

		.id = 0x9d70,

		.id = PCI_DEVICE_ID_INTEL_HDA_SKL_LP,

		.num_cores = 2,

		.loader_ops = skl_get_loader_ops,

		.init = skl_sst_dsp_init,
@@ -177,7 +177,7 @@ static const struct skl_dsp_ops dsp_ops[] = { 
		.cleanup = skl_sst_dsp_cleanup

	},

	{

		.id = 0x9d71,

		.id = PCI_DEVICE_ID_INTEL_HDA_KBL_LP,

		.num_cores = 2,

		.loader_ops = skl_get_loader_ops,

		.init = skl_sst_dsp_init,
@@ -185,7 +185,7 @@ static const struct skl_dsp_ops dsp_ops[] = { 
		.cleanup = skl_sst_dsp_cleanup

	},

	{

		.id = 0x5a98,

		.id = PCI_DEVICE_ID_INTEL_HDA_APL,

		.num_cores = 2,

		.loader_ops = bxt_get_loader_ops,

		.init = bxt_sst_dsp_init,
@@ -193,7 +193,7 @@ static const struct skl_dsp_ops dsp_ops[] = { 
		.cleanup = bxt_sst_dsp_cleanup

	},

	{

		.id = 0x3198,

		.id = PCI_DEVICE_ID_INTEL_HDA_GML,

		.num_cores = 2,

		.loader_ops = bxt_get_loader_ops,

		.init = bxt_sst_dsp_init,
@@ -201,7 +201,7 @@ static const struct skl_dsp_ops dsp_ops[] = { 
		.cleanup = bxt_sst_dsp_cleanup

	},

	{

		.id = 0x9dc8,

		.id = PCI_DEVICE_ID_INTEL_HDA_CNL_LP,

		.num_cores = 4,

		.loader_ops = bxt_get_loader_ops,

		.init = cnl_sst_dsp_init,
@@ -209,7 +209,7 @@ static const struct skl_dsp_ops dsp_ops[] = { 
		.cleanup = cnl_sst_dsp_cleanup

	},

	{

		.id = 0xa348,

		.id = PCI_DEVICE_ID_INTEL_HDA_CNL_H,

		.num_cores = 4,

		.loader_ops = bxt_get_loader_ops,

		.init = cnl_sst_dsp_init,
@@ -217,7 +217,7 @@ static const struct skl_dsp_ops dsp_ops[] = { 
		.cleanup = cnl_sst_dsp_cleanup

	},

	{

		.id = 0x02c8,

		.id = PCI_DEVICE_ID_INTEL_HDA_CML_LP,

		.num_cores = 4,

		.loader_ops = bxt_get_loader_ops,

		.init = cnl_sst_dsp_init,
@@ -225,7 +225,7 @@ static const struct skl_dsp_ops dsp_ops[] = { 
		.cleanup = cnl_sst_dsp_cleanup

	},

	{

		.id = 0x06c8,

		.id = PCI_DEVICE_ID_INTEL_HDA_CML_H,

		.num_cores = 4,

		.loader_ops = bxt_get_loader_ops,

		.init = cnl_sst_dsp_init,

sound/soc/intel/skylake/skl.c

+10 −26
Original line number Diff line number Diff line
@@ -608,8 +608,8 @@ struct skl_clk_parent_src *skl_get_parent_clk(u8 clk_id) 
static void init_skl_xtal_rate(int pci_id)

{

	switch (pci_id) {

	case 0x9d70:

	case 0x9d71:

	case PCI_DEVICE_ID_INTEL_HDA_SKL_LP:

	case PCI_DEVICE_ID_INTEL_HDA_KBL_LP:

		skl_clk_src[0].rate = 24000000;

		return;
@@ -1145,44 +1145,28 @@ 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},

	{ PCI_DEVICE_DATA(INTEL, HDA_SKL_LP, &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},

	{ PCI_DEVICE_DATA(INTEL, HDA_APL, &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},

	{ PCI_DEVICE_DATA(INTEL, HDA_KBL_LP, &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},

	{ PCI_DEVICE_DATA(INTEL, HDA_GML, &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},

	{ PCI_DEVICE_DATA(INTEL, HDA_CNL_LP, &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},

	{ PCI_DEVICE_DATA(INTEL, HDA_CNL_H, &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},

	{ PCI_DEVICE_DATA(INTEL, HDA_CML_LP, &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},

	{ PCI_DEVICE_DATA(INTEL, HDA_CML_H, &snd_soc_acpi_intel_cnl_machines) },

#endif

	{ 0, }

};