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

ASoC: SOF: Intel: 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.

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-15-amadeuszx.slawinski@linux.intel.com


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

sound/soc/sof/intel/pci-apl.c

+2 −4
Original line number Diff line number Diff line
@@ -85,10 +85,8 @@ static const struct sof_dev_desc glk_desc = { 


/* PCI IDs */

static const struct pci_device_id sof_pci_ids[] = {

	{ PCI_DEVICE(0x8086, 0x5a98), /* BXT-P (ApolloLake) */

		.driver_data = (unsigned long)&bxt_desc},

	{ PCI_DEVICE(0x8086, 0x3198), /* GeminiLake */

		.driver_data = (unsigned long)&glk_desc},

	{ PCI_DEVICE_DATA(INTEL, HDA_APL, &bxt_desc) },

	{ PCI_DEVICE_DATA(INTEL, HDA_GML, &glk_desc) },

	{ 0, }

};

MODULE_DEVICE_TABLE(pci, sof_pci_ids);

sound/soc/sof/intel/pci-cnl.c

+5 −10
Original line number Diff line number Diff line
@@ -120,16 +120,11 @@ static const struct sof_dev_desc cml_desc = { 


/* PCI IDs */

static const struct pci_device_id sof_pci_ids[] = {

	{ PCI_DEVICE(0x8086, 0x9dc8), /* CNL-LP */

		.driver_data = (unsigned long)&cnl_desc},

	{ PCI_DEVICE(0x8086, 0xa348), /* CNL-H */

		.driver_data = (unsigned long)&cfl_desc},

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

		.driver_data = (unsigned long)&cml_desc},

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

		.driver_data = (unsigned long)&cml_desc},

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

		.driver_data = (unsigned long)&cml_desc},

	{ PCI_DEVICE_DATA(INTEL, HDA_CNL_LP, &cnl_desc) },

	{ PCI_DEVICE_DATA(INTEL, HDA_CNL_H, &cfl_desc) },

	{ PCI_DEVICE_DATA(INTEL, HDA_CML_LP, &cml_desc) },

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

	{ PCI_DEVICE_DATA(INTEL, HDA_CML_S, &cml_desc) },

	{ 0, }

};

MODULE_DEVICE_TABLE(pci, sof_pci_ids);

sound/soc/sof/intel/pci-icl.c

+4 −8
Original line number Diff line number Diff line
@@ -86,14 +86,10 @@ static const struct sof_dev_desc jsl_desc = { 


/* PCI IDs */

static const struct pci_device_id sof_pci_ids[] = {

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

		.driver_data = (unsigned long)&icl_desc},

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

		.driver_data = (unsigned long)&icl_desc},

	{ PCI_DEVICE(0x8086, 0x38c8), /* ICL-N */

		.driver_data = (unsigned long)&jsl_desc},

	{ PCI_DEVICE(0x8086, 0x4dc8), /* JSL-N */

		.driver_data = (unsigned long)&jsl_desc},

	{ PCI_DEVICE_DATA(INTEL, HDA_ICL_LP, &icl_desc) },

	{ PCI_DEVICE_DATA(INTEL, HDA_ICL_H, &icl_desc) },

	{ PCI_DEVICE_DATA(INTEL, HDA_ICL_N, &jsl_desc) },

	{ PCI_DEVICE_DATA(INTEL, HDA_JSL_N, &jsl_desc) },

	{ 0, }

};

MODULE_DEVICE_TABLE(pci, sof_pci_ids);

sound/soc/sof/intel/pci-mtl.c

+1 −2
Original line number Diff line number Diff line
@@ -52,8 +52,7 @@ static const struct sof_dev_desc mtl_desc = { 


/* PCI IDs */

static const struct pci_device_id sof_pci_ids[] = {

	{ PCI_DEVICE(0x8086, 0x7E28), /* MTL */

		.driver_data = (unsigned long)&mtl_desc},

	{ PCI_DEVICE_DATA(INTEL, HDA_MTL, &mtl_desc) },

	{ 0, }

};

MODULE_DEVICE_TABLE(pci, sof_pci_ids);

sound/soc/sof/intel/pci-skl.c

+2 −4
Original line number Diff line number Diff line
@@ -69,10 +69,8 @@ static struct sof_dev_desc kbl_desc = { 


/* PCI IDs */

static const struct pci_device_id sof_pci_ids[] = {

	/* Sunrise Point-LP */

	{ PCI_DEVICE(0x8086, 0x9d70), .driver_data = (unsigned long)&skl_desc},

	/* KBL */

	{ PCI_DEVICE(0x8086, 0x9d71), .driver_data = (unsigned long)&kbl_desc},

	{ PCI_DEVICE_DATA(INTEL, HDA_SKL_LP, &skl_desc) },

	{ PCI_DEVICE_DATA(INTEL, HDA_KBL_LP, &kbl_desc) },

	{ 0, }

};

MODULE_DEVICE_TABLE(pci, sof_pci_ids);