From 846c7c51a07587505a84d5ef0842d424ccaf5f33 Mon Sep 17 00:00:00 2001 From: Maximilian Luz Date: Fri, 16 Oct 2020 20:48:34 +0200 Subject: [PATCH] fixup! Update v4.19 patches --- patches/4.19/0008-surface-sam.patch | 12 +++++------- patches/4.19/0009-surface-sam-over-hid.patch | 2 +- patches/4.19/0010-surface-gpe.patch | 2 +- ...Restore-acpi_walk_dep_device_list-getting-c.patch | 2 +- 4 files changed, 8 insertions(+), 10 deletions(-) diff --git a/patches/4.19/0008-surface-sam.patch b/patches/4.19/0008-surface-sam.patch index fad471c3c..9922bb86a 100644 --- a/patches/4.19/0008-surface-sam.patch +++ b/patches/4.19/0008-surface-sam.patch @@ -1,4 +1,4 @@ -From 3cf914699985f3179eb643ca2763a85fc854a1ad Mon Sep 17 00:00:00 2001 +From 69777ceca6c4036a9f071a37c582dbc2359f0c3f Mon Sep 17 00:00:00 2001 From: qzed Date: Mon, 26 Aug 2019 01:15:40 +0200 Subject: [PATCH 08/11] surface-sam @@ -29,7 +29,7 @@ Subject: [PATCH 08/11] surface-sam .../clients/surface_aggregator_cdev.c | 299 ++ .../clients/surface_aggregator_registry.c | 605 ++++ .../clients/surface_battery.c | 1192 ++++++++ - .../surface_aggregator/clients/surface_dtx.c | 1129 ++++++++ + .../surface_aggregator/clients/surface_dtx.c | 1127 ++++++++ .../surface_aggregator/clients/surface_hid.c | 919 ++++++ .../clients/surface_hotplug.c | 1285 +++++++++ .../clients/surface_perfmode.c | 122 + @@ -53,7 +53,7 @@ Subject: [PATCH 08/11] surface-sam include/uapi/linux/surface_aggregator/cdev.h | 58 + scripts/mod/devicetable-offsets.c | 8 + scripts/mod/file2alias.c | 23 + - 49 files changed, 18906 insertions(+), 29 deletions(-) + 49 files changed, 18904 insertions(+), 29 deletions(-) create mode 100644 Documentation/driver-api/surface_aggregator/client-api.rst create mode 100644 Documentation/driver-api/surface_aggregator/client.rst create mode 100644 Documentation/driver-api/surface_aggregator/clients/cdev.rst @@ -5131,10 +5131,10 @@ index 000000000000..d43797590cd9 +MODULE_LICENSE("GPL"); diff --git a/drivers/misc/surface_aggregator/clients/surface_dtx.c b/drivers/misc/surface_aggregator/clients/surface_dtx.c new file mode 100644 -index 000000000000..3b4cfe639509 +index 000000000000..e177e9873a0c --- /dev/null +++ b/drivers/misc/surface_aggregator/clients/surface_dtx.c -@@ -0,0 +1,1129 @@ +@@ -0,0 +1,1127 @@ +// SPDX-License-Identifier: GPL-2.0+ +/* + * Surface Book (gen. 2 and later) detachment system (DTX) driver. @@ -5297,8 +5297,6 @@ index 000000000000..3b4cfe639509 + u8 base_id; +} __packed; + -+static_assert(sizeof(struct ssam_dtx_base_info) == 2); -+ +static SSAM_DEFINE_SYNC_REQUEST_N(ssam_bas_latch_lock, { + .target_category = SSAM_SSH_TC_BAS, + .target_id = 0x01, diff --git a/patches/4.19/0009-surface-sam-over-hid.patch b/patches/4.19/0009-surface-sam-over-hid.patch index 11daf0d4a..fe6254d60 100644 --- a/patches/4.19/0009-surface-sam-over-hid.patch +++ b/patches/4.19/0009-surface-sam-over-hid.patch @@ -1,4 +1,4 @@ -From 1a31644e36615c46e3a3f748a9ca7734d088fbf2 Mon Sep 17 00:00:00 2001 +From b91f59f3002ceab95cae05a5bc6c9428063b1485 Mon Sep 17 00:00:00 2001 From: Maximilian Luz Date: Sat, 25 Jul 2020 17:19:53 +0200 Subject: [PATCH 09/11] surface-sam-over-hid diff --git a/patches/4.19/0010-surface-gpe.patch b/patches/4.19/0010-surface-gpe.patch index 701f3f0f6..b86c82a57 100644 --- a/patches/4.19/0010-surface-gpe.patch +++ b/patches/4.19/0010-surface-gpe.patch @@ -1,4 +1,4 @@ -From fef8fda488d7c56fad5cf2fe238441f165b12e1d Mon Sep 17 00:00:00 2001 +From 5796288595a85c616fb0b3eabd9e7a240d519287 Mon Sep 17 00:00:00 2001 From: Maximilian Luz Date: Sun, 16 Aug 2020 23:39:56 +0200 Subject: [PATCH 10/11] surface-gpe diff --git a/patches/4.19/0011-i2c-core-Restore-acpi_walk_dep_device_list-getting-c.patch b/patches/4.19/0011-i2c-core-Restore-acpi_walk_dep_device_list-getting-c.patch index fc2e3b4e6..c8a99c0d8 100644 --- a/patches/4.19/0011-i2c-core-Restore-acpi_walk_dep_device_list-getting-c.patch +++ b/patches/4.19/0011-i2c-core-Restore-acpi_walk_dep_device_list-getting-c.patch @@ -1,4 +1,4 @@ -From d6a1bcfe65b9c45fedcf19fdcc7d02245a8e09b4 Mon Sep 17 00:00:00 2001 +From e134b2f1c836a5beef7d16d86393744387bb4830 Mon Sep 17 00:00:00 2001 From: Hans de Goede Date: Wed, 14 Oct 2020 16:41:58 +0200 Subject: [PATCH 11/11] i2c: core: Restore acpi_walk_dep_device_list() getting