| Message ID | 718283a9f5493ab63b4aaa12337dd5cab6538ff5.1670594172.git.michal.simek@amd.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | arm64: dts: zynqmp: Add xlnx prefix to GEM compatible string | expand |
On 09/12/2022 14:56, Michal Simek wrote: > From: Harini Katakam <harini.katakam@amd.com> > > cdns,zynq/zynqmp/versal-gem was recently 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 <harini.katakam@amd.com> > Signed-off-by: Michal Simek <michal.simek@amd.com> > --- > > arch/arm64/boot/dts/xilinx/zynqmp.dtsi | 8 ++++---- > 1 file changed, 4 insertions(+), 4 deletions(-) > > diff --git a/arch/arm64/boot/dts/xilinx/zynqmp.dtsi b/arch/arm64/boot/dts/xilinx/zynqmp.dtsi > index 8553299f12eb..233127d94204 100644 > --- a/arch/arm64/boot/dts/xilinx/zynqmp.dtsi > +++ b/arch/arm64/boot/dts/xilinx/zynqmp.dtsi > @@ -507,7 +507,7 @@ nand0: nand-controller@ff100000 { > }; > > gem0: ethernet@ff0b0000 { > - compatible = "cdns,zynqmp-gem", "cdns,gem"; > + compatible = "xlnx,zynqmp-gem", "cdns,zynqmp-gem", "cdns,gem"; That's not what the bindings are saying. If this was the intention of AMD, you should have replied to my patch that you need prolonged backwards compatibility. Best regards, Krzysztof
On 12/9/22 16:11, Krzysztof Kozlowski wrote: > On 09/12/2022 14:56, Michal Simek wrote: >> From: Harini Katakam <harini.katakam@amd.com> >> >> cdns,zynq/zynqmp/versal-gem was recently 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 <harini.katakam@amd.com> >> Signed-off-by: Michal Simek <michal.simek@amd.com> >> --- >> >> arch/arm64/boot/dts/xilinx/zynqmp.dtsi | 8 ++++---- >> 1 file changed, 4 insertions(+), 4 deletions(-) >> >> diff --git a/arch/arm64/boot/dts/xilinx/zynqmp.dtsi b/arch/arm64/boot/dts/xilinx/zynqmp.dtsi >> index 8553299f12eb..233127d94204 100644 >> --- a/arch/arm64/boot/dts/xilinx/zynqmp.dtsi >> +++ b/arch/arm64/boot/dts/xilinx/zynqmp.dtsi >> @@ -507,7 +507,7 @@ nand0: nand-controller@ff100000 { >> }; >> >> gem0: ethernet@ff0b0000 { >> - compatible = "cdns,zynqmp-gem", "cdns,gem"; >> + compatible = "xlnx,zynqmp-gem", "cdns,zynqmp-gem", "cdns,gem"; > > That's not what the bindings are saying. If this was the intention of > AMD, you should have replied to my patch that you need prolonged > backwards compatibility. I have sent the patch to U-Boot to support new compatible string and CC you on that too. I have no problem to do switch just to xlnx one but it is not fully accurate that cdns,versal-gem wasn't used. True is not in Linux but it was used in U-Boot. If we can go straight to xlnx,zynqmp-gem, cdns,gem I will send v2 of this patch. Thanks, Michal
On 09/12/2022 16:23, Michal Simek wrote: > > > On 12/9/22 16:11, Krzysztof Kozlowski wrote: >> On 09/12/2022 14:56, Michal Simek wrote: >>> From: Harini Katakam <harini.katakam@amd.com> >>> >>> cdns,zynq/zynqmp/versal-gem was recently 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 <harini.katakam@amd.com> >>> Signed-off-by: Michal Simek <michal.simek@amd.com> >>> --- >>> >>> arch/arm64/boot/dts/xilinx/zynqmp.dtsi | 8 ++++---- >>> 1 file changed, 4 insertions(+), 4 deletions(-) >>> >>> diff --git a/arch/arm64/boot/dts/xilinx/zynqmp.dtsi b/arch/arm64/boot/dts/xilinx/zynqmp.dtsi >>> index 8553299f12eb..233127d94204 100644 >>> --- a/arch/arm64/boot/dts/xilinx/zynqmp.dtsi >>> +++ b/arch/arm64/boot/dts/xilinx/zynqmp.dtsi >>> @@ -507,7 +507,7 @@ nand0: nand-controller@ff100000 { >>> }; >>> >>> gem0: ethernet@ff0b0000 { >>> - compatible = "cdns,zynqmp-gem", "cdns,gem"; >>> + compatible = "xlnx,zynqmp-gem", "cdns,zynqmp-gem", "cdns,gem"; >> >> That's not what the bindings are saying. If this was the intention of >> AMD, you should have replied to my patch that you need prolonged >> backwards compatibility. > > I have sent the patch to U-Boot to support new compatible string and CC you on > that too. > > I have no problem to do switch just to xlnx one but it is not fully accurate > that cdns,versal-gem wasn't used. True is not in Linux but it was used in U-Boot. > > If we can go straight to xlnx,zynqmp-gem, cdns,gem I will send v2 of this patch. Yeah, there might be also few other users of these bindings (other systems), thus the DTS change might need to wait a bit. The other way would be to change bindings to match your three-compatible usage, but then we would have these in three places in DTS (old compatible, new+old, only new). Best regards, Krzysztof
diff --git a/arch/arm64/boot/dts/xilinx/zynqmp.dtsi b/arch/arm64/boot/dts/xilinx/zynqmp.dtsi index 8553299f12eb..233127d94204 100644 --- a/arch/arm64/boot/dts/xilinx/zynqmp.dtsi +++ b/arch/arm64/boot/dts/xilinx/zynqmp.dtsi @@ -507,7 +507,7 @@ nand0: nand-controller@ff100000 { }; 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>; @@ -522,7 +522,7 @@ gem0: ethernet@ff0b0000 { }; 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>; @@ -537,7 +537,7 @@ gem1: ethernet@ff0c0000 { }; 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>; @@ -552,7 +552,7 @@ gem2: ethernet@ff0d0000 { }; 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>;