On 2025-12-10 12:55 PM, Andy Shevchenko wrote:
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.
A number of times I've fought for the 'GLK' to disappear from the Intel's audio subsystem as clearly the "right" shortcut is 'GML'.
However, I do understand where are you coming from - the corrections came late and the "mistake" has been widely spread.
Signed-off-by: Andy Shevchenko andriy.shevchenko@linux.intel.com
include/linux/pci_ids.h | 2 +- sound/hda/controllers/intel.c | 2 +- sound/hda/core/intel-dsp-config.c | 4 ++-- sound/soc/intel/avs/board_selection.c | 4 ++-- sound/soc/intel/avs/core.c | 2 +- sound/soc/sof/intel/pci-apl.c | 2 +- 6 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/include/linux/pci_ids.h b/include/linux/pci_ids.h index a9a089566b7c..22b8cfc11add 100644 --- a/include/linux/pci_ids.h +++ b/include/linux/pci_ids.h @@ -2950,7 +2950,7 @@ #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 +#define PCI_DEVICE_ID_INTEL_HDA_GLK 0x3198
If two #defines are no-go (PCI_DEVICE_ID_INTEL_HDA_GLK and _GML), then perhaps at least a comment to the right of the ID mentioning the "GML" would help.
#define PCI_DEVICE_ID_INTEL_82855PM_HB 0x3340 #define PCI_DEVICE_ID_INTEL_IOAT_TBG4 0x3429 #define PCI_DEVICE_ID_INTEL_IOAT_TBG5 0x342a diff --git a/sound/hda/controllers/intel.c b/sound/hda/controllers/intel.c index 1e8e3d61291a..bb9a64d41580 100644 --- a/sound/hda/controllers/intel.c +++ b/sound/hda/controllers/intel.c @@ -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) },
diff --git a/sound/hda/core/intel-dsp-config.c b/sound/hda/core/intel-dsp-config.c index c401c0658421..948fd468d2fe 100644 --- a/sound/hda/core/intel-dsp-config.c +++ b/sound/hda/core/intel-dsp-config.c @@ -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,@@ -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,diff --git a/sound/soc/intel/avs/board_selection.c b/sound/soc/intel/avs/board_selection.c index 52e6266a7cb8..46723618d458 100644 --- a/sound/soc/intel/avs/board_selection.c +++ b/sound/soc/intel/avs/board_selection.c @@ -227,7 +227,7 @@ static struct snd_soc_acpi_mach avs_apl_i2s_machines[] = { {}, };
-static struct snd_soc_acpi_mach avs_gml_i2s_machines[] = { +static struct snd_soc_acpi_mach avs_glk_i2s_machines[] = { { .id = "INT343A", .drv_name = "avs_rt298", @@ -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_glk_i2s_machines),
To be honest, I'd leave 'avs_gml_i2s_machines' as is.
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),