diff --git a/0001-quirks-Add-Apple-MTP-touchpad-quirk.patch b/0001-quirks-Add-Apple-MTP-touchpad-quirk.patch new file mode 100644 index 0000000..a912006 --- /dev/null +++ b/0001-quirks-Add-Apple-MTP-touchpad-quirk.patch @@ -0,0 +1,41 @@ +From 6f417fec0071fa2814d4449cc78db8da8f009d99 Mon Sep 17 00:00:00 2001 +From: Hector Martin +Date: Tue, 22 Nov 2022 13:52:24 +0900 +Subject: [PATCH] quirks: Add Apple MTP touchpad quirk + +Apple M2 (and presumably newer) laptops now embed the touchpad +controller into the main SoC, and use a new internal communications +protocol between it and the main CPU. This isn't really a "bus" like +SPI or I2C, so the downstream kernel driver currently uses the (not +well supported) HOST bus type. MatchBus can't match on that, so let's +just use a name match (plus the vendor ID, which is still valid and +the usual Apple one). + +Signed-off-by: Hector Martin +--- + quirks/50-system-apple.quirks | 9 +++++++++ + 1 file changed, 9 insertions(+) + +diff --git a/quirks/50-system-apple.quirks b/quirks/50-system-apple.quirks +index 7f7a81cd36d5..a6d6eea91d5a 100644 +--- a/quirks/50-system-apple.quirks ++++ b/quirks/50-system-apple.quirks +@@ -105,6 +105,15 @@ AttrSizeHint=104x75 + AttrTouchSizeRange=150:130 + AttrPalmSizeThreshold=1600 + ++[Apple Laptop Touchpad (MTP)] ++MatchUdevType=touchpad ++MatchName=Apple*MTP* ++MatchVendor=0x5AC ++ModelAppleTouchpad=1 ++AttrSizeHint=104x75 ++AttrTouchSizeRange=150:130 ++AttrPalmSizeThreshold=1600 ++ + # The Linux applespi driver currently uses the Synaptics vendor for some reason + [Apple Laptop Touchpad (SPI)] + MatchUdevType=touchpad +-- +2.38.1 + diff --git a/libinput.spec b/libinput.spec index a1525f5..633a577 100644 --- a/libinput.spec +++ b/libinput.spec @@ -5,7 +5,7 @@ Name: libinput Version: 1.22.0 -Release: 1%{?gitdate:.%{gitdate}git%{gitversion}}%{?dist} +Release: 2%{?gitdate:.%{gitdate}git%{gitversion}}%{?dist} Summary: Input device library License: MIT @@ -17,6 +17,8 @@ Source2: commitid %else Source0: https://gitlab.freedesktop.org/libinput/libinput/-/archive/%{version}/libinput-%{version}.tar.bz2 %endif +# Apple MTP touchpad quirk for Apple M2 laptops +Patch0: 0001-quirks-Add-Apple-MTP-touchpad-quirk.patch BuildRequires: git-core BuildRequires: gcc @@ -64,7 +66,7 @@ The %{name}-test package contains the libinput test suite. It is not intended to be run by users. %prep -%autosetup -S git +%autosetup -S git -p1 # Replace whatever the source uses with the approved call %py3_shebang_fix $(git grep -l '#!/usr/bin/.*python3') @@ -151,6 +153,9 @@ intended to be run by users. %changelog +* Sat Nov 26 2022 Davide Cavalca 1.22.0-2 +- Backport upstream patch to add Apple MTP touchpad quirk for Apple M2 laptops + * Mon Nov 21 2022 Peter Hutterer - 1.22.0-1git58abea394} - libinput 1.22.0