Unverified Commit a1bcb662 authored by Andy Shevchenko's avatar Andy Shevchenko Committed by Mark Brown
Browse files

ASoC: Fix acronym for Intel Gemini Lake 



While the used GML is consistent with the pattern for other Intel * Lake
SoCs, the de facto use is GLK. Update the acronym and users accordingly.

Note, a handful of the drivers for Gemini Lake in the Linux kernel use
GLK already (LPC, MEI, pin control, SDHCI, ...) and even some in ASoC.
The only ones in this patch used the inconsistent one.

Acked-by: Bjorn Helgaas <bhelgaas@google.com> # pci_ids.h
Signed-off-by: default avatarAndy Shevchenko <andriy.shevchenko@linux.intel.com>
Reviewed-by: default avatarPeter Ujfalusi <peter.ujfalusi@linux.intel.com>
Reviewed-by: default avatarCezary Rojewski <cezary.rojewski@intel.com>
Link: https://patch.msgid.link/20251212181742.3944789-1-andriy.shevchenko@linux.intel.com


Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent 7cd2bdb5

include/linux/pci_ids.h

+2 −1
Original line number Diff line number Diff line
@@ -2950,7 +2950,8 @@ 
#define PCI_DEVICE_ID_INTEL_LYNNFIELD_MC_CH2_ADDR_REV2  0x2db1

#define PCI_DEVICE_ID_INTEL_LYNNFIELD_MC_CH2_RANK_REV2  0x2db2

#define PCI_DEVICE_ID_INTEL_LYNNFIELD_MC_CH2_TC_REV2    0x2db3

#define PCI_DEVICE_ID_INTEL_HDA_GML	0x3198

/* In a few of the Intel documents the GML acronym is used for Gemini Lake */

#define PCI_DEVICE_ID_INTEL_HDA_GLK	0x3198

#define PCI_DEVICE_ID_INTEL_82855PM_HB	0x3340

#define PCI_DEVICE_ID_INTEL_IOAT_TBG4	0x3429

#define PCI_DEVICE_ID_INTEL_IOAT_TBG5	0x342a

sound/hda/controllers/intel.c

+1 −1
Original line number Diff line number Diff line
@@ -2555,7 +2555,7 @@ static const struct pci_device_id azx_ids[] = { 
	/* Apollolake (Broxton-P) */

	{ PCI_DEVICE_DATA(INTEL, HDA_APL, AZX_DRIVER_SKL | AZX_DCAPS_INTEL_BROXTON) },

	/* Gemini-Lake */

	{ PCI_DEVICE_DATA(INTEL, HDA_GML, AZX_DRIVER_SKL | AZX_DCAPS_INTEL_BROXTON) },

	{ PCI_DEVICE_DATA(INTEL, HDA_GLK, AZX_DRIVER_SKL | AZX_DCAPS_INTEL_BROXTON) },

	/* Haswell */

	{ PCI_DEVICE_DATA(INTEL, HDA_HSW_0, AZX_DRIVER_HDMI | AZX_DCAPS_INTEL_HASWELL) },

	{ PCI_DEVICE_DATA(INTEL, HDA_HSW_2, AZX_DRIVER_HDMI | AZX_DCAPS_INTEL_HASWELL) },

sound/hda/core/intel-dsp-config.c

+2 −2
Original line number Diff line number Diff line
@@ -154,7 +154,7 @@ static const struct config_entry config_table[] = { 
#if IS_ENABLED(CONFIG_SND_SOC_SOF_GEMINILAKE)

	{

		.flags = FLAG_SOF,

		.device = PCI_DEVICE_ID_INTEL_HDA_GML,

		.device = PCI_DEVICE_ID_INTEL_HDA_GLK,

		.dmi_table = (const struct dmi_system_id []) {

			{

				.ident = "Google Chromebooks",
@@ -167,7 +167,7 @@ static const struct config_entry config_table[] = { 
	},

	{

		.flags = FLAG_SOF,

		.device = PCI_DEVICE_ID_INTEL_HDA_GML,

		.device = PCI_DEVICE_ID_INTEL_HDA_GLK,

		.codec_hid =  &essx_83x6,

	},

#endif

sound/soc/intel/avs/board_selection.c

+1 −1
Original line number Diff line number Diff line
@@ -367,7 +367,7 @@ static const struct avs_acpi_boards i2s_boards[] = { 
	AVS_MACH_ENTRY(HDA_SKL_LP,	avs_skl_i2s_machines),

	AVS_MACH_ENTRY(HDA_KBL_LP,	avs_kbl_i2s_machines),

	AVS_MACH_ENTRY(HDA_APL,		avs_apl_i2s_machines),

	AVS_MACH_ENTRY(HDA_GML,		avs_gml_i2s_machines),

	AVS_MACH_ENTRY(HDA_GLK,		avs_gml_i2s_machines),

	AVS_MACH_ENTRY(HDA_CNL_LP,	avs_cnl_i2s_machines),

	AVS_MACH_ENTRY(HDA_CNL_H,	avs_cnl_i2s_machines),

	AVS_MACH_ENTRY(HDA_CML_LP,	avs_cnl_i2s_machines),

sound/soc/intel/avs/core.c

+1 −1
Original line number Diff line number Diff line
@@ -897,7 +897,7 @@ static const struct pci_device_id avs_ids[] = { 
	{ PCI_DEVICE_DATA(INTEL, HDA_KBL_H, &skl_desc) },

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

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

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

	{ PCI_DEVICE_DATA(INTEL, HDA_GLK, &apl_desc) },

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

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

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