tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

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>

authored by

Conor Dooley and committed by
Michal Simek 796010d5 8f0b4cce

+4 -4
+2 -2
arch/arm64/boot/dts/xilinx/versal-net.dtsi
··· 1018 1018 }; 1019 1019 1020 1020 spi0: spi@f1960000 { 1021 - compatible = "cdns,spi-r1p6"; 1021 + compatible = "xlnx,versal-net-spi-r1p6", "cdns,spi-r1p6"; 1022 1022 status = "disabled"; 1023 1023 interrupts = <0 23 4>; 1024 1024 reg = <0 0xf1960000 0 0x1000>; ··· 1026 1026 }; 1027 1027 1028 1028 spi1: spi@f1970000 { 1029 - compatible = "cdns,spi-r1p6"; 1029 + compatible = "xlnx,versal-net-spi-r1p6", "cdns,spi-r1p6"; 1030 1030 status = "disabled"; 1031 1031 interrupts = <0 24 4>; 1032 1032 reg = <0 0xf1970000 0 0x1000>;
+2 -2
arch/arm64/boot/dts/xilinx/zynqmp.dtsi
··· 1080 1080 }; 1081 1081 1082 1082 spi0: spi@ff040000 { 1083 - compatible = "cdns,spi-r1p6"; 1083 + compatible = "xlnx,zynqmp-spi-r1p6", "cdns,spi-r1p6"; 1084 1084 status = "disabled"; 1085 1085 interrupt-parent = <&gic>; 1086 1086 interrupts = <GIC_SPI 19 IRQ_TYPE_LEVEL_HIGH>; ··· 1092 1092 }; 1093 1093 1094 1094 spi1: spi@ff050000 { 1095 - compatible = "cdns,spi-r1p6"; 1095 + compatible = "xlnx,zynqmp-spi-r1p6", "cdns,spi-r1p6"; 1096 1096 status = "disabled"; 1097 1097 interrupt-parent = <&gic>; 1098 1098 interrupts = <GIC_SPI 20 IRQ_TYPE_LEVEL_HIGH>;