devicetree.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* [PATCH] arm64: dts: stratix10: Fix SPI nodes for Stratix10
@ 2018-07-05 22:02 thor.thayer
  0 siblings, 0 replies; only message in thread
From: thor.thayer @ 2018-07-05 22:02 UTC (permalink / raw)
  To: stable
  Cc: dinguyen, robh+dt, mark.rutland, catalin.marinas, will.deacon,
	devicetree, linux-arm-kernel, Thor Thayer, #, 4.14.x, 4.9.x,
	Olof Johansson

From: Thor Thayer <thor.thayer@linux.intel.com>

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@vger.kernel.org # 4.14.x
Cc: stable@vger.kernel.org # 4.9.x
Fixes: 78cd6a9d8e154 ("arm64: dts: Add base stratix 10 dtsi")
Signed-off-by: Thor Thayer <thor.thayer@linux.intel.com>
Signed-off-by: Dinh Nguyen <dinguyen@kernel.org>
Signed-off-by: Olof Johansson <olof@lixom.net>
---
 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

^ permalink raw reply related	[flat|nested] only message in thread

only message in thread, other threads:[~2018-07-05 22:02 UTC | newest]

Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2018-07-05 22:02 [PATCH] arm64: dts: stratix10: Fix SPI nodes for Stratix10 thor.thayer

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).