diff --git a/patch/kernel/archive/meson64-6.12/board-khadas-vim3-add-npu-node.patch b/patch/kernel/archive/meson64-6.12/board-khadas-vim3-add-npu-node.patch index df48ee1363..b2c8512a8a 100644 --- a/patch/kernel/archive/meson64-6.12/board-khadas-vim3-add-npu-node.patch +++ b/patch/kernel/archive/meson64-6.12/board-khadas-vim3-add-npu-node.patch @@ -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 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 diff --git a/patch/kernel/archive/meson64-6.12/board-odroid-sm1-reset.patch b/patch/kernel/archive/meson64-6.12/board-odroid-sm1-reset.patch index 30a16a6aa2..6d388392ef 100644 --- a/patch/kernel/archive/meson64-6.12/board-odroid-sm1-reset.patch +++ b/patch/kernel/archive/meson64-6.12/board-odroid-sm1-reset.patch @@ -1,7 +1,7 @@ -From c32d87bcbabb6a22624964c3dce7aabf0467de92 Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Patrick Yavitz Date: Sun, 2 Mar 2025 09:02:09 -0500 -Subject: [PATCH] board odroid sm1 reset +Subject: board odroid sm1 reset Add reset and power down support for both ODROID SM1 units. @@ -12,7 +12,7 @@ Signed-off-by: Patrick Yavitz 1 file changed, 10 insertions(+) diff --git a/arch/arm64/boot/dts/amlogic/meson-sm1-odroid.dtsi b/arch/arm64/boot/dts/amlogic/meson-sm1-odroid.dtsi -index 7b0e9817a615..104389b4874e 100644 +index 111111111111..222222222222 100644 --- a/arch/arm64/boot/dts/amlogic/meson-sm1-odroid.dtsi +++ b/arch/arm64/boot/dts/amlogic/meson-sm1-odroid.dtsi @@ -23,6 +23,16 @@ memory@0 { @@ -33,5 +33,5 @@ index 7b0e9817a615..104389b4874e 100644 compatible = "mmc-pwrseq-emmc"; reset-gpios = <&gpio BOOT_12 GPIO_ACTIVE_LOW>; -- -2.39.5 +Armbian diff --git a/patch/kernel/archive/meson64-6.12/board-odroidc2-usb-hub-disable-autosuspend-for-Genesys-Logic-.patch b/patch/kernel/archive/meson64-6.12/board-odroidc2-usb-hub-disable-autosuspend-for-Genesys-Logic-.patch index c6517fd6f6..3f0e7f65b4 100644 --- a/patch/kernel/archive/meson64-6.12/board-odroidc2-usb-hub-disable-autosuspend-for-Genesys-Logic-.patch +++ b/patch/kernel/archive/meson64-6.12/board-odroidc2-usb-hub-disable-autosuspend-for-Genesys-Logic-.patch @@ -19,7 +19,7 @@ diff --git a/drivers/usb/core/hub.c b/drivers/usb/core/hub.c index 111111111111..222222222222 100644 --- a/drivers/usb/core/hub.c +++ b/drivers/usb/core/hub.c -@@ -5967,7 +5967,7 @@ static const struct usb_device_id hub_id_table[] = { +@@ -6012,7 +6012,7 @@ static const struct usb_device_id hub_id_table[] = { | USB_DEVICE_ID_MATCH_INT_CLASS, .idVendor = USB_VENDOR_GENESYS_LOGIC, .bInterfaceClass = USB_CLASS_HUB, diff --git a/patch/kernel/archive/meson64-6.12/board-t95z-add-rc-remote-keymap.patch b/patch/kernel/archive/meson64-6.12/board-t95z-add-rc-remote-keymap.patch index 2111c56976..f9fe2849e9 100644 --- a/patch/kernel/archive/meson64-6.12/board-t95z-add-rc-remote-keymap.patch +++ b/patch/kernel/archive/meson64-6.12/board-t95z-add-rc-remote-keymap.patch @@ -34,7 +34,7 @@ diff --git a/Documentation/devicetree/bindings/vendor-prefixes.yaml b/Documentat index 111111111111..222222222222 100644 --- a/Documentation/devicetree/bindings/vendor-prefixes.yaml +++ b/Documentation/devicetree/bindings/vendor-prefixes.yaml -@@ -1437,6 +1437,8 @@ patternProperties: +@@ -1441,6 +1441,8 @@ patternProperties: description: Sundance DSP Inc. "^sunplus,.*": description: Sunplus Technology Co., Ltd. diff --git a/patch/kernel/archive/meson64-6.12/general-gpu-drm-add-new-display-resolution-2560x1440.patch b/patch/kernel/archive/meson64-6.12/general-gpu-drm-add-new-display-resolution-2560x1440.patch index 58d2d16889..f949ac6740 100644 --- a/patch/kernel/archive/meson64-6.12/general-gpu-drm-add-new-display-resolution-2560x1440.patch +++ b/patch/kernel/archive/meson64-6.12/general-gpu-drm-add-new-display-resolution-2560x1440.patch @@ -43,7 +43,7 @@ index 111111111111..222222222222 100644 { /* sentinel */ }, }; -@@ -873,6 +887,10 @@ static void meson_vclk_set(struct meson_drm *priv, unsigned int pll_base_freq, +@@ -894,6 +908,10 @@ static void meson_vclk_set(struct meson_drm *priv, m = 0xf7; frac = vic_alternate_clock ? 0x8148 : 0x10000; break; diff --git a/patch/kernel/archive/meson64-6.12/general-input-touchscreen-Add-D-WAV-Multitouch.patch b/patch/kernel/archive/meson64-6.12/general-input-touchscreen-Add-D-WAV-Multitouch.patch index 0378125cdc..db2cb7bc8a 100644 --- a/patch/kernel/archive/meson64-6.12/general-input-touchscreen-Add-D-WAV-Multitouch.patch +++ b/patch/kernel/archive/meson64-6.12/general-input-touchscreen-Add-D-WAV-Multitouch.patch @@ -6,19 +6,19 @@ Subject: ODROID-COMMON: input/touchscreen: Add D-WAV Multitouch driver. Change-Id: Ia1c8c29d3f69c6ba5d630279c4cc98119b68ab71 --- drivers/hid/hid-ids.h | 6 + - drivers/hid/hid-quirks.c | 3 + + drivers/hid/hid-quirks.c | 2 + drivers/input/touchscreen/Kconfig | 10 + drivers/input/touchscreen/Makefile | 1 + drivers/input/touchscreen/dwav-usb-mt.c | 554 ++++++++++ - 5 files changed, 574 insertions(+) + 5 files changed, 573 insertions(+) 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 -@@ -1475,4 +1475,10 @@ - #define USB_VENDOR_ID_SIGNOTEC 0x2133 - #define USB_DEVICE_ID_SIGNOTEC_VIEWSONIC_PD1011 0x0018 +@@ -1531,4 +1531,10 @@ + #define USB_VENDOR_ID_JIELI_SDK_DEFAULT 0x4c4a + #define USB_DEVICE_ID_JIELI_SDK_4155 0x4155 +#define USB_DEVICE_ID_DWAV_MULTITOUCH 0x0005 + @@ -28,22 +28,18 @@ index 111111111111..222222222222 100644 + #endif diff --git a/drivers/hid/hid-quirks.c b/drivers/hid/hid-quirks.c -index 80372342c..92472ae7b 100644 +index 111111111111..222222222222 100644 --- a/drivers/hid/hid-quirks.c +++ b/drivers/hid/hid-quirks.c -@@ -895,10 +895,12 @@ static const struct hid_device_id hid_ignore_list[] = { - { HID_USB_DEVICE(USB_VENDOR_ID_SYNAPTICS, USB_DEVICE_ID_SYNAPTICS_DPAD) }, +@@ -900,6 +900,8 @@ static const struct hid_device_id hid_ignore_list[] = { #endif { 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) }, + { HID_USB_DEVICE(USB_VENDOR_ID_ODROID, USB_DEVICE_ID_VU5) }, + { HID_USB_DEVICE(USB_VENDOR_ID_ODROID, USB_DEVICE_ID_VU7PLUS) }, { } }; - /* - * hid_mouse_ignore_list - mouse devices which should not be handled by the hid layer diff --git a/drivers/input/touchscreen/Kconfig b/drivers/input/touchscreen/Kconfig index 111111111111..222222222222 100644 --- a/drivers/input/touchscreen/Kconfig diff --git a/patch/kernel/archive/meson64-6.12/general-memory-marked-nomap.patch b/patch/kernel/archive/meson64-6.12/general-memory-marked-nomap.patch index dc73294033..6d7aa17f48 100644 --- a/patch/kernel/archive/meson64-6.12/general-memory-marked-nomap.patch +++ b/patch/kernel/archive/meson64-6.12/general-memory-marked-nomap.patch @@ -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 -@@ -82,15 +82,6 @@ static int __init early_init_dt_reserve_memory(phys_addr_t base, +@@ -87,15 +87,6 @@ static int __init early_init_dt_reserve_memory(phys_addr_t base, phys_addr_t size, bool nomap) { if (nomap) { diff --git a/patch/kernel/archive/meson64-6.12/general-usb-core-improve-handling-of-hubs-with-no-ports.patch b/patch/kernel/archive/meson64-6.12/general-usb-core-improve-handling-of-hubs-with-no-ports.patch index 9b12a4079d..259830dbd3 100644 --- a/patch/kernel/archive/meson64-6.12/general-usb-core-improve-handling-of-hubs-with-no-ports.patch +++ b/patch/kernel/archive/meson64-6.12/general-usb-core-improve-handling-of-hubs-with-no-ports.patch @@ -36,7 +36,7 @@ diff --git a/drivers/usb/core/hub.c b/drivers/usb/core/hub.c index 111111111111..222222222222 100644 --- a/drivers/usb/core/hub.c +++ b/drivers/usb/core/hub.c -@@ -1475,9 +1475,8 @@ static int hub_configure(struct usb_hub *hub, +@@ -1502,9 +1502,8 @@ static int hub_configure(struct usb_hub *hub, ret = -ENODEV; goto fail; } else if (hub->descriptor->bNbrPorts == 0) { diff --git a/patch/kernel/archive/meson64-6.12/hwmon-emc2305-fixups-for-driver.patch b/patch/kernel/archive/meson64-6.12/hwmon-emc2305-fixups-for-driver.patch index 14cbdd5003..54d741724e 100644 --- a/patch/kernel/archive/meson64-6.12/hwmon-emc2305-fixups-for-driver.patch +++ b/patch/kernel/archive/meson64-6.12/hwmon-emc2305-fixups-for-driver.patch @@ -152,7 +152,7 @@ index 111111111111..222222222222 100644 if (IS_ERR(data->cdev_data[cdev_idx].cdev)) { dev_err(dev, "Failed to register cooling device %s\n", emc2305_fan_name[idx]); -@@ -347,9 +411,11 @@ static void emc2305_unset_tz(struct device *dev) +@@ -353,9 +417,11 @@ static void emc2305_unset_tz(struct device *dev) int i; /* Unregister cooling device. */ @@ -167,7 +167,7 @@ index 111111111111..222222222222 100644 } static umode_t -@@ -571,11 +637,18 @@ static int emc2305_probe(struct i2c_client *client) +@@ -577,11 +643,18 @@ static int emc2305_probe(struct i2c_client *client) data->pwm_separate = pdata->pwm_separate; for (i = 0; i < EMC2305_PWM_MAX; i++) data->pwm_min[i] = pdata->pwm_min[i]; @@ -186,7 +186,7 @@ index 111111111111..222222222222 100644 } data->hwmon_dev = devm_hwmon_device_register_with_info(dev, "emc2305", data, -@@ -596,6 +669,12 @@ static int emc2305_probe(struct i2c_client *client) +@@ -602,6 +675,12 @@ static int emc2305_probe(struct i2c_client *client) return ret; } @@ -199,7 +199,7 @@ index 111111111111..222222222222 100644 return 0; } -@@ -610,6 +689,7 @@ static void emc2305_remove(struct i2c_client *client) +@@ -616,6 +695,7 @@ static void emc2305_remove(struct i2c_client *client) static struct i2c_driver emc2305_driver = { .driver = { .name = "emc2305", diff --git a/patch/kernel/archive/meson64-6.12/meson-g12b-pinctrl-Add-missing-pinmux-for-pwm.patch b/patch/kernel/archive/meson64-6.12/meson-g12b-pinctrl-Add-missing-pinmux-for-pwm.patch index 9c88f042cc..cfee3a6b6d 100644 --- a/patch/kernel/archive/meson64-6.12/meson-g12b-pinctrl-Add-missing-pinmux-for-pwm.patch +++ b/patch/kernel/archive/meson64-6.12/meson-g12b-pinctrl-Add-missing-pinmux-for-pwm.patch @@ -1,7 +1,7 @@ -From e1e66c32b7a9ce7cf52922fe073c4bff40054599 Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Yuntian Zhang Date: Thu, 13 Jan 2022 21:34:10 +0800 -Subject: [PATCH] pinctrl: meson: Add several missing pinmux for pwm functions +Subject: pinctrl: meson: Add several missing pinmux for pwm functions The following pin definitions are mentioned in A311D Quick Reference Manual and S922X Public Datasheet, but not in S905Y2 @@ -11,12 +11,12 @@ They are currently exposed in Radxa Zero 2's GPIO header. Signed-off-by: Yuntian Zhang --- - arch/arm64/boot/dts/amlogic/meson-g12b.dtsi | 42 +++++++++++++++++++++ - drivers/pinctrl/meson/pinctrl-meson-g12a.c | 16 ++++++-- + arch/arm64/boot/dts/amlogic/meson-g12b.dtsi | 42 ++++++++++ + drivers/pinctrl/meson/pinctrl-meson-g12a.c | 16 +++- 2 files changed, 55 insertions(+), 3 deletions(-) diff --git a/arch/arm64/boot/dts/amlogic/meson-g12b.dtsi b/arch/arm64/boot/dts/amlogic/meson-g12b.dtsi -index 86e6ceb31..b2f9a09b2 100644 +index 111111111111..222222222222 100644 --- a/arch/arm64/boot/dts/amlogic/meson-g12b.dtsi +++ b/arch/arm64/boot/dts/amlogic/meson-g12b.dtsi @@ -149,3 +149,45 @@ &pmu { @@ -66,10 +66,10 @@ index 86e6ceb31..b2f9a09b2 100644 + }; +}; diff --git a/drivers/pinctrl/meson/pinctrl-meson-g12a.c b/drivers/pinctrl/meson/pinctrl-meson-g12a.c -index e2788bfc5..c94360afc 100644 +index 111111111111..222222222222 100644 --- a/drivers/pinctrl/meson/pinctrl-meson-g12a.c +++ b/drivers/pinctrl/meson/pinctrl-meson-g12a.c -@@ -268,17 +268,22 @@ static const unsigned int eth_act_led_pins[] = { GPIOZ_15 }; +@@ -271,17 +271,22 @@ static const unsigned int eth_act_led_pins[] = { GPIOZ_15 }; static const unsigned int pwm_a_pins[] = { GPIOX_6 }; /* pwm_b */ @@ -92,7 +92,7 @@ index e2788bfc5..c94360afc 100644 /* pwm_e */ static const unsigned int pwm_e_pins[] = { GPIOX_16 }; -@@ -591,6 +596,10 @@ static const struct meson_pmx_group meson_g12a_periphs_groups[] = { +@@ -594,6 +599,10 @@ static const struct meson_pmx_group meson_g12a_periphs_groups[] = { GROUP(bt565_a_din5, 2), GROUP(bt565_a_din6, 2), GROUP(bt565_a_din7, 2), @@ -103,7 +103,7 @@ index e2788bfc5..c94360afc 100644 GROUP(tsin_b_valid_z, 3), GROUP(tsin_b_sop_z, 3), GROUP(tsin_b_din0_z, 3), -@@ -723,6 +732,7 @@ static const struct meson_pmx_group meson_g12a_periphs_groups[] = { +@@ -726,6 +735,7 @@ static const struct meson_pmx_group meson_g12a_periphs_groups[] = { GROUP(uart_c_rts, 2), GROUP(iso7816_clk_h, 1), GROUP(iso7816_data_h, 1), @@ -111,7 +111,7 @@ index e2788bfc5..c94360afc 100644 GROUP(pwm_f_h, 4), GROUP(cec_ao_a_h, 4), GROUP(cec_ao_b_h, 5), -@@ -1058,15 +1068,15 @@ static const char * const pwm_a_groups[] = { +@@ -1066,15 +1076,15 @@ static const char * const pwm_a_groups[] = { }; static const char * const pwm_b_groups[] = { @@ -131,5 +131,5 @@ index e2788bfc5..c94360afc 100644 static const char * const pwm_e_groups[] = { -- -2.49.0 +Armbian