ASoC: Fix acronym for Intel Gemini Lake
Subsystems (5)
PATCH v2 1/1 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.
---
v2: added tag (Bjorn), left variable name as is (Cezary), added comment (Cezary)
include/linux/pci_ids.h | 3 ++- sound/hda/controllers/intel.c | 2 +- sound/hda/core/intel-dsp-config.c | 4 ++-- sound/soc/intel/avs/board_selection.c | 2 +- sound/soc/intel/avs/core.c | 2 +- sound/soc/sof/intel/pci-apl.c | 2 +- 6 files changed, 8 insertions(+), 7 deletions(-)
include/linux/pci_ids.h +2 -1
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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) },
sound/soc/sof/intel/pci-apl.c +1 -1
@@ -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);
Signature · 1 line
2.50.1
Quoted 7 lines · Andy Shevchenko
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.
Quoted 5 lines
Signed-off-by Andy Shevchenko <[email protected]>---
v2: added tag (Bjorn), left variable name as is (Cezary), added comment (Cezary)
Looks good.
Quoted 7 lines · Andy Shevchenko
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.
Quoted 5 lines
Signed-off-by Andy Shevchenko <[email protected]>---
v2: added tag (Bjorn), left variable name as is (Cezary), added comment (Cezary)
Quoted 97 lines
include/linux/pci_ids.h | 3 ++- sound/hda/controllers/intel.c | 2 +- sound/hda/core/intel-dsp-config.c | 4 ++-- sound/soc/intel/avs/board_selection.c | 2 +- sound/soc/intel/avs/core.c | 2 +- sound/soc/sof/intel/pci-apl.c | 2 +- 6 files changed, 8 insertions(+), 7 deletions(-)include/linux/pci_ids.h +2
-1@@ -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 0x342asound/hda/controllers/intel.c +1
-1@@ -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@@ -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@@ -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@@ -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) },sound/soc/sof/intel/pci-apl.c +1
-1@@ -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);
Signature · 1 line
Péter
Mark Brown
maintainerQuoted 8 lines · Andy Shevchenko
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.
[...]
Applied to
https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git for-next
Thanks!
[1/1] ASoC: Fix acronym for Intel Gemini Lake
commit: a1bcb66209a745c9ca18deae9f1c207b009dee1c
All being well this means that it will be integrated into the linux-next tree (usually sometime in the next 24 hours) and sent to Linus during the next merge window (or sooner if it is a bug fix), however if problems are discovered then the patch may be dropped or reverted.
You may get further e-mails resulting from automated or manual testing and review of the tree, please engage with people reporting problems and send followup patches addressing any issues that are reported if needed.
If any updates are required or you are submitting further changes they should be sent as incremental updates against current git, existing patches will not be replaced.
Please add any relevant lists and maintainers to the CCs when replying to this mail.
Thanks,
Mark