Skip to content

Commit 796010d

Browse files
ConchuODmichalsimek
authored andcommitted
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>
1 parent 8f0b4cc commit 796010d

2 files changed

Lines changed: 4 additions & 4 deletions

File tree

arch/arm64/boot/dts/xilinx/versal-net.dtsi

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1018,15 +1018,15 @@
10181018
};
10191019

10201020
spi0: spi@f1960000 {
1021-
compatible = "cdns,spi-r1p6";
1021+
compatible = "xlnx,versal-net-spi-r1p6", "cdns,spi-r1p6";
10221022
status = "disabled";
10231023
interrupts = <0 23 4>;
10241024
reg = <0 0xf1960000 0 0x1000>;
10251025
clock-names = "ref_clk", "pclk";
10261026
};
10271027

10281028
spi1: spi@f1970000 {
1029-
compatible = "cdns,spi-r1p6";
1029+
compatible = "xlnx,versal-net-spi-r1p6", "cdns,spi-r1p6";
10301030
status = "disabled";
10311031
interrupts = <0 24 4>;
10321032
reg = <0 0xf1970000 0 0x1000>;

arch/arm64/boot/dts/xilinx/zynqmp.dtsi

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1080,7 +1080,7 @@
10801080
};
10811081

10821082
spi0: spi@ff040000 {
1083-
compatible = "cdns,spi-r1p6";
1083+
compatible = "xlnx,zynqmp-spi-r1p6", "cdns,spi-r1p6";
10841084
status = "disabled";
10851085
interrupt-parent = <&gic>;
10861086
interrupts = <GIC_SPI 19 IRQ_TYPE_LEVEL_HIGH>;
@@ -1092,7 +1092,7 @@
10921092
};
10931093

10941094
spi1: spi@ff050000 {
1095-
compatible = "cdns,spi-r1p6";
1095+
compatible = "xlnx,zynqmp-spi-r1p6", "cdns,spi-r1p6";
10961096
status = "disabled";
10971097
interrupt-parent = <&gic>;
10981098
interrupts = <GIC_SPI 20 IRQ_TYPE_LEVEL_HIGH>;

0 commit comments

Comments
 (0)