]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
ASoC: Intel: bytcr_rt5651: Sort DMI table entries alphabetically
authorHans de Goede <hdegoede@redhat.com>
Sun, 24 Jun 2018 14:06:34 +0000 (16:06 +0200)
committerMark Brown <broonie@kernel.org>
Wed, 27 Jun 2018 11:11:34 +0000 (12:11 +0100)
As we get more entries in the DMI quirk table it is nice to have some
sort of ordering in the table, sort it alphabetically.

Signed-off-by: Hans de Goede <hdegoede@redhat.com>
Reviewed-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Signed-off-by: Mark Brown <broonie@kernel.org>
sound/soc/intel/boards/bytcr_rt5651.c

index ffd62eb5c266982e1002d7c76c32b19870a18841..ba2753e0e12aef6442652455594847f4596d225c 100644 (file)
@@ -335,23 +335,29 @@ static int byt_rt5651_quirk_cb(const struct dmi_system_id *id)
 
 static const struct dmi_system_id byt_rt5651_quirk_table[] = {
        {
+               /* Chuwi Hi8 Pro (CWI513) */
                .callback = byt_rt5651_quirk_cb,
                .matches = {
-                       DMI_MATCH(DMI_SYS_VENDOR, "Circuitco"),
-                       DMI_MATCH(DMI_PRODUCT_NAME, "Minnowboard Max B3 PLATFORM"),
+                       DMI_MATCH(DMI_SYS_VENDOR, "Hampoo"),
+                       DMI_MATCH(DMI_PRODUCT_NAME, "X1D3_C806N"),
                },
-               .driver_data = (void *)(BYT_RT5651_IN1_MAP),
+               .driver_data = (void *)(BYT_RT5651_DEFAULT_QUIRKS |
+                                       BYT_RT5651_IN1_MAP |
+                                       BYT_RT5651_HP_LR_SWAPPED),
        },
        {
+               /* Chuwi Vi8 Plus (CWI519) */
                .callback = byt_rt5651_quirk_cb,
                .matches = {
-                       DMI_MATCH(DMI_SYS_VENDOR, "ADI"),
-                       DMI_MATCH(DMI_PRODUCT_NAME, "Minnowboard Turbot"),
+                       DMI_MATCH(DMI_SYS_VENDOR, "Hampoo"),
+                       DMI_MATCH(DMI_PRODUCT_NAME, "D2D3_Vi8A1"),
                },
-               .driver_data = (void *)(BYT_RT5651_MCLK_EN |
-                                       BYT_RT5651_IN1_MAP),
+               .driver_data = (void *)(BYT_RT5651_DEFAULT_QUIRKS |
+                                       BYT_RT5651_IN1_MAP |
+                                       BYT_RT5651_HP_LR_SWAPPED),
        },
        {
+               /* KIANO SlimNote 14.2 */
                .callback = byt_rt5651_quirk_cb,
                .matches = {
                        DMI_MATCH(DMI_SYS_VENDOR, "KIANO"),
@@ -361,26 +367,23 @@ static const struct dmi_system_id byt_rt5651_quirk_table[] = {
                                        BYT_RT5651_IN1_IN2_MAP),
        },
        {
-               /* Chuwi Hi8 Pro (CWI513) */
+               /* Minnowboard Max B3 */
                .callback = byt_rt5651_quirk_cb,
                .matches = {
-                       DMI_MATCH(DMI_SYS_VENDOR, "Hampoo"),
-                       DMI_MATCH(DMI_PRODUCT_NAME, "X1D3_C806N"),
+                       DMI_MATCH(DMI_SYS_VENDOR, "Circuitco"),
+                       DMI_MATCH(DMI_PRODUCT_NAME, "Minnowboard Max B3 PLATFORM"),
                },
-               .driver_data = (void *)(BYT_RT5651_DEFAULT_QUIRKS |
-                                       BYT_RT5651_IN1_MAP |
-                                       BYT_RT5651_HP_LR_SWAPPED),
+               .driver_data = (void *)(BYT_RT5651_IN1_MAP),
        },
        {
-               /* Chuwi Vi8 Plus (CWI519) */
+               /* Minnowboard Turbot */
                .callback = byt_rt5651_quirk_cb,
                .matches = {
-                       DMI_MATCH(DMI_SYS_VENDOR, "Hampoo"),
-                       DMI_MATCH(DMI_PRODUCT_NAME, "D2D3_Vi8A1"),
+                       DMI_MATCH(DMI_SYS_VENDOR, "ADI"),
+                       DMI_MATCH(DMI_PRODUCT_NAME, "Minnowboard Turbot"),
                },
-               .driver_data = (void *)(BYT_RT5651_DEFAULT_QUIRKS |
-                                       BYT_RT5651_IN1_MAP |
-                                       BYT_RT5651_HP_LR_SWAPPED),
+               .driver_data = (void *)(BYT_RT5651_MCLK_EN |
+                                       BYT_RT5651_IN1_MAP),
        },
        {
                /* VIOS LTH17 */