út 23. 8. 2022 v 14:59 odesílatel Michal Simek <[email protected]> napsal: > > From: Harini Katakam <[email protected]> > > cdns,zynq/zynqmp were recentle deprecated in Linux in favour of xlnx > prefix. Add this new compatible string and retain the existing string for > compatibility with uboot drivers. > > Signed-off-by: Harini Katakam <[email protected]> > Signed-off-by: Michal Simek <[email protected]> > --- > > arch/arm/dts/zynq-7000.dtsi | 4 ++-- > arch/arm/dts/zynqmp.dtsi | 8 ++++---- > 2 files changed, 6 insertions(+), 6 deletions(-) > > diff --git a/arch/arm/dts/zynq-7000.dtsi b/arch/arm/dts/zynq-7000.dtsi > index a7ca00fb76c6..b4aa09d149b0 100644 > --- a/arch/arm/dts/zynq-7000.dtsi > +++ b/arch/arm/dts/zynq-7000.dtsi > @@ -247,7 +247,7 @@ > }; > > gem0: ethernet@e000b000 { > - compatible = "cdns,zynq-gem", "cdns,gem"; > + compatible = "xlnx,zynq-gem", "cdns,zynq-gem", > "cdns,gem"; > reg = <0xe000b000 0x1000>; > status = "disabled"; > interrupts = <0 22 4>; > @@ -258,7 +258,7 @@ > }; > > gem1: ethernet@e000c000 { > - compatible = "cdns,zynq-gem", "cdns,gem"; > + compatible = "xlnx,zynq-gem", "cdns,zynq-gem", > "cdns,gem"; > reg = <0xe000c000 0x1000>; > status = "disabled"; > interrupts = <0 45 4>; > diff --git a/arch/arm/dts/zynqmp.dtsi b/arch/arm/dts/zynqmp.dtsi > index fbc6e752da93..2aaec6cf5a15 100644 > --- a/arch/arm/dts/zynqmp.dtsi > +++ b/arch/arm/dts/zynqmp.dtsi > @@ -529,7 +529,7 @@ > }; > > gem0: ethernet@ff0b0000 { > - compatible = "cdns,zynqmp-gem", "cdns,gem"; > + compatible = "xlnx,zynqmp-gem", "cdns,zynqmp-gem", > "cdns,gem"; > status = "disabled"; > interrupt-parent = <&gic>; > interrupts = <0 57 4>, <0 57 4>; > @@ -543,7 +543,7 @@ > }; > > gem1: ethernet@ff0c0000 { > - compatible = "cdns,zynqmp-gem", "cdns,gem"; > + compatible = "xlnx,zynqmp-gem", "cdns,zynqmp-gem", > "cdns,gem"; > status = "disabled"; > interrupt-parent = <&gic>; > interrupts = <0 59 4>, <0 59 4>; > @@ -557,7 +557,7 @@ > }; > > gem2: ethernet@ff0d0000 { > - compatible = "cdns,zynqmp-gem", "cdns,gem"; > + compatible = "xlnx,zynqmp-gem", "cdns,zynqmp-gem", > "cdns,gem"; > status = "disabled"; > interrupt-parent = <&gic>; > interrupts = <0 61 4>, <0 61 4>; > @@ -571,7 +571,7 @@ > }; > > gem3: ethernet@ff0e0000 { > - compatible = "cdns,zynqmp-gem", "cdns,gem"; > + compatible = "xlnx,zynqmp-gem", "cdns,zynqmp-gem", > "cdns,gem"; > status = "disabled"; > interrupt-parent = <&gic>; > interrupts = <0 63 4>, <0 63 4>; > -- > 2.36.1 >
Applied. M -- Michal Simek, Ing. (M.Eng), OpenPGP -> KeyID: FE3D1F91 w: www.monstr.eu p: +42-0-721842854 Maintainer of Linux kernel - Xilinx Microblaze Maintainer of Linux kernel - Xilinx Zynq ARM and ZynqMP ARM64 SoCs U-Boot custodian - Xilinx Microblaze/Zynq/ZynqMP/Versal SoCs
