Skip to content

Commit 5188ebe

Browse files
EvilOlafEvilOlaf
committed
uefi-x86-6.18: rewrite patches for 6.18.24
1 parent 22de8bd commit 5188ebe

3 files changed

Lines changed: 20 additions & 20 deletions

File tree

‎patch/kernel/archive/uefi-x86-6.18/4001-asahi-trackpad.patch‎

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ diff --git a/drivers/hid/hid-core.c b/drivers/hid/hid-core.c
2222
index 111111111111..222222222222 100644
2323
--- a/drivers/hid/hid-core.c
2424
+++ b/drivers/hid/hid-core.c
25-
@@ -2316,6 +2316,9 @@ int hid_connect(struct hid_device *hdev, unsigned int connect_mask)
25+
@@ -2320,6 +2320,9 @@ int hid_connect(struct hid_device *hdev, unsigned int connect_mask)
2626
case BUS_I2C:
2727
bus = "I2C";
2828
break;
@@ -36,15 +36,15 @@ diff --git a/drivers/hid/hid-ids.h b/drivers/hid/hid-ids.h
3636
index 111111111111..222222222222 100644
3737
--- a/drivers/hid/hid-ids.h
3838
+++ b/drivers/hid/hid-ids.h
39-
@@ -93,6 +93,7 @@
39+
@@ -96,6 +96,7 @@
4040

4141
#define USB_VENDOR_ID_APPLE 0x05ac
4242
#define BT_VENDOR_ID_APPLE 0x004c
4343
+#define SPI_VENDOR_ID_APPLE 0x05ac
4444
#define USB_DEVICE_ID_APPLE_MIGHTYMOUSE 0x0304
4545
#define USB_DEVICE_ID_APPLE_MAGICMOUSE 0x030d
4646
#define USB_DEVICE_ID_APPLE_MAGICMOUSE2 0x0269
47-
@@ -197,6 +198,10 @@
47+
@@ -200,6 +201,10 @@
4848
#define USB_DEVICE_ID_APPLE_IRCONTROL5 0x8243
4949
#define USB_DEVICE_ID_APPLE_TOUCHBAR_BACKLIGHT 0x8102
5050
#define USB_DEVICE_ID_APPLE_TOUCHBAR_DISPLAY 0x8302
@@ -100,15 +100,15 @@ diff --git a/drivers/hid/hid-ids.h b/drivers/hid/hid-ids.h
100100
index 111111111111..222222222222 100644
101101
--- a/drivers/hid/hid-ids.h
102102
+++ b/drivers/hid/hid-ids.h
103-
@@ -94,6 +94,7 @@
103+
@@ -97,6 +97,7 @@
104104
#define USB_VENDOR_ID_APPLE 0x05ac
105105
#define BT_VENDOR_ID_APPLE 0x004c
106106
#define SPI_VENDOR_ID_APPLE 0x05ac
107107
+#define HOST_VENDOR_ID_APPLE 0x05ac
108108
#define USB_DEVICE_ID_APPLE_MIGHTYMOUSE 0x0304
109109
#define USB_DEVICE_ID_APPLE_MAGICMOUSE 0x030d
110110
#define USB_DEVICE_ID_APPLE_MAGICMOUSE2 0x0269
111-
@@ -202,6 +203,10 @@
111+
@@ -205,6 +206,10 @@
112112
#define SPI_DEVICE_ID_APPLE_MACBOOK_PRO13_2020 0x0341
113113
#define SPI_DEVICE_ID_APPLE_MACBOOK_PRO14_2021 0x0342
114114
#define SPI_DEVICE_ID_APPLE_MACBOOK_PRO16_2021 0x0343
@@ -136,7 +136,7 @@ diff --git a/drivers/hid/hid-core.c b/drivers/hid/hid-core.c
136136
index 111111111111..222222222222 100644
137137
--- a/drivers/hid/hid-core.c
138138
+++ b/drivers/hid/hid-core.c
139-
@@ -2319,6 +2319,9 @@ int hid_connect(struct hid_device *hdev, unsigned int connect_mask)
139+
@@ -2323,6 +2323,9 @@ int hid_connect(struct hid_device *hdev, unsigned int connect_mask)
140140
case BUS_SPI:
141141
bus = "SPI";
142142
break;
@@ -184,7 +184,7 @@ diff --git a/drivers/hid/hid-core.c b/drivers/hid/hid-core.c
184184
index 111111111111..222222222222 100644
185185
--- a/drivers/hid/hid-core.c
186186
+++ b/drivers/hid/hid-core.c
187-
@@ -468,7 +468,10 @@ static int hid_parser_global(struct hid_parser *parser, struct hid_item *item)
187+
@@ -471,7 +471,10 @@ static int hid_parser_global(struct hid_parser *parser, struct hid_item *item)
188188

189189
case HID_GLOBAL_ITEM_TAG_REPORT_SIZE:
190190
parser->global.report_size = item_udata(item);
@@ -236,7 +236,7 @@ diff --git a/drivers/hid/hid-apple.c b/drivers/hid/hid-apple.c
236236
index 111111111111..222222222222 100644
237237
--- a/drivers/hid/hid-apple.c
238238
+++ b/drivers/hid/hid-apple.c
239-
@@ -519,6 +519,15 @@ static int hidinput_apple_event(struct hid_device *hid, struct input_dev *input,
239+
@@ -522,6 +522,15 @@ static int hidinput_apple_event(struct hid_device *hid, struct input_dev *input,
240240
table = macbookair_fn_keys;
241241
else if (hid->product < 0x21d || hid->product >= 0x300)
242242
table = powerbook_fn_keys;
@@ -252,7 +252,7 @@ index 111111111111..222222222222 100644
252252
else
253253
table = apple_fn_keys;
254254
}
255-
@@ -939,6 +948,10 @@ static int apple_probe(struct hid_device *hdev,
255+
@@ -940,6 +949,10 @@ static int apple_probe(struct hid_device *hdev,
256256
struct apple_sc *asc;
257257
int ret;
258258

@@ -263,7 +263,7 @@ index 111111111111..222222222222 100644
263263
asc = devm_kzalloc(&hdev->dev, sizeof(*asc), GFP_KERNEL);
264264
if (asc == NULL) {
265265
hid_err(hdev, "can't alloc apple descriptor\n");
266-
@@ -1217,6 +1230,8 @@ static const struct hid_device_id apple_devices[] = {
266+
@@ -1218,6 +1231,8 @@ static const struct hid_device_id apple_devices[] = {
267267
.driver_data = APPLE_HAS_FN | APPLE_ISO_TILDE_QUIRK | APPLE_RDESC_BATTERY },
268268
{ HID_BLUETOOTH_DEVICE(BT_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_MAGIC_KEYBOARD_NUMPAD_2024),
269269
.driver_data = APPLE_HAS_FN | APPLE_ISO_TILDE_QUIRK },
@@ -291,7 +291,7 @@ diff --git a/drivers/hid/hid-apple.c b/drivers/hid/hid-apple.c
291291
index 111111111111..222222222222 100644
292292
--- a/drivers/hid/hid-apple.c
293293
+++ b/drivers/hid/hid-apple.c
294-
@@ -519,9 +519,10 @@ static int hidinput_apple_event(struct hid_device *hid, struct input_dev *input,
294+
@@ -522,9 +522,10 @@ static int hidinput_apple_event(struct hid_device *hid, struct input_dev *input,
295295
table = macbookair_fn_keys;
296296
else if (hid->product < 0x21d || hid->product >= 0x300)
297297
table = powerbook_fn_keys;
@@ -303,7 +303,7 @@ index 111111111111..222222222222 100644
303303
table = macbookpro_dedicated_esc_fn_keys;
304304
break;
305305
default:
306-
@@ -948,7 +949,7 @@ static int apple_probe(struct hid_device *hdev,
306+
@@ -949,7 +950,7 @@ static int apple_probe(struct hid_device *hdev,
307307
struct apple_sc *asc;
308308
int ret;
309309

@@ -312,7 +312,7 @@ index 111111111111..222222222222 100644
312312
hdev->type != HID_TYPE_SPI_KEYBOARD)
313313
return -ENODEV;
314314

315-
@@ -1232,6 +1233,8 @@ static const struct hid_device_id apple_devices[] = {
315+
@@ -1233,6 +1234,8 @@ static const struct hid_device_id apple_devices[] = {
316316
.driver_data = APPLE_HAS_FN | APPLE_ISO_TILDE_QUIRK },
317317
{ HID_SPI_DEVICE(SPI_VENDOR_ID_APPLE, HID_ANY_ID),
318318
.driver_data = APPLE_HAS_FN | APPLE_ISO_TILDE_QUIRK },
@@ -886,7 +886,7 @@ index 111111111111..222222222222 100644
886886
default: /* USB_DEVICE_ID_APPLE_MAGICTRACKPAD */
887887
report = hid_register_report(hdev, HID_INPUT_REPORT,
888888
TRACKPAD_REPORT_ID, 0);
889-
@@ -1060,6 +1318,8 @@ static const struct hid_device_id magic_mice[] = {
889+
@@ -1058,6 +1316,8 @@ static const struct hid_device_id magic_mice[] = {
890890
USB_DEVICE_ID_APPLE_MAGICTRACKPAD2_USBC), .driver_data = 0 },
891891
{ HID_USB_DEVICE(USB_VENDOR_ID_APPLE,
892892
USB_DEVICE_ID_APPLE_MAGICTRACKPAD2_USBC), .driver_data = 0 },
@@ -1056,7 +1056,7 @@ index 111111111111..222222222222 100644
10561056
/*
10571057
* Some devices repond with 'invalid report id' when feature
10581058
* report switching it into multitouch mode is sent to it.
1059-
@@ -1320,6 +1349,8 @@ static const struct hid_device_id magic_mice[] = {
1059+
@@ -1318,6 +1347,8 @@ static const struct hid_device_id magic_mice[] = {
10601060
USB_DEVICE_ID_APPLE_MAGICTRACKPAD2_USBC), .driver_data = 0 },
10611061
{ HID_SPI_DEVICE(SPI_VENDOR_ID_APPLE, HID_ANY_ID),
10621062
.driver_data = 0 },
@@ -1084,7 +1084,7 @@ diff --git a/drivers/hid/hid-magicmouse.c b/drivers/hid/hid-magicmouse.c
10841084
index 111111111111..222222222222 100644
10851085
--- a/drivers/hid/hid-magicmouse.c
10861086
+++ b/drivers/hid/hid-magicmouse.c
1087-
@@ -1355,6 +1355,16 @@ static const struct hid_device_id magic_mice[] = {
1087+
@@ -1353,6 +1353,16 @@ static const struct hid_device_id magic_mice[] = {
10881088
};
10891089
MODULE_DEVICE_TABLE(hid, magic_mice);
10901090

@@ -1101,7 +1101,7 @@ index 111111111111..222222222222 100644
11011101
static struct hid_driver magicmouse_driver = {
11021102
.name = "magicmouse",
11031103
.id_table = magic_mice,
1104-
@@ -1365,6 +1375,10 @@ static struct hid_driver magicmouse_driver = {
1104+
@@ -1363,6 +1373,10 @@ static struct hid_driver magicmouse_driver = {
11051105
.event = magicmouse_event,
11061106
.input_mapping = magicmouse_input_mapping,
11071107
.input_configured = magicmouse_input_configured,

‎patch/kernel/archive/uefi-x86-6.18/4003-HID-apple-ignore-the-trackpad-on-T2-Macs.patch‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ index 111111111111..222222222222 100644
2525
#define APPLE_HAS_FN BIT(2)
2626
/* BIT(3) reserved, was: APPLE_HIDDEV */
2727
#define APPLE_ISO_TILDE_QUIRK BIT(4)
28-
@@ -953,6 +953,9 @@ static int apple_probe(struct hid_device *hdev,
28+
@@ -954,6 +954,9 @@ static int apple_probe(struct hid_device *hdev,
2929
hdev->type != HID_TYPE_SPI_KEYBOARD)
3030
return -ENODEV;
3131

@@ -35,7 +35,7 @@ index 111111111111..222222222222 100644
3535
asc = devm_kzalloc(&hdev->dev, sizeof(*asc), GFP_KERNEL);
3636
if (asc == NULL) {
3737
hid_err(hdev, "can't alloc apple descriptor\n");
38-
@@ -1175,27 +1178,31 @@ static const struct hid_device_id apple_devices[] = {
38+
@@ -1176,27 +1179,31 @@ static const struct hid_device_id apple_devices[] = {
3939
{ HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_WELLSPRING9_JIS),
4040
.driver_data = APPLE_HAS_FN | APPLE_RDESC_JIS },
4141
{ HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_WELLSPRINGT2_J140K),

‎patch/kernel/archive/uefi-x86-6.18/4004-HID-magicmouse-Add-support-for-trackpads-found-on-T2.patch‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -387,7 +387,7 @@ index 111111111111..222222222222 100644
387387
case HID_ANY_ID:
388388
switch (id->bus) {
389389
case BUS_HOST:
390-
@@ -1469,6 +1705,24 @@ static const struct hid_device_id magic_mice[] = {
390+
@@ -1467,6 +1703,24 @@ static const struct hid_device_id magic_mice[] = {
391391
USB_DEVICE_ID_APPLE_MAGICTRACKPAD2_USBC), .driver_data = 0 },
392392
{ HID_USB_DEVICE(USB_VENDOR_ID_APPLE,
393393
USB_DEVICE_ID_APPLE_MAGICTRACKPAD2_USBC), .driver_data = 0 },

0 commit comments

Comments
 (0)