arm64: dts: xilinx: add soc-specific spi compatibles for zynqmp/versal-net

Unlike zynq, which has a specific compatible for the Cadence spi
controller, zynqmp and versal-net do not have specific compatibles.
In order to "encourage" people to use soc-specific compatibles for new
devices using this IP, add specific compatibles for these devices, with
a fallback to the existing compatible for the r1p6 version of the IP so
that there will be no functional change.

Signed-off-by: Conor Dooley <conor.dooley@microchip.com>
Acked-by: Michal Simek <michal.simek@amd.com>
Link: https://lore.kernel.org/r/20251001-cheesy-shucking-c55431bbcae3@spud
Signed-off-by: Michal Simek <michal.simek@amd.com>

diff --git a/arch/arm64/boot/dts/xilinx/versal-net.dtsi b/arch/arm64/boot/dts/xilinx/versal-net.dtsi
index 412af9a394aae5d4c0705542b7d6f489f41519dd..15f767608e67fd79115074b54ac5575d506e28b5 100644 (file)
--- a/arch/arm64/boot/dts/xilinx/versal-net.dtsi
+++ b/arch/arm64/boot/dts/xilinx/versal-net.dtsi
@@ -1018,7 +1018,7 @@
                };
 
                spi0: spi@f1960000 {
-                       compatible = "cdns,spi-r1p6";
+                       compatible = "xlnx,versal-net-spi-r1p6", "cdns,spi-r1p6";
                        status = "disabled";
                        interrupts = <0 23 4>;
                        reg = <0 0xf1960000 0 0x1000>;
@@ -1026,7 +1026,7 @@
                };
 
                spi1: spi@f1970000 {
-                       compatible = "cdns,spi-r1p6";
+                       compatible = "xlnx,versal-net-spi-r1p6", "cdns,spi-r1p6";
                        status = "disabled";
                        interrupts = <0 24 4>;
                        reg = <0 0xf1970000 0 0x1000>;

diff --git a/arch/arm64/boot/dts/xilinx/zynqmp.dtsi b/arch/arm64/boot/dts/xilinx/zynqmp.dtsi
index 938b014ca9231d265314c0d6a934d0be706e420b..4486c67b2a309ea9bbc5edd49b34804d3a2b54ce 100644 (file)
--- a/arch/arm64/boot/dts/xilinx/zynqmp.dtsi
+++ b/arch/arm64/boot/dts/xilinx/zynqmp.dtsi
@@ -1080,7 +1080,7 @@
                };
 
                spi0: spi@ff040000 {
-                       compatible = "cdns,spi-r1p6";
+                       compatible = "xlnx,zynqmp-spi-r1p6", "cdns,spi-r1p6";
                        status = "disabled";
                        interrupt-parent = <&gic>;
                        interrupts = <GIC_SPI 19 IRQ_TYPE_LEVEL_HIGH>;
@@ -1092,7 +1092,7 @@
                };
 
                spi1: spi@ff050000 {
-                       compatible = "cdns,spi-r1p6";
+                       compatible = "xlnx,zynqmp-spi-r1p6", "cdns,spi-r1p6";
                        status = "disabled";
                        interrupt-parent = <&gic>;
                        interrupts = <GIC_SPI 20 IRQ_TYPE_LEVEL_HIGH>;