| Message ID | 5452508cf2bb4213e9cff9b957d663c30633e81b.1670593872.git.michal.simek@amd.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | ARM: dts: zynq: Add xlnx prefix to GEM compatible string | expand |
On 12/9/22 14:51, 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/arm/boot/dts/zynq-7000.dtsi | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/arch/arm/boot/dts/zynq-7000.dtsi b/arch/arm/boot/dts/zynq-7000.dtsi > index f96f19a8a83f..25fbca70ac1f 100644 > --- a/arch/arm/boot/dts/zynq-7000.dtsi > +++ b/arch/arm/boot/dts/zynq-7000.dtsi > @@ -243,7 +243,7 @@ qspi: spi@e000d000 { > }; > > 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>; > @@ -254,7 +254,7 @@ gem0: ethernet@e000b000 { > }; > > 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>; Based on discussion https://lore.kernel.org/r/718283a9f5493ab63b4aaa12337dd5cab6538ff5.1670594172.git.michal.simek@amd.com will send v2 with removing deprecated compatible string. Thanks, Michal
diff --git a/arch/arm/boot/dts/zynq-7000.dtsi b/arch/arm/boot/dts/zynq-7000.dtsi index f96f19a8a83f..25fbca70ac1f 100644 --- a/arch/arm/boot/dts/zynq-7000.dtsi +++ b/arch/arm/boot/dts/zynq-7000.dtsi @@ -243,7 +243,7 @@ qspi: spi@e000d000 { }; 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>; @@ -254,7 +254,7 @@ gem0: ethernet@e000b000 { }; 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>;