enoch/armbian-build
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

meson64-6.16: rewrite/rebase patches vs v6.16.10

Browse Source
This commit is contained in:
Ricardo Pardini 2025-10-04 21:56:29 +02:00 committed by Igor
parent 245b9cfcfc
commit 69d36d8b87
3 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
patch/kernel/archive/meson64-6.16/board-khadas-vim3-add-npu-node.patch
View File

@ -1,14 +1,14 @@
From 4e44bc6b46bf3a0fc0de72755293a918467613fe Mon Sep 17 00:00:00 2001
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Hsun Lai <i@chainsx.cn>
Date: Mon, 29 Sep 2025 09:59:25 +0800
Subject: [PATCH] arm64: dts: amlogic: enable npu node for khadas vim3 (a311d)
Subject: arm64: dts: amlogic: enable npu node for khadas vim3 (a311d)
---
arch/arm64/boot/dts/amlogic/meson-g12b-a311d-khadas-vim3.dts | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/arch/arm64/boot/dts/amlogic/meson-g12b-a311d-khadas-vim3.dts b/arch/arm64/boot/dts/amlogic/meson-g12b-a311d-khadas-vim3.dts
index 124a80901..73f3d87dc 100644
index 111111111111..222222222222 100644
--- a/arch/arm64/boot/dts/amlogic/meson-g12b-a311d-khadas-vim3.dts
+++ b/arch/arm64/boot/dts/amlogic/meson-g12b-a311d-khadas-vim3.dts
@@ -15,6 +15,10 @@ / {
@ -23,5 +23,5 @@ index 124a80901..73f3d87dc 100644
* The VIM3 on-board MCU can mux the PCIe/USB3.0 shared differential
* lines using a FUSB340TMX USB 3.1 SuperSpeed Data Switch between
--
2.43.0
Armbian

4
patch/kernel/archive/meson64-6.16/general-input-touchscreen-Add-D-WAV-Multitouch.patch
View File

@ -16,7 +16,7 @@ diff --git a/drivers/hid/hid-ids.h b/drivers/hid/hid-ids.h
index 111111111111..222222222222 100644
--- a/drivers/hid/hid-ids.h
+++ b/drivers/hid/hid-ids.h
@@ -1532,4 +1532,10 @@
@@ -1536,4 +1536,10 @@
#define USB_VENDOR_ID_SMARTLINKTECHNOLOGY 0x4c4a
#define USB_DEVICE_ID_SMARTLINKTECHNOLOGY_4155 0x4155
@ -31,7 +31,7 @@ diff --git a/drivers/hid/hid-quirks.c b/drivers/hid/hid-quirks.c
index 111111111111..222222222222 100644
--- a/drivers/hid/hid-quirks.c
+++ b/drivers/hid/hid-quirks.c
@@ -908,6 +908,8 @@ static const struct hid_device_id hid_ignore_list[] = {
@@ -911,6 +911,8 @@ static const struct hid_device_id hid_ignore_list[] = {
{ HID_USB_DEVICE(USB_VENDOR_ID_YEALINK, USB_DEVICE_ID_YEALINK_P1K_P4K_B2K) },
{ HID_USB_DEVICE(USB_VENDOR_ID_QUANTA, USB_DEVICE_ID_QUANTA_HP_5MP_CAMERA_5473) },
{ HID_USB_DEVICE(USB_VENDOR_ID_SMARTLINKTECHNOLOGY, USB_DEVICE_ID_SMARTLINKTECHNOLOGY_4155) },

2
patch/kernel/archive/meson64-6.16/general-memory-marked-nomap.patch
View File

@ -17,7 +17,7 @@ diff --git a/drivers/of/of_reserved_mem.c b/drivers/of/of_reserved_mem.c
index 111111111111..222222222222 100644
--- a/drivers/of/of_reserved_mem.c
+++ b/drivers/of/of_reserved_mem.c
@@ -133,15 +133,6 @@ static int __init early_init_dt_reserve_memory(phys_addr_t base,
@@ -134,15 +134,6 @@ static int __init early_init_dt_reserve_memory(phys_addr_t base,
phys_addr_t size, bool nomap)
{
if (nomap) {