armbian/build
0
0
Fork 0
mirror of https://github.com/armbian/build.git synced 2026-01-06 09:58:46 -08:00
Code Issues Packages Projects Releases Wiki Activity

uefi-x86-6.19: update patches from t2linux 6.19 branch + rewrite

Browse Source 
- https://github.com/t2linux/linux-t2-patches/tree/6.19
  - except `1002-Put-apple-bce-in-drivers-staging.patch` where we had already diverged
  - except `7001-drm-i915-fbdev-Discard-BIOS-framebuffers-exceeding-h.patch` to keep attribution
- (don't) Apply suggestion from rabbit (loose quote) - rabbit was wrong
- rewritten against 6.19-rc3
This commit is contained in:
EvilOlaf
2025-12-16 05:53:46 +00:00
committed by Werner
parent 32ef352ad9
commit 5c5f5c1246
6 changed files with 15 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
patch/kernel/archive/uefi-x86-6.19/1002-Put-apple-bce-in-drivers-staging.patch
View File

@@ -18,7 +18,7 @@ diff --git a/drivers/staging/Kconfig b/drivers/staging/Kconfig
index 111111111111..222222222222 100644
--- a/drivers/staging/Kconfig
+++ b/drivers/staging/Kconfig
@@ -52,4 +52,6 @@ source "drivers/staging/gpib/Kconfig"
@@ -50,4 +50,6 @@ source "drivers/staging/vme_user/Kconfig"
source "drivers/staging/rtl8723cs/Kconfig"

2
patch/kernel/archive/uefi-x86-6.19/2008-i915-4-lane-quirk-for-mbp15-1.patch
View File

@@ -16,7 +16,7 @@ diff --git a/drivers/gpu/drm/i915/display/intel_ddi.c b/drivers/gpu/drm/i915/dis
index 111111111111..222222222222 100644
--- a/drivers/gpu/drm/i915/display/intel_ddi.c
+++ b/drivers/gpu/drm/i915/display/intel_ddi.c
@@ -4868,6 +4868,9 @@ static bool intel_ddi_a_force_4_lanes(struct intel_digital_port *dig_port)
@@ -4890,6 +4890,9 @@ static bool intel_ddi_a_force_4_lanes(struct intel_digital_port *dig_port)
if (dig_port->ddi_a_4_lanes)
return false;

2
patch/kernel/archive/uefi-x86-6.19/2009-apple-gmux-allow-switching-to-igpu-at-probe.patch
View File

@@ -21,7 +21,7 @@ diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c b/drivers/gpu/drm/amd/amdgp
index 111111111111..222222222222 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c
@@ -2322,6 +2322,9 @@ static int amdgpu_pci_probe(struct pci_dev *pdev,
@@ -2382,6 +2382,9 @@ static int amdgpu_pci_probe(struct pci_dev *pdev,
int ret, retry = 0, i;
bool supports_atomic = false;

18
patch/kernel/archive/uefi-x86-6.19/4001-asahi-trackpad.patch
View File

@@ -236,7 +236,7 @@ diff --git a/drivers/hid/hid-apple.c b/drivers/hid/hid-apple.c
index 111111111111..222222222222 100644
--- a/drivers/hid/hid-apple.c
+++ b/drivers/hid/hid-apple.c
@@ -517,6 +517,15 @@ static int hidinput_apple_event(struct hid_device *hid, struct input_dev *input,
@@ -518,6 +518,15 @@ static int hidinput_apple_event(struct hid_device *hid, struct input_dev *input,
table = macbookair_fn_keys;
else if (hid->product < 0x21d || hid->product >= 0x300)
table = powerbook_fn_keys;
@@ -252,7 +252,7 @@ index 111111111111..222222222222 100644
else
table = apple_fn_keys;
}
@@ -937,6 +946,10 @@ static int apple_probe(struct hid_device *hdev,
@@ -938,6 +947,10 @@ static int apple_probe(struct hid_device *hdev,
struct apple_sc *asc;
int ret;
@@ -263,7 +263,7 @@ index 111111111111..222222222222 100644
asc = devm_kzalloc(&hdev->dev, sizeof(*asc), GFP_KERNEL);
if (asc == NULL) {
hid_err(hdev, "can't alloc apple descriptor\n");
@@ -1215,6 +1228,8 @@ static const struct hid_device_id apple_devices[] = {
@@ -1216,6 +1229,8 @@ static const struct hid_device_id apple_devices[] = {
.driver_data = APPLE_HAS_FN | APPLE_ISO_TILDE_QUIRK | APPLE_RDESC_BATTERY },
{ HID_BLUETOOTH_DEVICE(BT_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_MAGIC_KEYBOARD_NUMPAD_2024),
.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
index 111111111111..222222222222 100644
--- a/drivers/hid/hid-apple.c
+++ b/drivers/hid/hid-apple.c
@@ -517,9 +517,10 @@ static int hidinput_apple_event(struct hid_device *hid, struct input_dev *input,
@@ -518,9 +518,10 @@ static int hidinput_apple_event(struct hid_device *hid, struct input_dev *input,
table = macbookair_fn_keys;
else if (hid->product < 0x21d || hid->product >= 0x300)
table = powerbook_fn_keys;
@@ -303,7 +303,7 @@ index 111111111111..222222222222 100644
table = macbookpro_dedicated_esc_fn_keys;
break;
default:
@@ -946,7 +947,7 @@ static int apple_probe(struct hid_device *hdev,
@@ -947,7 +948,7 @@ static int apple_probe(struct hid_device *hdev,
struct apple_sc *asc;
int ret;
@@ -312,7 +312,7 @@ index 111111111111..222222222222 100644
hdev->type != HID_TYPE_SPI_KEYBOARD)
return -ENODEV;
@@ -1230,6 +1231,8 @@ static const struct hid_device_id apple_devices[] = {
@@ -1231,6 +1232,8 @@ static const struct hid_device_id apple_devices[] = {
.driver_data = APPLE_HAS_FN | APPLE_ISO_TILDE_QUIRK },
{ HID_SPI_DEVICE(SPI_VENDOR_ID_APPLE, HID_ANY_ID),
.driver_data = APPLE_HAS_FN | APPLE_ISO_TILDE_QUIRK },
@@ -541,7 +541,7 @@ diff --git a/drivers/hid/Kconfig b/drivers/hid/Kconfig
index 111111111111..222222222222 100644
--- a/drivers/hid/Kconfig
+++ b/drivers/hid/Kconfig
@@ -726,11 +726,13 @@ config LOGIWHEELS_FF
@@ -727,11 +727,13 @@ config LOGIWHEELS_FF
config HID_MAGICMOUSE
tristate "Apple Magic Mouse/Trackpad multi-touch support"
@@ -1564,7 +1564,7 @@ diff --git a/drivers/hid/Kconfig b/drivers/hid/Kconfig
index 111111111111..222222222222 100644
--- a/drivers/hid/Kconfig
+++ b/drivers/hid/Kconfig
@@ -1447,4 +1447,6 @@ endif # HID
@@ -1450,4 +1450,6 @@ endif # HID
source "drivers/hid/usbhid/Kconfig"
@@ -3558,7 +3558,7 @@ diff --git a/drivers/hid/Kconfig b/drivers/hid/Kconfig
index 111111111111..222222222222 100644
--- a/drivers/hid/Kconfig
+++ b/drivers/hid/Kconfig
@@ -1449,4 +1449,6 @@ source "drivers/hid/usbhid/Kconfig"
@@ -1452,4 +1452,6 @@ source "drivers/hid/usbhid/Kconfig"
source "drivers/hid/spi-hid/Kconfig"

4
patch/kernel/archive/uefi-x86-6.19/4003-HID-apple-ignore-the-trackpad-on-T2-Macs.patch
View File

@@ -25,7 +25,7 @@ index 111111111111..222222222222 100644
#define APPLE_HAS_FN BIT(2)
/* BIT(3) reserved, was: APPLE_HIDDEV */
#define APPLE_ISO_TILDE_QUIRK BIT(4)
@@ -951,6 +951,9 @@ static int apple_probe(struct hid_device *hdev,
@@ -952,6 +952,9 @@ static int apple_probe(struct hid_device *hdev,
hdev->type != HID_TYPE_SPI_KEYBOARD)
return -ENODEV;
@@ -35,7 +35,7 @@ index 111111111111..222222222222 100644
asc = devm_kzalloc(&hdev->dev, sizeof(*asc), GFP_KERNEL);
if (asc == NULL) {
hid_err(hdev, "can't alloc apple descriptor\n");
@@ -1173,27 +1176,31 @@ static const struct hid_device_id apple_devices[] = {
@@ -1174,27 +1177,31 @@ static const struct hid_device_id apple_devices[] = {
{ HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_WELLSPRING9_JIS),
.driver_data = APPLE_HAS_FN | APPLE_RDESC_JIS },
{ HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_WELLSPRINGT2_J140K),

2
patch/kernel/archive/uefi-x86-6.19/7001-drm-i915-fbdev-Discard-BIOS-framebuffers-exceeding-h.patch
View File

@@ -15,7 +15,7 @@ diff --git a/drivers/gpu/drm/i915/display/intel_fbdev.c b/drivers/gpu/drm/i915/d
index 111111111111..222222222222 100644
--- a/drivers/gpu/drm/i915/display/intel_fbdev.c
+++ b/drivers/gpu/drm/i915/display/intel_fbdev.c
@@ -224,10 +224,10 @@ int intel_fbdev_driver_fbdev_probe(struct drm_fb_helper *helper,
@@ -278,10 +278,10 @@ int intel_fbdev_driver_fbdev_probe(struct drm_fb_helper *helper,
ifbdev->fb = NULL;
if (fb &&