Reorganize dtsi patches with upstream version and drop dtsi in 5.15 files. Also add an additional upstream patch for hwspinlock support. Refresh all the dts with needed changes. Signed-off-by: Christian Marangi <ansuelsmth@gmail.com>
		
			
				
	
	
		
			102 lines
		
	
	
		
			2.5 KiB
		
	
	
	
		
			Diff
		
	
	
	
	
	
			
		
		
	
	
			102 lines
		
	
	
		
			2.5 KiB
		
	
	
	
		
			Diff
		
	
	
	
	
	
From 4af1defb305798d1a064a5ea0d0c9b30e5eee185 Mon Sep 17 00:00:00 2001
 | 
						|
From: Christian Marangi <ansuelsmth@gmail.com>
 | 
						|
Date: Thu, 7 Jul 2022 03:09:35 +0200
 | 
						|
Subject: [PATCH 1/8] ARM: dts: qcom: ipq8064: add multiple missing pin
 | 
						|
 definition
 | 
						|
 | 
						|
Add missing definition for mdio0 pins used for gpio-bitbang driver,i2c4
 | 
						|
pins and rgmii2 pins for ipq8064.
 | 
						|
 | 
						|
Drop i2c4_pins node from ipq8064-ap148 dts as it's now moved to ipq8064
 | 
						|
dtsi.
 | 
						|
 | 
						|
Drop mdio0_pins node from ipq8064-rb3011 dts as it's now moved to
 | 
						|
ipq8064 dtsi.
 | 
						|
 | 
						|
Signed-off-by: Christian Marangi <ansuelsmth@gmail.com>
 | 
						|
Tested-by: Jonathan McDowell <noodles@earth.li>
 | 
						|
Signed-off-by: Bjorn Andersson <bjorn.andersson@linaro.org>
 | 
						|
Link: https://lore.kernel.org/r/20220707010943.20857-2-ansuelsmth@gmail.com
 | 
						|
---
 | 
						|
 arch/arm/boot/dts/qcom-ipq8064-ap148.dts  |  6 -----
 | 
						|
 arch/arm/boot/dts/qcom-ipq8064-rb3011.dts |  9 -------
 | 
						|
 arch/arm/boot/dts/qcom-ipq8064.dtsi       | 32 +++++++++++++++++++++++
 | 
						|
 3 files changed, 32 insertions(+), 15 deletions(-)
 | 
						|
 | 
						|
--- a/arch/arm/boot/dts/qcom-ipq8064-rb3011.dts
 | 
						|
+++ b/arch/arm/boot/dts/qcom-ipq8064-rb3011.dts
 | 
						|
@@ -305,15 +305,6 @@
 | 
						|
 		};
 | 
						|
 	};
 | 
						|
 
 | 
						|
-	mdio0_pins: mdio0_pins {
 | 
						|
-		mux {
 | 
						|
-			pins = "gpio0", "gpio1";
 | 
						|
-			function = "gpio";
 | 
						|
-			drive-strength = <8>;
 | 
						|
-			bias-disable;
 | 
						|
-		};
 | 
						|
-	};
 | 
						|
-
 | 
						|
 	mdio1_pins: mdio1_pins {
 | 
						|
 		mux {
 | 
						|
 			pins = "gpio10", "gpio11";
 | 
						|
--- a/arch/arm/boot/dts/qcom-ipq8064.dtsi
 | 
						|
+++ b/arch/arm/boot/dts/qcom-ipq8064.dtsi
 | 
						|
@@ -382,6 +382,13 @@
 | 
						|
 				};
 | 
						|
 			};
 | 
						|
 
 | 
						|
+			i2c4_pins: i2c4-default {
 | 
						|
+				pins = "gpio12", "gpio13";
 | 
						|
+				function = "gsbi4";
 | 
						|
+				drive-strength = <12>;
 | 
						|
+				bias-disable;
 | 
						|
+			};
 | 
						|
+
 | 
						|
 			spi_pins: spi_pins {
 | 
						|
 				mux {
 | 
						|
 					pins = "gpio18", "gpio19", "gpio21";
 | 
						|
@@ -424,6 +431,8 @@
 | 
						|
 
 | 
						|
 				pullups {
 | 
						|
 					pins = "gpio39";
 | 
						|
+					function = "nand";
 | 
						|
+					drive-strength = <10>;
 | 
						|
 					bias-pull-up;
 | 
						|
 				};
 | 
						|
 
 | 
						|
@@ -431,9 +440,32 @@
 | 
						|
 					pins = "gpio40", "gpio41", "gpio42",
 | 
						|
 					       "gpio43", "gpio44", "gpio45",
 | 
						|
 					       "gpio46", "gpio47";
 | 
						|
+					function = "nand";
 | 
						|
+					drive-strength = <10>;
 | 
						|
 					bias-bus-hold;
 | 
						|
 				};
 | 
						|
 			};
 | 
						|
+
 | 
						|
+			mdio0_pins: mdio0-pins {
 | 
						|
+				mux {
 | 
						|
+					pins = "gpio0", "gpio1";
 | 
						|
+					function = "mdio";
 | 
						|
+					drive-strength = <8>;
 | 
						|
+					bias-disable;
 | 
						|
+				};
 | 
						|
+			};
 | 
						|
+
 | 
						|
+			rgmii2_pins: rgmii2-pins {
 | 
						|
+				mux {
 | 
						|
+					pins = "gpio27", "gpio28", "gpio29",
 | 
						|
+					       "gpio30", "gpio31", "gpio32",
 | 
						|
+					       "gpio51", "gpio52", "gpio59",
 | 
						|
+					       "gpio60", "gpio61", "gpio62";
 | 
						|
+					function = "rgmii2";
 | 
						|
+					drive-strength = <8>;
 | 
						|
+					bias-disable;
 | 
						|
+				};
 | 
						|
+			};
 | 
						|
 		};
 | 
						|
 
 | 
						|
 		intc: interrupt-controller@2000000 {
 |