Commit 98c0c85b authored by Luke D. Jones's avatar Luke D. Jones Committed by Hans de Goede

platform/x86: asus-nb-wmi: Revert "Drop duplicate DMI quirk structures"

This is a preparation revert for reverting the "add support for ASUS ROG
Zephyrus G14 and G15" change. This reverts
commit 67186653 ("platform/x86: asus-nb-wmi: Drop duplicate DMI quirk
structures")
Signed-off-by: default avatarLuke D. Jones <luke@ljones.dev>
Link: https://lore.kernel.org/r/20210419074915.393433-2-luke@ljones.devSigned-off-by: default avatarHans de Goede <hdegoede@redhat.com>
parent a558ea42
...@@ -110,7 +110,12 @@ static struct quirk_entry quirk_asus_forceals = { ...@@ -110,7 +110,12 @@ static struct quirk_entry quirk_asus_forceals = {
.wmi_force_als_set = true, .wmi_force_als_set = true,
}; };
static struct quirk_entry quirk_asus_vendor_backlight = { static struct quirk_entry quirk_asus_ga401i = {
.wmi_backlight_power = true,
.wmi_backlight_set_devstate = true,
};
static struct quirk_entry quirk_asus_ga502i = {
.wmi_backlight_power = true, .wmi_backlight_power = true,
.wmi_backlight_set_devstate = true, .wmi_backlight_set_devstate = true,
}; };
...@@ -432,7 +437,7 @@ static const struct dmi_system_id asus_quirks[] = { ...@@ -432,7 +437,7 @@ static const struct dmi_system_id asus_quirks[] = {
DMI_MATCH(DMI_SYS_VENDOR, "ASUSTeK COMPUTER INC."), DMI_MATCH(DMI_SYS_VENDOR, "ASUSTeK COMPUTER INC."),
DMI_MATCH(DMI_PRODUCT_NAME, "GA401IH"), DMI_MATCH(DMI_PRODUCT_NAME, "GA401IH"),
}, },
.driver_data = &quirk_asus_vendor_backlight, .driver_data = &quirk_asus_ga401i,
}, },
{ {
.callback = dmi_matched, .callback = dmi_matched,
...@@ -441,7 +446,7 @@ static const struct dmi_system_id asus_quirks[] = { ...@@ -441,7 +446,7 @@ static const struct dmi_system_id asus_quirks[] = {
DMI_MATCH(DMI_SYS_VENDOR, "ASUSTeK COMPUTER INC."), DMI_MATCH(DMI_SYS_VENDOR, "ASUSTeK COMPUTER INC."),
DMI_MATCH(DMI_PRODUCT_NAME, "GA401II"), DMI_MATCH(DMI_PRODUCT_NAME, "GA401II"),
}, },
.driver_data = &quirk_asus_vendor_backlight, .driver_data = &quirk_asus_ga401i,
}, },
{ {
.callback = dmi_matched, .callback = dmi_matched,
...@@ -450,7 +455,7 @@ static const struct dmi_system_id asus_quirks[] = { ...@@ -450,7 +455,7 @@ static const struct dmi_system_id asus_quirks[] = {
DMI_MATCH(DMI_SYS_VENDOR, "ASUSTeK COMPUTER INC."), DMI_MATCH(DMI_SYS_VENDOR, "ASUSTeK COMPUTER INC."),
DMI_MATCH(DMI_PRODUCT_NAME, "GA401IU"), DMI_MATCH(DMI_PRODUCT_NAME, "GA401IU"),
}, },
.driver_data = &quirk_asus_vendor_backlight, .driver_data = &quirk_asus_ga401i,
}, },
{ {
.callback = dmi_matched, .callback = dmi_matched,
...@@ -459,7 +464,7 @@ static const struct dmi_system_id asus_quirks[] = { ...@@ -459,7 +464,7 @@ static const struct dmi_system_id asus_quirks[] = {
DMI_MATCH(DMI_SYS_VENDOR, "ASUSTeK COMPUTER INC."), DMI_MATCH(DMI_SYS_VENDOR, "ASUSTeK COMPUTER INC."),
DMI_MATCH(DMI_PRODUCT_NAME, "GA401IV"), DMI_MATCH(DMI_PRODUCT_NAME, "GA401IV"),
}, },
.driver_data = &quirk_asus_vendor_backlight, .driver_data = &quirk_asus_ga401i,
}, },
{ {
.callback = dmi_matched, .callback = dmi_matched,
...@@ -468,7 +473,7 @@ static const struct dmi_system_id asus_quirks[] = { ...@@ -468,7 +473,7 @@ static const struct dmi_system_id asus_quirks[] = {
DMI_MATCH(DMI_SYS_VENDOR, "ASUSTeK COMPUTER INC."), DMI_MATCH(DMI_SYS_VENDOR, "ASUSTeK COMPUTER INC."),
DMI_MATCH(DMI_PRODUCT_NAME, "GA401IVC"), DMI_MATCH(DMI_PRODUCT_NAME, "GA401IVC"),
}, },
.driver_data = &quirk_asus_vendor_backlight, .driver_data = &quirk_asus_ga401i,
}, },
{ {
.callback = dmi_matched, .callback = dmi_matched,
...@@ -477,7 +482,7 @@ static const struct dmi_system_id asus_quirks[] = { ...@@ -477,7 +482,7 @@ static const struct dmi_system_id asus_quirks[] = {
DMI_MATCH(DMI_SYS_VENDOR, "ASUSTeK COMPUTER INC."), DMI_MATCH(DMI_SYS_VENDOR, "ASUSTeK COMPUTER INC."),
DMI_MATCH(DMI_PRODUCT_NAME, "GA502II"), DMI_MATCH(DMI_PRODUCT_NAME, "GA502II"),
}, },
.driver_data = &quirk_asus_vendor_backlight, .driver_data = &quirk_asus_ga502i,
}, },
{ {
.callback = dmi_matched, .callback = dmi_matched,
...@@ -486,7 +491,7 @@ static const struct dmi_system_id asus_quirks[] = { ...@@ -486,7 +491,7 @@ static const struct dmi_system_id asus_quirks[] = {
DMI_MATCH(DMI_SYS_VENDOR, "ASUSTeK COMPUTER INC."), DMI_MATCH(DMI_SYS_VENDOR, "ASUSTeK COMPUTER INC."),
DMI_MATCH(DMI_PRODUCT_NAME, "GA502IU"), DMI_MATCH(DMI_PRODUCT_NAME, "GA502IU"),
}, },
.driver_data = &quirk_asus_vendor_backlight, .driver_data = &quirk_asus_ga502i,
}, },
{ {
.callback = dmi_matched, .callback = dmi_matched,
...@@ -495,7 +500,7 @@ static const struct dmi_system_id asus_quirks[] = { ...@@ -495,7 +500,7 @@ static const struct dmi_system_id asus_quirks[] = {
DMI_MATCH(DMI_SYS_VENDOR, "ASUSTeK COMPUTER INC."), DMI_MATCH(DMI_SYS_VENDOR, "ASUSTeK COMPUTER INC."),
DMI_MATCH(DMI_PRODUCT_NAME, "GA502IV"), DMI_MATCH(DMI_PRODUCT_NAME, "GA502IV"),
}, },
.driver_data = &quirk_asus_vendor_backlight, .driver_data = &quirk_asus_ga502i,
}, },
{ {
.callback = dmi_matched, .callback = dmi_matched,
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment