[PATCH] arm64: dts: stratix10: Fix SPI nodes for Stratix10

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



From: Thor Thayer <thor.thayer@xxxxxxxxxxxxxxx>

Patch did not apply cleanly to 4.9 and 4.14 stable branches
because of additional node properties added after 4.14. So
backport patch and cleanup commit 4595299c5eae ("arm64: dts:
   stratix10: Fix SPI nodes for Stratix10")

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

Cc: stable@xxxxxxxxxxxxxxx # 4.14.x
Cc: stable@xxxxxxxxxxxxxxx # 4.9.x
Fixes: 78cd6a9d8e154 ("arm64: dts: Add base stratix 10 dtsi")
Signed-off-by: Thor Thayer <thor.thayer@xxxxxxxxxxxxxxx>
Signed-off-by: Dinh Nguyen <dinguyen@xxxxxxxxxx>
Signed-off-by: Olof Johansson <olof@xxxxxxxxx>
---
 arch/arm64/boot/dts/altera/socfpga_stratix10.dtsi | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/arch/arm64/boot/dts/altera/socfpga_stratix10.dtsi b/arch/arm64/boot/dts/altera/socfpga_stratix10.dtsi
index c2b9bcb0ef61..57f75453ee93 100644
--- a/arch/arm64/boot/dts/altera/socfpga_stratix10.dtsi
+++ b/arch/arm64/boot/dts/altera/socfpga_stratix10.dtsi
@@ -231,8 +231,7 @@
 			#size-cells = <0>;
 			reg = <0xffda4000 0x1000>;
 			interrupts = <0 101 4>;
-			num-chipselect = <4>;
-			bus-num = <0>;
+			num-cs = <4>;
 			status = "disabled";
 		};
 
@@ -242,8 +241,7 @@
 			#size-cells = <0>;
 			reg = <0xffda5000 0x1000>;
 			interrupts = <0 102 4>;
-			num-chipselect = <4>;
-			bus-num = <0>;
+			num-cs = <4>;
 			status = "disabled";
 		};
 
-- 
2.7.4

--
To unsubscribe from this list: send the line "unsubscribe devicetree" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html



[Index of Archives]     [Device Tree Compilter]     [Device Tree Spec]     [Linux Driver Backports]     [Video for Linux]     [Linux USB Devel]     [Linux PCI Devel]     [Linux Audio Users]     [Linux Kernel]     [Linux SCSI]     [XFree86]     [Yosemite Backpacking]


  Powered by Linux