summarylogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--.SRCINFO1
-rw-r--r--PKGBUILD3
-rw-r--r--asus-wmi.patch75
-rw-r--r--sys-kernel_arch-sources-g14_files_0002-asus-wmi-dmiids.patch114
4 files changed, 1 insertions, 192 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 7c7aaf89c5ee..700c39c11672 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -16,7 +16,6 @@ pkgbase = linux-g14
source = config
source = sphinx-workaround.patch
source = sys-kernel_arch-sources-g14_files_0001-nonupstream-navi10-vfio-reset.patch
- source = sys-kernel_arch-sources-g14_files_0002-asus-wmi-dmiids.patch
source = sys-kernel_arch-sources-g14_files_0003-i8042-dmiids.patch
source = sys-kernel_arch-sources-g14_files_0004-hid-asus-n-key.patch
source = sys-kernel_arch-sources-g14_files_0005-drm-amd-display-use-correct-scale-for-actual_brightness.patch
diff --git a/PKGBUILD b/PKGBUILD
index cbff934e30cb..51ecabb0cc3a 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,7 +2,7 @@
pkgbase=linux-g14
pkgver=5.8.5.arch1
-pkgrel=1
+pkgrel=2
pkgdesc='Linux'
_srctag=v${pkgver%.*}-${pkgver##*.}
url="https://lab.retarded.farm/zappel/asus-rog-zephyrus-g14/"
@@ -20,7 +20,6 @@ source=(
config # the main kernel config file
sphinx-workaround.patch
"sys-kernel_arch-sources-g14_files_0001-nonupstream-navi10-vfio-reset.patch"
- "sys-kernel_arch-sources-g14_files_0002-asus-wmi-dmiids.patch"
"sys-kernel_arch-sources-g14_files_0003-i8042-dmiids.patch"
"sys-kernel_arch-sources-g14_files_0004-hid-asus-n-key.patch"
"sys-kernel_arch-sources-g14_files_0005-drm-amd-display-use-correct-scale-for-actual_brightness.patch"
diff --git a/asus-wmi.patch b/asus-wmi.patch
deleted file mode 100644
index 1618c076a348..000000000000
--- a/asus-wmi.patch
+++ /dev/null
@@ -1,75 +0,0 @@
-diff --git a/drivers/platform/x86/asus-nb-wmi.c b/drivers/platform/x86/asus-nb-wmi.c
-index c4404d9c1de4..f83bcf869255 100644
---- a/drivers/platform/x86/asus-nb-wmi.c
-+++ b/drivers/platform/x86/asus-nb-wmi.c
-@@ -110,6 +110,18 @@ static struct quirk_entry quirk_asus_forceals = {
- .wmi_force_als_set = true,
- };
-
-+static struct quirk_entry quirk_asus_ga401i = {
-+ .wapf = 4, // not sure if that is correct
-+ .wmi_backlight_power = true,
-+ .wmi_backlight_set_devstate = true,
-+};
-+
-+static struct quirk_entry quirk_asus_ga502i = {
-+ .wapf = 4, // not sure if that is correct
-+ .wmi_backlight_power = true,
-+ .wmi_backlight_set_devstate = true,
-+};
-+
- static int dmi_matched(const struct dmi_system_id *dmi)
- {
- pr_info("Identified laptop model '%s'\n", dmi->ident);
-@@ -411,6 +423,51 @@ static const struct dmi_system_id asus_quirks[] = {
- },
- .driver_data = &quirk_asus_forceals,
- },
-+ {
-+ .callback = dmi_matched,
-+ .ident = "ASUSTeK COMPUTER INC. GA401IV",
-+ .matches = {
-+ DMI_MATCH(DMI_SYS_VENDOR, "ASUSTeK COMPUTER INC."),
-+ DMI_MATCH(DMI_PRODUCT_NAME, "GA401IV"),
-+ },
-+ .driver_data = &quirk_asus_ga401i,
-+ },
-+ {
-+ .callback = dmi_matched,
-+ .ident = "ASUSTeK COMPUTER INC. GA401IU",
-+ .matches = {
-+ DMI_MATCH(DMI_SYS_VENDOR, "ASUSTeK COMPUTER INC."),
-+ DMI_MATCH(DMI_PRODUCT_NAME, "GA401IU"),
-+ },
-+ .driver_data = &quirk_asus_ga401i,
-+ },
-+ {
-+ .callback = dmi_matched,
-+ .ident = "ASUSTeK COMPUTER INC. GA401II",
-+ .matches = {
-+ DMI_MATCH(DMI_SYS_VENDOR, "ASUSTeK COMPUTER INC."),
-+ DMI_MATCH(DMI_PRODUCT_NAME, "GA401II"),
-+ },
-+ .driver_data = &quirk_asus_ga401i,
-+ },
-+ {
-+ .callback = dmi_matched,
-+ .ident = "ASUSTeK COMPUTER INC. GA502IU",
-+ .matches = {
-+ DMI_MATCH(DMI_SYS_VENDOR, "ASUSTeK COMPUTER INC."),
-+ DMI_MATCH(DMI_PRODUCT_NAME, "GA502IU"),
-+ },
-+ .driver_data = &quirk_asus_ga502i,
-+ },
-+ {
-+ .callback = dmi_matched,
-+ .ident = "ASUSTeK COMPUTER INC. GA502IV",
-+ .matches = {
-+ DMI_MATCH(DMI_SYS_VENDOR, "ASUSTeK COMPUTER INC."),
-+ DMI_MATCH(DMI_PRODUCT_NAME, "GA502IV"),
-+ },
-+ .driver_data = &quirk_asus_ga502i,
-+ },
- {},
- };
-
diff --git a/sys-kernel_arch-sources-g14_files_0002-asus-wmi-dmiids.patch b/sys-kernel_arch-sources-g14_files_0002-asus-wmi-dmiids.patch
deleted file mode 100644
index 8adac22515ac..000000000000
--- a/sys-kernel_arch-sources-g14_files_0002-asus-wmi-dmiids.patch
+++ /dev/null
@@ -1,114 +0,0 @@
-diff --git a/drivers/platform/x86/asus-nb-wmi.c b/drivers/platform/x86/asus-nb-wmi.c
-index 8c4d00482ef0..dd0b54a5f548 100644
---- a/drivers/platform/x86/asus-nb-wmi.c
-+++ b/drivers/platform/x86/asus-nb-wmi.c
-@@ -110,6 +110,21 @@ static struct quirk_entry quirk_asus_forceals = {
- .wmi_force_als_set = true,
- };
-
-+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,
-+};
-+
-+static struct quirk_entry quirk_asus_fa506i = {
-+ .wmi_backlight_power = true,
-+ .wmi_backlight_set_devstate = true,
-+};
-+
- static int dmi_matched(const struct dmi_system_id *dmi)
- {
- pr_info("Identified laptop model '%s'\n", dmi->ident);
-@@ -411,6 +426,87 @@ static const struct dmi_system_id asus_quirks[] = {
- },
- .driver_data = &quirk_asus_forceals,
- },
-+ {
-+ .callback = dmi_matched,
-+ .ident = "ASUSTeK COMPUTER INC. GA401IH",
-+ .matches = {
-+ DMI_MATCH(DMI_SYS_VENDOR, "ASUSTeK COMPUTER INC."),
-+ DMI_MATCH(DMI_PRODUCT_NAME, "GA401IH"),
-+ },
-+ .driver_data = &quirk_asus_ga401i,
-+ },
-+ {
-+ .callback = dmi_matched,
-+ .ident = "ASUSTeK COMPUTER INC. GA401II",
-+ .matches = {
-+ DMI_MATCH(DMI_SYS_VENDOR, "ASUSTeK COMPUTER INC."),
-+ DMI_MATCH(DMI_PRODUCT_NAME, "GA401II"),
-+ },
-+ .driver_data = &quirk_asus_ga401i,
-+ },
-+ {
-+ .callback = dmi_matched,
-+ .ident = "ASUSTeK COMPUTER INC. GA401IU",
-+ .matches = {
-+ DMI_MATCH(DMI_SYS_VENDOR, "ASUSTeK COMPUTER INC."),
-+ DMI_MATCH(DMI_PRODUCT_NAME, "GA401IU"),
-+ },
-+ .driver_data = &quirk_asus_ga401i,
-+ },
-+ {
-+ .callback = dmi_matched,
-+ .ident = "ASUSTeK COMPUTER INC. GA401IV",
-+ .matches = {
-+ DMI_MATCH(DMI_SYS_VENDOR, "ASUSTeK COMPUTER INC."),
-+ DMI_MATCH(DMI_PRODUCT_NAME, "GA401IV"),
-+ },
-+ .driver_data = &quirk_asus_ga401i,
-+ },
-+ {
-+ .callback = dmi_matched,
-+ .ident = "ASUSTeK COMPUTER INC. GA401IVC",
-+ .matches = {
-+ DMI_MATCH(DMI_SYS_VENDOR, "ASUSTeK COMPUTER INC."),
-+ DMI_MATCH(DMI_PRODUCT_NAME, "GA401IVC"),
-+ },
-+ .driver_data = &quirk_asus_ga401i,
-+ },
-+ {
-+ .callback = dmi_matched,
-+ .ident = "ASUSTeK COMPUTER INC. GA502II",
-+ .matches = {
-+ DMI_MATCH(DMI_SYS_VENDOR, "ASUSTeK COMPUTER INC."),
-+ DMI_MATCH(DMI_PRODUCT_NAME, "GA502II"),
-+ },
-+ .driver_data = &quirk_asus_ga502i,
-+ },
-+ {
-+ .callback = dmi_matched,
-+ .ident = "ASUSTeK COMPUTER INC. GA502IU",
-+ .matches = {
-+ DMI_MATCH(DMI_SYS_VENDOR, "ASUSTeK COMPUTER INC."),
-+ DMI_MATCH(DMI_PRODUCT_NAME, "GA502IU"),
-+ },
-+ .driver_data = &quirk_asus_ga502i,
-+ },
-+ {
-+ .callback = dmi_matched,
-+ .ident = "ASUSTeK COMPUTER INC. GA502IV",
-+ .matches = {
-+ DMI_MATCH(DMI_SYS_VENDOR, "ASUSTeK COMPUTER INC."),
-+ DMI_MATCH(DMI_PRODUCT_NAME, "GA502IV"),
-+ },
-+ .driver_data = &quirk_asus_ga502i,
-+ },
-+ {
-+ .callback = dmi_matched,
-+ .ident = "ASUSTeK COMPUTER INC. FA506IV",
-+ .matches = {
-+ DMI_MATCH(DMI_SYS_VENDOR, "ASUSTeK COMPUTER INC."),
-+ DMI_MATCH(DMI_PRODUCT_NAME, "FA506IV"),
-+ },
-+ .driver_data = &quirk_asus_fa506i,
-+ },
- {},
- };
-