| From 93bcb3cbe0be64bd6fb1f90bbfca5d83b4d9a1b1 Mon Sep 17 00:00:00 2001 |
| From: Sasha Levin <sashal@kernel.org> |
| Date: Mon, 19 Apr 2021 19:49:14 +1200 |
| Subject: platform/x86: asus-nb-wmi: Revert "Drop duplicate DMI quirk |
| structures" |
| |
| From: Luke D. Jones <luke@ljones.dev> |
| |
| [ Upstream commit 98c0c85b1040db24f0d04d3e1d315c6c7b05cc07 ] |
| |
| This is a preparation revert for reverting the "add support for ASUS ROG |
| Zephyrus G14 and G15" change. This reverts |
| commit 67186653c903 ("platform/x86: asus-nb-wmi: Drop duplicate DMI quirk |
| structures") |
| |
| Signed-off-by: Luke D. Jones <luke@ljones.dev> |
| Link: https://lore.kernel.org/r/20210419074915.393433-2-luke@ljones.dev |
| Signed-off-by: Hans de Goede <hdegoede@redhat.com> |
| Signed-off-by: Sasha Levin <sashal@kernel.org> |
| --- |
| drivers/platform/x86/asus-nb-wmi.c | 23 ++++++++++++++--------- |
| 1 file changed, 14 insertions(+), 9 deletions(-) |
| |
| diff --git a/drivers/platform/x86/asus-nb-wmi.c b/drivers/platform/x86/asus-nb-wmi.c |
| index 1d9fbabd02fb..ff39079e2d75 100644 |
| --- a/drivers/platform/x86/asus-nb-wmi.c |
| +++ b/drivers/platform/x86/asus-nb-wmi.c |
| @@ -110,7 +110,12 @@ static struct quirk_entry quirk_asus_forceals = { |
| .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_set_devstate = true, |
| }; |
| @@ -427,7 +432,7 @@ static const struct dmi_system_id asus_quirks[] = { |
| DMI_MATCH(DMI_SYS_VENDOR, "ASUSTeK COMPUTER INC."), |
| DMI_MATCH(DMI_PRODUCT_NAME, "GA401IH"), |
| }, |
| - .driver_data = &quirk_asus_vendor_backlight, |
| + .driver_data = &quirk_asus_ga401i, |
| }, |
| { |
| .callback = dmi_matched, |
| @@ -436,7 +441,7 @@ static const struct dmi_system_id asus_quirks[] = { |
| DMI_MATCH(DMI_SYS_VENDOR, "ASUSTeK COMPUTER INC."), |
| DMI_MATCH(DMI_PRODUCT_NAME, "GA401II"), |
| }, |
| - .driver_data = &quirk_asus_vendor_backlight, |
| + .driver_data = &quirk_asus_ga401i, |
| }, |
| { |
| .callback = dmi_matched, |
| @@ -445,7 +450,7 @@ static const struct dmi_system_id asus_quirks[] = { |
| DMI_MATCH(DMI_SYS_VENDOR, "ASUSTeK COMPUTER INC."), |
| DMI_MATCH(DMI_PRODUCT_NAME, "GA401IU"), |
| }, |
| - .driver_data = &quirk_asus_vendor_backlight, |
| + .driver_data = &quirk_asus_ga401i, |
| }, |
| { |
| .callback = dmi_matched, |
| @@ -454,7 +459,7 @@ static const struct dmi_system_id asus_quirks[] = { |
| DMI_MATCH(DMI_SYS_VENDOR, "ASUSTeK COMPUTER INC."), |
| DMI_MATCH(DMI_PRODUCT_NAME, "GA401IV"), |
| }, |
| - .driver_data = &quirk_asus_vendor_backlight, |
| + .driver_data = &quirk_asus_ga401i, |
| }, |
| { |
| .callback = dmi_matched, |
| @@ -463,7 +468,7 @@ static const struct dmi_system_id asus_quirks[] = { |
| DMI_MATCH(DMI_SYS_VENDOR, "ASUSTeK COMPUTER INC."), |
| DMI_MATCH(DMI_PRODUCT_NAME, "GA401IVC"), |
| }, |
| - .driver_data = &quirk_asus_vendor_backlight, |
| + .driver_data = &quirk_asus_ga401i, |
| }, |
| { |
| .callback = dmi_matched, |
| @@ -472,7 +477,7 @@ static const struct dmi_system_id asus_quirks[] = { |
| DMI_MATCH(DMI_SYS_VENDOR, "ASUSTeK COMPUTER INC."), |
| DMI_MATCH(DMI_PRODUCT_NAME, "GA502II"), |
| }, |
| - .driver_data = &quirk_asus_vendor_backlight, |
| + .driver_data = &quirk_asus_ga502i, |
| }, |
| { |
| .callback = dmi_matched, |
| @@ -481,7 +486,7 @@ static const struct dmi_system_id asus_quirks[] = { |
| DMI_MATCH(DMI_SYS_VENDOR, "ASUSTeK COMPUTER INC."), |
| DMI_MATCH(DMI_PRODUCT_NAME, "GA502IU"), |
| }, |
| - .driver_data = &quirk_asus_vendor_backlight, |
| + .driver_data = &quirk_asus_ga502i, |
| }, |
| { |
| .callback = dmi_matched, |
| @@ -490,7 +495,7 @@ static const struct dmi_system_id asus_quirks[] = { |
| DMI_MATCH(DMI_SYS_VENDOR, "ASUSTeK COMPUTER INC."), |
| DMI_MATCH(DMI_PRODUCT_NAME, "GA502IV"), |
| }, |
| - .driver_data = &quirk_asus_vendor_backlight, |
| + .driver_data = &quirk_asus_ga502i, |
| }, |
| { |
| .callback = dmi_matched, |
| -- |
| 2.30.2 |
| |