From 8a56a468f66c03cbf170f6d83dfed0f0eb9145f4 Mon Sep 17 00:00:00 2001 From: The-going <48602507+The-going@users.noreply.github.com> Date: Fri, 17 Jan 2025 12:40:08 +0300 Subject: [PATCH] sunxi-6.6: Remove unnecessary, move the checked ones to the armbian series. Remove unnecessary patch fixes, and also move the time-tested patch to the armbian series as permanently supported. --- ...e-ASAP-after-writing-new-instruction.patch | 8 +-- ...sun50i-h5-orangepi-pc2-add-spi-flash.patch | 6 +-- ...ate-nodes-for-sun50i-h5-orangepi-pc2.patch | 53 ------------------- .../Fix-warning-multi-line-comment.patch | 25 --------- .../iio-af8133j-Add-support-for-buffer.patch | 2 +- .../iio-af8133j-Avoid-compiler-warning.patch | 2 +- patch/kernel/archive/sunxi-6.6/series.armbian | 1 + patch/kernel/archive/sunxi-6.6/series.conf | 4 +- patch/kernel/archive/sunxi-6.6/series.fixes | 7 --- 9 files changed, 11 insertions(+), 97 deletions(-) rename patch/kernel/archive/sunxi-6.6/{ => patches.armbian}/arm-patch-call-flush_icache-ASAP-after-writing-new-instruction.patch (93%) delete mode 100644 patch/kernel/archive/sunxi-6.6/patches.fixes/Fix-duplicate-nodes-for-sun50i-h5-orangepi-pc2.patch delete mode 100644 patch/kernel/archive/sunxi-6.6/patches.fixes/Fix-warning-multi-line-comment.patch delete mode 100644 patch/kernel/archive/sunxi-6.6/series.fixes diff --git a/patch/kernel/archive/sunxi-6.6/arm-patch-call-flush_icache-ASAP-after-writing-new-instruction.patch b/patch/kernel/archive/sunxi-6.6/patches.armbian/arm-patch-call-flush_icache-ASAP-after-writing-new-instruction.patch similarity index 93% rename from patch/kernel/archive/sunxi-6.6/arm-patch-call-flush_icache-ASAP-after-writing-new-instruction.patch rename to patch/kernel/archive/sunxi-6.6/patches.armbian/arm-patch-call-flush_icache-ASAP-after-writing-new-instruction.patch index 2c2e4563bdfa..11721e8ac561 100644 --- a/patch/kernel/archive/sunxi-6.6/arm-patch-call-flush_icache-ASAP-after-writing-new-instruction.patch +++ b/patch/kernel/archive/sunxi-6.6/patches.armbian/arm-patch-call-flush_icache-ASAP-after-writing-new-instruction.patch @@ -1,4 +1,4 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From f7ef1ab68c625799d17ab02f4fb392b24eeab1b4 Mon Sep 17 00:00:00 2001 From: Mikhail Iakhiaev Date: Mon, 29 Jul 2024 09:50:36 -0700 Subject: arm/patch: call flush_icache ASAP after writing new instruction. @@ -28,11 +28,11 @@ Signed-off-by: Mikhail Iakhiaev Signed-off-by: The-going <48602507+The-going@users.noreply.github.com> --- - arch/arm/kernel/patch.c | 12 +++++++--- + arch/arm/kernel/patch.c | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/arch/arm/kernel/patch.c b/arch/arm/kernel/patch.c -index 111111111111..222222222222 100644 +index e9e828b6bb30..f003867f085a 100644 --- a/arch/arm/kernel/patch.c +++ b/arch/arm/kernel/patch.c @@ -99,13 +99,19 @@ void __kprobes __patch_text_real(void *addr, unsigned int insn, bool remap) @@ -59,5 +59,5 @@ index 111111111111..222222222222 100644 static int __kprobes patch_text_stop_machine(void *data) -- -Armbian +2.35.3 diff --git a/patch/kernel/archive/sunxi-6.6/patches.armbian/arm64-dts-sun50i-h5-orangepi-pc2-add-spi-flash.patch b/patch/kernel/archive/sunxi-6.6/patches.armbian/arm64-dts-sun50i-h5-orangepi-pc2-add-spi-flash.patch index d2dde0d47f6e..5d89cf77e3f5 100644 --- a/patch/kernel/archive/sunxi-6.6/patches.armbian/arm64-dts-sun50i-h5-orangepi-pc2-add-spi-flash.patch +++ b/patch/kernel/archive/sunxi-6.6/patches.armbian/arm64-dts-sun50i-h5-orangepi-pc2-add-spi-flash.patch @@ -1,4 +1,4 @@ -From 4a1e00925b0f7c5fe3660c1df163f2b00db66fb1 Mon Sep 17 00:00:00 2001 +From ef7d577006c5d356373aac906bd6b170d97dfa1b Mon Sep 17 00:00:00 2001 From: The-going <48602507+The-going@users.noreply.github.com> Date: Mon, 24 Jan 2022 19:27:52 +0300 Subject: arm64:dts: sun50i-h5-orangepi-pc2 add spi flash @@ -8,10 +8,10 @@ Subject: arm64:dts: sun50i-h5-orangepi-pc2 add spi flash 1 file changed, 19 insertions(+), 6 deletions(-) diff --git a/arch/arm64/boot/dts/allwinner/sun50i-h5-orangepi-pc2.dts b/arch/arm64/boot/dts/allwinner/sun50i-h5-orangepi-pc2.dts -index df4d1ceea75e..880f9de8d22f 100644 +index 460c0e3d2f97..c756b1a58c90 100644 --- a/arch/arm64/boot/dts/allwinner/sun50i-h5-orangepi-pc2.dts +++ b/arch/arm64/boot/dts/allwinner/sun50i-h5-orangepi-pc2.dts -@@ -178,15 +178,28 @@ &sound_hdmi { +@@ -198,15 +198,28 @@ &sound_hdmi { status = "okay"; }; diff --git a/patch/kernel/archive/sunxi-6.6/patches.fixes/Fix-duplicate-nodes-for-sun50i-h5-orangepi-pc2.patch b/patch/kernel/archive/sunxi-6.6/patches.fixes/Fix-duplicate-nodes-for-sun50i-h5-orangepi-pc2.patch deleted file mode 100644 index 85b1d33d7023..000000000000 --- a/patch/kernel/archive/sunxi-6.6/patches.fixes/Fix-duplicate-nodes-for-sun50i-h5-orangepi-pc2.patch +++ /dev/null @@ -1,53 +0,0 @@ -From 4e5f77ba9fa8eb8483f736a65916a22efb9aeec9 Mon Sep 17 00:00:00 2001 -From: The-going <48602507+The-going@users.noreply.github.com> -Date: Sun, 29 May 2022 23:02:24 +0300 -Subject: Fix duplicate nodes for sun50i-h5-orangepi-pc2 - -The problem with duplicate nodes in the device tree is that -the first one in the queue will be applied. The subsequent -one will be ignored, not replaced. ---- - .../dts/allwinner/sun50i-h5-orangepi-pc2.dts | 20 ------------------- - 1 file changed, 20 deletions(-) - -diff --git a/arch/arm64/boot/dts/allwinner/sun50i-h5-orangepi-pc2.dts b/arch/arm64/boot/dts/allwinner/sun50i-h5-orangepi-pc2.dts -index 460c0e3d2f97..df4d1ceea75e 100644 ---- a/arch/arm64/boot/dts/allwinner/sun50i-h5-orangepi-pc2.dts -+++ b/arch/arm64/boot/dts/allwinner/sun50i-h5-orangepi-pc2.dts -@@ -95,10 +95,6 @@ &codec { - status = "okay"; - }; - --&cpu0 { -- cpu-supply = <®_vdd_cpux>; --}; -- - &de { - status = "okay"; - }; -@@ -178,22 +174,6 @@ &ohci3 { - status = "okay"; - }; - --&r_i2c { -- status = "okay"; -- -- reg_vdd_cpux: regulator@65 { -- compatible = "silergy,sy8106a"; -- reg = <0x65>; -- regulator-name = "vdd-cpux"; -- silergy,fixed-microvolt = <1100000>; -- regulator-min-microvolt = <1000000>; -- regulator-max-microvolt = <1400000>; -- regulator-ramp-delay = <200>; -- regulator-boot-on; -- regulator-always-on; -- }; --}; -- - &sound_hdmi { - status = "okay"; - }; --- -2.35.3 - diff --git a/patch/kernel/archive/sunxi-6.6/patches.fixes/Fix-warning-multi-line-comment.patch b/patch/kernel/archive/sunxi-6.6/patches.fixes/Fix-warning-multi-line-comment.patch deleted file mode 100644 index ab81cc72a104..000000000000 --- a/patch/kernel/archive/sunxi-6.6/patches.fixes/Fix-warning-multi-line-comment.patch +++ /dev/null @@ -1,25 +0,0 @@ -From 1f1e7b16476f0ed9e9237074426a8c545acd462a Mon Sep 17 00:00:00 2001 -From: The-going <48602507+The-going@users.noreply.github.com> -Date: Fri, 16 Dec 2022 16:46:31 +0300 -Subject: Fix: warning: multi-line comment - ---- - drivers/iio/magnetometer/af8133j.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/drivers/iio/magnetometer/af8133j.c b/drivers/iio/magnetometer/af8133j.c -index 21380c8b11f5..f40820ecab0f 100644 ---- a/drivers/iio/magnetometer/af8133j.c -+++ b/drivers/iio/magnetometer/af8133j.c -@@ -79,7 +79,7 @@ static const struct iio_chan_spec_ext_info af8133j_ext_info[] = { - { } - }; - --// .info_mask_shared_by_type = , \ -+/* .info_mask_shared_by_type = , \*/ - - #define AF8133J_CHANNEL(_axis) { \ - .type = IIO_MAGN, \ --- -2.35.3 - diff --git a/patch/kernel/archive/sunxi-6.6/patches.megous/iio-af8133j-Add-support-for-buffer.patch b/patch/kernel/archive/sunxi-6.6/patches.megous/iio-af8133j-Add-support-for-buffer.patch index 1843f18a7eed..ed17e6c46613 100644 --- a/patch/kernel/archive/sunxi-6.6/patches.megous/iio-af8133j-Add-support-for-buffer.patch +++ b/patch/kernel/archive/sunxi-6.6/patches.megous/iio-af8133j-Add-support-for-buffer.patch @@ -28,7 +28,7 @@ index 5b84859a85ea..24656f006ac0 100644 { } }; -+// .info_mask_shared_by_type = , \ ++/* .info_mask_shared_by_type = , \*/ + #define AF8133J_CHANNEL(_axis) { \ .type = IIO_MAGN, \ diff --git a/patch/kernel/archive/sunxi-6.6/patches.megous/iio-af8133j-Avoid-compiler-warning.patch b/patch/kernel/archive/sunxi-6.6/patches.megous/iio-af8133j-Avoid-compiler-warning.patch index f9b8de3e6529..d6abb968c4d6 100644 --- a/patch/kernel/archive/sunxi-6.6/patches.megous/iio-af8133j-Avoid-compiler-warning.patch +++ b/patch/kernel/archive/sunxi-6.6/patches.megous/iio-af8133j-Avoid-compiler-warning.patch @@ -17,7 +17,7 @@ index 24656f006ac0..21380c8b11f5 100644 static void af8133j_power_down(struct af8133j_data *data) { - struct device *dev = &data->client->dev; -+// struct device *dev = &data->client->dev; ++/* struct device *dev = &data->client->dev; */ if (!data->powered) return; diff --git a/patch/kernel/archive/sunxi-6.6/series.armbian b/patch/kernel/archive/sunxi-6.6/series.armbian index 50eed2f0f462..df7bd1030a89 100644 --- a/patch/kernel/archive/sunxi-6.6/series.armbian +++ b/patch/kernel/archive/sunxi-6.6/series.armbian @@ -4,6 +4,7 @@ # https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable.git # patches.armbian/Doc-dt-bindings-usb-add-binding-for-DWC3-controller-on-Allwinne.patch + patches.armbian/arm-patch-call-flush_icache-ASAP-after-writing-new-instruction.patch patches.armbian/drv-pinctrl-pinctrl-sun50i-a64-disable_strict_mode.patch patches.armbian/drv-rtc-sun6i-support-RTCs-without-external-LOSCs.patch patches.armbian/drv-gpu-drm-gem-dma-Export-with-handle-allocator.patch diff --git a/patch/kernel/archive/sunxi-6.6/series.conf b/patch/kernel/archive/sunxi-6.6/series.conf index 8fb926e90c31..b60b1a2725fd 100644 --- a/patch/kernel/archive/sunxi-6.6/series.conf +++ b/patch/kernel/archive/sunxi-6.6/series.conf @@ -247,15 +247,13 @@ patches.megous/ARM-dts-sun8i-a83t-Improve-CPU-OPP-tables-go-up-to-1.8GHz.patch patches.megous/cpufreq-sun50i-Show-detected-CPU-bin-for-easier-debugging.patch - patches.fixes/Fix-warning-multi-line-comment.patch - patches.fixes/Fix-duplicate-nodes-for-sun50i-h5-orangepi-pc2.patch - ################################################################################ # # Armbian patches # ################################################################################ patches.armbian/Doc-dt-bindings-usb-add-binding-for-DWC3-controller-on-Allwinne.patch + patches.armbian/arm-patch-call-flush_icache-ASAP-after-writing-new-instruction.patch patches.armbian/drv-pinctrl-pinctrl-sun50i-a64-disable_strict_mode.patch patches.armbian/drv-rtc-sun6i-support-RTCs-without-external-LOSCs.patch patches.armbian/drv-gpu-drm-gem-dma-Export-with-handle-allocator.patch diff --git a/patch/kernel/archive/sunxi-6.6/series.fixes b/patch/kernel/archive/sunxi-6.6/series.fixes deleted file mode 100644 index 6b2177a08060..000000000000 --- a/patch/kernel/archive/sunxi-6.6/series.fixes +++ /dev/null @@ -1,7 +0,0 @@ -# -# Automatically generated by the script mk_format_patch -# -# git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable.git -# - patches.fixes/Fix-warning-multi-line-comment.patch - patches.fixes/Fix-duplicate-nodes-for-sun50i-h5-orangepi-pc2.patch