sunxi-6.10: Add a lost patch adding spi1 cs1 pin for sun50i-h616

The-going · Aug 26, 2024 · 8775f35 · 8775f35
1 parent c54ab52
commit 8775f35
Show file tree

Hide file tree

Showing 5 changed files with 37 additions and 5 deletions.
diff --git a/patch/kernel/archive/sunxi-6.10/patches.armbian/Sound-for-H616-H618-Allwinner-SOCs.patch b/patch/kernel/archive/sunxi-6.10/patches.armbian/Sound-for-H616-H618-Allwinner-SOCs.patch
@@ -1,4 +1,4 @@
-From 22b7070a9a36cc54930ad1aed97efd1eb760ac46 Mon Sep 17 00:00:00 2001
+From 9677ae470f1f678dac3a74d16e71c7569d0f92be Mon Sep 17 00:00:00 2001
 From: Stephen Graf <[email protected]>
 Date: Thu, 9 May 2024 20:59:34 -0700
 Subject: Sound for H616, H618 Allwinner SOCs
@@ -76,10 +76,10 @@ index ce3dc6d9cd66..23553f2249c2 100644
  	status = "okay";
  };
 diff --git a/arch/arm64/boot/dts/allwinner/sun50i-h616.dtsi b/arch/arm64/boot/dts/allwinner/sun50i-h616.dtsi
-index ae0a08448459..9fe66173f9d8 100644
+index 3b956784ed50..726e8be2a02e 100644
 --- a/arch/arm64/boot/dts/allwinner/sun50i-h616.dtsi
 +++ b/arch/arm64/boot/dts/allwinner/sun50i-h616.dtsi
-@@ -459,6 +459,17 @@ gic: interrupt-controller@3021000 {
+@@ -465,6 +465,17 @@ gic: interrupt-controller@3021000 {
  			#interrupt-cells = <3>;
  		};
 
@@ -97,7 +97,7 @@ index ae0a08448459..9fe66173f9d8 100644
  		mmc0: mmc@4020000 {
  			compatible = "allwinner,sun50i-h616-mmc",
  				     "allwinner,sun50i-a100-mmc";
-@@ -787,6 +798,78 @@ mdio1: mdio {
+@@ -793,6 +804,78 @@ mdio1: mdio {
  			};
  		};
 

diff --git a/...rchive/sunxi-6.10/patches.armbian/arch-arm64-dts-allwinner-sun50i-h616-spi1-cs1-pin.patch b/...rchive/sunxi-6.10/patches.armbian/arch-arm64-dts-allwinner-sun50i-h616-spi1-cs1-pin.patch
@@ -0,0 +1,30 @@
+From 64c697ed9cacc3f3a7a19415eb1a14ae7aceb411 Mon Sep 17 00:00:00 2001
+From: Patrick Yavitz <[email protected]>
+Date: Wed, 6 Mar 2024 06:51:01 -0500
+Subject: arch: arm64: dts: allwinner: sun50i-h616: spi1 cs1 pin
+
+Signed-off-by: Patrick Yavitz <[email protected]>
+---
+ arch/arm64/boot/dts/allwinner/sun50i-h616.dtsi | 6 ++++++
+ 1 file changed, 6 insertions(+)
+
+diff --git a/arch/arm64/boot/dts/allwinner/sun50i-h616.dtsi b/arch/arm64/boot/dts/allwinner/sun50i-h616.dtsi
+index ae0a08448459..3b956784ed50 100644
+--- a/arch/arm64/boot/dts/allwinner/sun50i-h616.dtsi
++++ b/arch/arm64/boot/dts/allwinner/sun50i-h616.dtsi
+@@ -404,6 +404,12 @@ spi1_cs0_pin: spi1-cs0-pin {
+ 				function = "spi1";
+ 			};
+
++			/omit-if-no-ref/
++			spi1_cs1_pin: spi1-cs1-pin {
++				pins = "PH9";
++				function = "spi1";
++			};
++
+ 			spdif_tx_pin: spdif-tx-pin {
+ 				pins = "PH4";
+ 				function = "spdif";
+-- 
+2.35.3
+
diff --git a/...ve/sunxi-6.10/patches.armbian/arch-arm64-dts-allwinner-sun50i-h618-bananapi-m4-zero.patch b/...ve/sunxi-6.10/patches.armbian/arch-arm64-dts-allwinner-sun50i-h618-bananapi-m4-zero.patch
@@ -266,7 +266,7 @@ index 000000000000..fba5b39cc319
 +	status = "disabled";
 +	#address-cells = <1>;
 +	#size-cells = <0>;
-+	pinctrl-names = "default";
++	pinctrl-names = "default", "default";
 +	pinctrl-0 = <&spi1_pins>, <&spi1_cs1_pin>;
 +
 +	spidev@1 {

diff --git a/patch/kernel/archive/sunxi-6.10/series.armbian b/patch/kernel/archive/sunxi-6.10/series.armbian
@@ -165,6 +165,7 @@
 	patches.armbian/drivers-pwm-Add-pwm-sunxi-enhance-driver-for-h616.patch
 	patches.armbian/arm64-dts-sun50i-h618-orangepi-zero2w-Add-missing-nodes.patch
 	patches.armbian/arch-arm64-dts-allwinner-sun50i-h616-PG-12c-pins.patch
+	patches.armbian/arch-arm64-dts-allwinner-sun50i-h616-spi1-cs1-pin.patch
 	patches.armbian/add-dtb-overlay-for-zero2w.patch
 	patches.armbian/Sound-for-H616-H618-Allwinner-SOCs.patch
 	patches.armbian/ARM64-dts-sun50i-h616-BigTreeTech-CB1-Enable-HDMI.patch

diff --git a/patch/kernel/archive/sunxi-6.10/series.conf b/patch/kernel/archive/sunxi-6.10/series.conf
@@ -429,6 +429,7 @@
 	patches.armbian/drivers-pwm-Add-pwm-sunxi-enhance-driver-for-h616.patch
 	patches.armbian/arm64-dts-sun50i-h618-orangepi-zero2w-Add-missing-nodes.patch
 	patches.armbian/arch-arm64-dts-allwinner-sun50i-h616-PG-12c-pins.patch
+	patches.armbian/arch-arm64-dts-allwinner-sun50i-h616-spi1-cs1-pin.patch
 	patches.armbian/add-dtb-overlay-for-zero2w.patch
 	patches.armbian/Sound-for-H616-H618-Allwinner-SOCs.patch
 	patches.armbian/ARM64-dts-sun50i-h616-BigTreeTech-CB1-Enable-HDMI.patch