Skip to contentSkip to conversation

arm64: dts: stratix10: Fix SPI nodes for Stratix10

PATCH New thor.thayer at linux.intel.com 2 participants 5 messages May 29, 2018 – Jun 22, 2018

Subsystems (3)
Stable branch Device tree bindings Arm/socfpga architecture
lore
Share & tools
lore

thor.thayer at linux.intel.com

author
#0 lore raw

PATCH 1/2 arm64: dts: stratix10: Fix SPI nodes for Stratix10

From: Thor Thayer <[email protected]>

Remove the unused bus-num node and change num-chipselect to num-cs to match SPI bindings.

Signed-off-by Thor Thayer <[email protected]>
Fixes 78cd6a9d8e154 ("arm64: dts: Add base stratix 10 dtsi")
Cc [email protected]
---
 arch/arm64/boot/dts/altera/socfpga_stratix10.dtsi | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)
arch/arm64/boot/dts/altera/socfpga_stratix10.dtsi +2 -4
index d8c94d5ff4b4..47fa4b450324 100644
@@ -315,8 +315,7 @@
 			interrupts = <0 99 4>;
 			resets = <&rst SPIM0_RESET>;
 			reg-io-width = <4>;
-			num-chipselect = <4>;
-			bus-num = <0>;
+			num-cs = <4>;
 			status = "disabled";
 		};
 

@@ -328,8 +327,7 @@
 			interrupts = <0 100 4>;
 			resets = <&rst SPIM1_RESET>;
 			reg-io-width = <4>;
-			num-chipselect = <4>;
-			bus-num = <0>;
+			num-cs = <4>;
 			status = "disabled";
 		};
Signature · 1 line
2.7.4
author
#1 lore raw

PATCH 1/2 arm64: dts: stratix10: Fix SPI nodes for Stratix10

Hi Dinh,

Quoted 28 lines · On 05/29/2018 01:13 PM, [email protected] wrote:

From: Thor Thayer <[email protected]>

Remove the unused bus-num node and change num-chipselect to num-cs to match SPI bindings.

Signed-off-by Thor Thayer <[email protected]>
Fixes 78cd6a9d8e154 ("arm64: dts: Add base stratix 10 dtsi")
Cc [email protected]
---
  arch/arm64/boot/dts/altera/socfpga_stratix10.dtsi | 6 ++----
  1 file changed, 2 insertions(+), 4 deletions(-)
arch/arm64/boot/dts/altera/socfpga_stratix10.dtsi +1 -2
index d8c94d5ff4b4..47fa4b450324 100644
@@ -315,8 +315,7 @@
  			interrupts = <0 99 4>;
  			resets = <&rst SPIM0_RESET>;
  			reg-io-width = <4>;
-			num-chipselect = <4>;
-			bus-num = <0>;
+			num-cs = <4>;
  			status = "disabled";
  		};

arch/arm64/boot/dts/altera/socfpga_stratix10.dtsi line 333

Quoted 9 lines
arch/arm64/boot/dts/altera/socfpga_stratix10.dtsi +1 -2
@@ -328,8 +327,7 @@
  			interrupts = <0 100 4>;
  			resets = <&rst SPIM1_RESET>;
  			reg-io-width = <4>;
-			num-chipselect = <4>;
-			bus-num = <0>;
+			num-cs = <4>;
  			status = "disabled";
  		};

Any update on this patch?

maintainer
#2 lore raw

PATCH 1/2 arm64: dts: stratix10: Fix SPI nodes for Stratix10

Quoted 32 lines · Thor Thayer

Hi Dinh,

Quoted 29 lines · thor.thayer at linux.intel.com

From: Thor Thayer <[email protected]>

Remove the unused bus-num node and change num-chipselect to num-cs to match SPI bindings.

Signed-off-by Thor Thayer <[email protected]>
Fixes 78cd6a9d8e154 ("arm64: dts: Add base stratix 10 dtsi")
Cc stable at vger.kernel.org

---
? arch/arm64/boot/dts/altera/socfpga_stratix10.dtsi | 6 ++---- ? 1 file changed, 2 insertions(+), 4 deletions(-)

arch/arm64/boot/dts/altera/socfpga_stratix10.dtsi +1 -2
index d8c94d5ff4b4..47fa4b450324 100644
@@ -315,8 +315,7 @@
 ????????????? interrupts = <0 99 4>;
 ????????????? resets = <&rst SPIM0_RESET>;
 ????????????? reg-io-width = <4>;
-??????????? num-chipselect = <4>;
-??????????? bus-num = <0>;
+??????????? num-cs = <4>;
 ????????????? status = "disabled";
 ????????? };

? @@ -328,8 +327,7 @@
????????????? interrupts = <0 100 4>;
????????????? resets = <&rst SPIM1_RESET>;

Quoted 8 lines
Quoted 7 lines

????????????? reg-io-width = <4>;
-??????????? num-chipselect = <4>;
-??????????? bus-num = <0>;
+??????????? num-cs = <4>;
????????????? status = "disabled";
????????? };
?

Any update on this patch?

I've applied both patches.

Thanks,
Dinh

author
#3 lore raw

PATCH 2/2 arm64: dts: stratix10: Add SPI clocks for Stratix10

In reply to thor.thayer at linux.intel.com

From: Thor Thayer <[email protected]>

Add the SPI clocks to the Stratix10 device tree.

Signed-off-by Thor Thayer <[email protected]>
---
 arch/arm64/boot/dts/altera/socfpga_stratix10.dtsi | 4 ++++
 1 file changed, 4 insertions(+)
arch/arm64/boot/dts/altera/socfpga_stratix10.dtsi +4 -0
index 47fa4b450324..34658f135daf 100644
@@ -316,6 +316,8 @@
 			resets = <&rst SPIM0_RESET>;
 			reg-io-width = <4>;
 			num-cs = <4>;
+			clocks = <&clkmgr STRATIX10_L4_MAIN_CLK>,
+				 <&clkmgr STRATIX10_SPI_M_CLK>;
 			status = "disabled";
 		};
 

@@ -328,6 +330,8 @@
 			resets = <&rst SPIM1_RESET>;
 			reg-io-width = <4>;
 			num-cs = <4>;
+			clocks = <&clkmgr STRATIX10_L4_MAIN_CLK>,
+				 <&clkmgr STRATIX10_SPI_M_CLK>;
 			status = "disabled";
 		};
Signature · 1 line
2.7.4
author
#4 lore raw

PATCH 2/2 arm64: dts: stratix10: Add SPI clocks for Stratix10

Hi Dinh,

Quoted 24 lines · thor.thayer at linux.intel.com

From: Thor Thayer <[email protected]>

Add the SPI clocks to the Stratix10 device tree.

Signed-off-by Thor Thayer <[email protected]>
---
  arch/arm64/boot/dts/altera/socfpga_stratix10.dtsi | 4 ++++
  1 file changed, 4 insertions(+)
arch/arm64/boot/dts/altera/socfpga_stratix10.dtsi +2 -0
index 47fa4b450324..34658f135daf 100644
@@ -316,6 +316,8 @@
  			resets = <&rst SPIM0_RESET>;
  			reg-io-width = <4>;
  			num-cs = <4>;
+			clocks = <&clkmgr STRATIX10_L4_MAIN_CLK>,
+				 <&clkmgr STRATIX10_SPI_M_CLK>;
  			status = "disabled";
  		};

arch/arm64/boot/dts/altera/socfpga_stratix10.dtsi line 337

Quoted 8 lines
arch/arm64/boot/dts/altera/socfpga_stratix10.dtsi +2 -0
@@ -328,6 +330,8 @@
  			resets = <&rst SPIM1_RESET>;
  			reg-io-width = <4>;
  			num-cs = <4>;
+			clocks = <&clkmgr STRATIX10_L4_MAIN_CLK>,
+				 <&clkmgr STRATIX10_SPI_M_CLK>;
  			status = "disabled";
  		};

Any comments on this patch?