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: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Reviewed-by: Peter Ujfalusi <peter.ujfalusi@linux.intel.com>
Reviewed-by: Cezary Rojewski <cezary.rojewski@intel.com>
Link: https://patch.msgid.link/20251212181742.3944789-1-andriy.shevchenko@linux.intel.com
Signed-off-by: Mark Brown <broonie@kernel.org>

diff --git a/include/linux/pci_ids.h b/include/linux/pci_ids.h
index a9a089566b7cbe93b205a233898531b3f30c43f7..84b830036fb49846c5f589a6262720f470de89b5 100644 (file)
--- a/include/linux/pci_ids.h
+++ b/include/linux/pci_ids.h
@@ -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

diff --git a/sound/hda/controllers/intel.c b/sound/hda/controllers/intel.c
index 1e8e3d61291a11a1f99928248d0a736655462f04..bb9a64d4158061af0fc171660be65da2bbdae403 100644 (file)
--- 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 0c25e87408de2add2d494b24956fe8312bf6b7ae..ddb8db3e8e395b4ec53e9990252e4bb119c15299 100644 (file)
--- 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,
                .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

diff --git a/sound/soc/intel/avs/board_selection.c b/sound/soc/intel/avs/board_selection.c
index 52e6266a7cb86f9f7b6fbd66b26a081357497661..8a46285181fa049dc3983609aa3a97bfb552922b 100644 (file)
--- a/sound/soc/intel/avs/board_selection.c
+++ b/sound/soc/intel/avs/board_selection.c
@@ -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),

diff --git a/sound/soc/intel/avs/core.c b/sound/soc/intel/avs/core.c
index 6e0e65584c7f8c44c0af0a81e00ae3889aa712aa..1a53856c2ffbef80bf3fb35b0a57f5fea2a50b3c 100644 (file)
--- a/sound/soc/intel/avs/core.c
+++ b/sound/soc/intel/avs/core.c
@@ -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) },

diff --git a/sound/soc/sof/intel/pci-apl.c b/sound/soc/sof/intel/pci-apl.c
index 0bf7ee753bc3be5c6b607d3baae816b42c9aa80b..3241403efa60a0f762bb729187bc1d410471fa54 100644 (file)
--- a/sound/soc/sof/intel/pci-apl.c
+++ b/sound/soc/sof/intel/pci-apl.c
@@ -86,7 +86,7 @@ static const struct sof_dev_desc glk_desc = {
 /* PCI IDs */
 static const struct pci_device_id sof_pci_ids[] = {
        { PCI_DEVICE_DATA(INTEL, HDA_APL, &bxt_desc) },
-       { PCI_DEVICE_DATA(INTEL, HDA_GML, &glk_desc) },
+       { PCI_DEVICE_DATA(INTEL, HDA_GLK, &glk_desc) },
        { 0, }
 };
 MODULE_DEVICE_TABLE(pci, sof_pci_ids);