| Message ID | 7768d5d68fe38dd8e9300e9c6e09c228e79b2862.1672909533.git.michal.simek@amd.com |
|---|---|
| State | Accepted |
| Commit | ba2a4db96f4adc1a6b54cf274bb7488bd3f95a10 |
| Headers | show |
| Series | [v2] ARM: dts: zynq: Add xlnx prefix to GEM compatible string | expand |
On 1/5/23 10:05, 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 remove > the existing cdns,zynq-gem compatible string. > > Signed-off-by: Harini Katakam <harini.katakam@amd.com> > Signed-off-by: Michal Simek <michal.simek@amd.com> > --- > > Changes in v2: > - Remove deprecated compatible string > - Update commit message > > 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 f221c60643e4..cd9931f6bcbd 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,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,gem"; > reg = <0xe000c000 0x1000>; > status = "disabled"; > interrupts = <0 45 4>; Applied. M
diff --git a/arch/arm/boot/dts/zynq-7000.dtsi b/arch/arm/boot/dts/zynq-7000.dtsi index f221c60643e4..cd9931f6bcbd 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,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,gem"; reg = <0xe000c000 0x1000>; status = "disabled"; interrupts = <0 45 4>;