diff --git a/patch/kernel/archive/sunxi-6.18/0000.patching_config.yaml b/patch/kernel/archive/sunxi-6.18/0000.patching_config.yaml index 6c72685357..eaf992412f 100644 --- a/patch/kernel/archive/sunxi-6.18/0000.patching_config.yaml +++ b/patch/kernel/archive/sunxi-6.18/0000.patching_config.yaml @@ -10,8 +10,8 @@ config: # This is meant as a way to have overlays, bare, in a directory, without having to null-patch them in. # rpardini: SUNXI: sunxi has .patch's for overlays and their Makefile -- needs manual conversion to bare overlay_32 and overlay_64 dirs #overlay-directories: - # - { source: "overlay_32", target: "arch/arm/boot/dts/allwinner/overlay" } - # - { source: "overlay_64", target: "arch/arm64/boot/dts/allwinner/overlay" } + - { source: "overlay_32", target: "arch/arm/boot/dts/allwinner/overlay" } + - { source: "overlay_64", target: "arch/arm64/boot/dts/allwinner/overlay" } # the Makefile in each of these directories will be magically patched to include the dts files copied # or patched-in; overlay subdir will be included "-y" if it exists. diff --git a/patch/kernel/archive/sunxi-6.18/patches.armbian/arm-dts-overlay-Add-Overlays-for-sunxi.patch b/patch/kernel/archive/sunxi-6.18/patches.armbian/arm-dts-overlay-Add-Overlays-for-sunxi.patch index 0a00c6964f..f76b6656b8 100644 --- a/patch/kernel/archive/sunxi-6.18/patches.armbian/arm-dts-overlay-Add-Overlays-for-sunxi.patch +++ b/patch/kernel/archive/sunxi-6.18/patches.armbian/arm-dts-overlay-Add-Overlays-for-sunxi.patch @@ -4852,18 +4852,6 @@ index 000000000000..111111111111 + uart7_pi_pins = "/fragment@1/__overlay__:pinctrl-0:0"; + }; +}; -diff --git a/arch/arm/boot/dts/allwinner/Makefile b/arch/arm/boot/dts/allwinner/Makefile -index f71392a55df8..36fb1355c415 100644 ---- a/arch/arm/boot/dts/allwinner/Makefile -+++ b/arch/arm/boot/dts/allwinner/Makefile -@@ -279,5 +279,7 @@ dtb-$(CONFIG_MACH_SUN9I) += \ - sun9i-a80-cubieboard4.dtb - dtb-$(CONFIG_MACH_SUNIV) += \ - suniv-f1c100s-licheepi-nano.dtb \ - suniv-f1c200s-lctech-pi.dtb \ - suniv-f1c200s-popstick-v1.1.dtb -+ -+subdir-y := $(dts-dirs) overlay -- Armbian diff --git a/patch/kernel/archive/sunxi-6.18/patches.backports/10-Allwinner-A523-add-support-for-A523-THS0-1-controllers.patch b/patch/kernel/archive/sunxi-6.18/patches.backports/10-Allwinner-A523-add-support-for-A523-THS0-1-controllers.patch index 02149b031e..aab84c8013 100644 --- a/patch/kernel/archive/sunxi-6.18/patches.backports/10-Allwinner-A523-add-support-for-A523-THS0-1-controllers.patch +++ b/patch/kernel/archive/sunxi-6.18/patches.backports/10-Allwinner-A523-add-support-for-A523-THS0-1-controllers.patch @@ -1,7 +1,7 @@ From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Mikhail Kalashnikov Date: Fri, 7 Nov 2025 12:46:30 +0000 -Subject: [PATCH v3 1/6] dt-bindings: thermal: sun8i: Add A523 THS0/1 +Subject: dt-bindings: thermal: sun8i: Add A523 THS0/1 Add a binding for D1/T113s thermal sensor controller. Add dt-bindings description of the thermal sensors in the A523 processor.