From 62c11293cf13df2ea1dc1b01ebdfe06bb304a478 Mon Sep 17 00:00:00 2001 From: Maximilian Luz Date: Sun, 20 Sep 2020 01:00:16 +0200 Subject: [PATCH] Fix patches for v5.4 Include missing kernel commit. --- patches/5.4/0005-surface-sam.patch | 6 +++--- patches/5.4/0006-surface-sam-over-hid.patch | 2 +- patches/5.4/0007-surface-gpe.patch | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/patches/5.4/0005-surface-sam.patch b/patches/5.4/0005-surface-sam.patch index e05fc0b27..01158ba40 100644 --- a/patches/5.4/0005-surface-sam.patch +++ b/patches/5.4/0005-surface-sam.patch @@ -1,4 +1,4 @@ -From 0d4a650652e9c3563142d64022aaa094f8adb97b Mon Sep 17 00:00:00 2001 +From f79897cc3960e70244bff9922553eb788a3e0707 Mon Sep 17 00:00:00 2001 From: qzed Date: Mon, 26 Aug 2019 01:11:08 +0200 Subject: [PATCH 5/7] surface-sam @@ -3280,7 +3280,7 @@ index 000000000000..9bbfe724a653 +MODULE_LICENSE("GPL"); diff --git a/drivers/misc/surface_aggregator/clients/surface_aggregator_registry.c b/drivers/misc/surface_aggregator/clients/surface_aggregator_registry.c new file mode 100644 -index 000000000000..18a81834ddf6 +index 000000000000..a3547eccf98c --- /dev/null +++ b/drivers/misc/surface_aggregator/clients/surface_aggregator_registry.c @@ -0,0 +1,601 @@ @@ -3372,7 +3372,7 @@ index 000000000000..18a81834ddf6 +#define SSAM_DUID_BAT_MAIN SSAM_DUID(BAT, 0x01, 0x01, 0x00) +#define SSAM_DUID_BAT_SB3BASE SSAM_DUID(BAT, 0x02, 0x01, 0x00) + -+#define SSAM_DUID_TMP_PERF SSAM_DUID(TMP, 0x01, 0x00, 0x02) ++#define SSAM_DUID_TMP_PERF SSAM_DUID(TMP, 0x01, 0x00, 0x01) + +#define SSAM_DUID_HID_KEYBOARD SSAM_DUID(HID, 0x02, 0x01, 0x00) +#define SSAM_DUID_HID_TOUCHPAD SSAM_DUID(HID, 0x02, 0x03, 0x00) diff --git a/patches/5.4/0006-surface-sam-over-hid.patch b/patches/5.4/0006-surface-sam-over-hid.patch index 428d03251..5133031e3 100644 --- a/patches/5.4/0006-surface-sam-over-hid.patch +++ b/patches/5.4/0006-surface-sam-over-hid.patch @@ -1,4 +1,4 @@ -From f98f8de383c3d665a2ec88bc5d6e59c0f06468d3 Mon Sep 17 00:00:00 2001 +From f16536c38be899126cb394d3b4f3fadd04135f1c Mon Sep 17 00:00:00 2001 From: Maximilian Luz Date: Sat, 25 Jul 2020 17:19:53 +0200 Subject: [PATCH 6/7] surface-sam-over-hid diff --git a/patches/5.4/0007-surface-gpe.patch b/patches/5.4/0007-surface-gpe.patch index f6b0ffc97..344e10609 100644 --- a/patches/5.4/0007-surface-gpe.patch +++ b/patches/5.4/0007-surface-gpe.patch @@ -1,4 +1,4 @@ -From 839a092f9fc11c1acb2725d0c2c94306feda4562 Mon Sep 17 00:00:00 2001 +From b6ed862e94fa768f9545eee70b690c66371897fb Mon Sep 17 00:00:00 2001 From: Maximilian Luz Date: Sun, 16 Aug 2020 23:39:56 +0200 Subject: [PATCH 7/7] surface-gpe