sunxi-6.6: Remove unnecessary, move the checked ones to the armbian s…

…eries. Remove unnecessary patch fixes, and also move the time-tested patch to the armbian series as permanently supported.
armbian · Jan 19, 2025 · 8a56a46 · 8a56a46
1 parent 85d1fd1
commit 8a56a46
Show file tree

Hide file tree

Showing 9 changed files with 11 additions and 97 deletions.
diff --git a/...-ASAP-after-writing-new-instruction.patch → ...-ASAP-after-writing-new-instruction.patch b/...-ASAP-after-writing-new-instruction.patch → ...-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 <[email protected]>
 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 <[email protected]>
 
 Signed-off-by: The-going <[email protected]>
 ---
- 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/...el/archive/sunxi-6.6/patches.armbian/arm64-dts-sun50i-h5-orangepi-pc2-add-spi-flash.patch b/...el/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 <[email protected]>
 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/...rnel/archive/sunxi-6.6/patches.fixes/Fix-duplicate-nodes-for-sun50i-h5-orangepi-pc2.patch b/...rnel/archive/sunxi-6.6/patches.fixes/Fix-duplicate-nodes-for-sun50i-h5-orangepi-pc2.patch
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
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
@@ -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
@@ -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
@@ -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
@@ -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