1. Patchew
  2. linux
  3. View series

[PATCH v2] arm64: dts: zynqmp: Add xlnx prefix to GEM compatible string

Michal Simek posted 1 patch 2 years, 8 months ago 
arch/arm64/boot/dts/xilinx/zynqmp.dtsi | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
[PATCH v2] arm64: dts: zynqmp: Add xlnx prefix to GEM compatible string
Posted by Michal Simek 2 years, 8 months ago 
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,zynqmp-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/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 2ff4b788e094..153db59dc4b3 100644
--- a/arch/arm64/boot/dts/xilinx/zynqmp.dtsi
+++ b/arch/arm64/boot/dts/xilinx/zynqmp.dtsi
@@ -540,7 +540,7 @@ nand0: nand-controller@ff100000 {
 		};
 
 		gem0: ethernet@ff0b0000 {
-			compatible = "cdns,zynqmp-gem", "cdns,gem";
+			compatible = "xlnx,zynqmp-gem", "cdns,gem";
 			status = "disabled";
 			interrupt-parent = <&gic>;
 			interrupts = <0 57 4>, <0 57 4>;
@@ -555,7 +555,7 @@ gem0: ethernet@ff0b0000 {
 		};
 
 		gem1: ethernet@ff0c0000 {
-			compatible = "cdns,zynqmp-gem", "cdns,gem";
+			compatible = "xlnx,zynqmp-gem", "cdns,gem";
 			status = "disabled";
 			interrupt-parent = <&gic>;
 			interrupts = <0 59 4>, <0 59 4>;
@@ -570,7 +570,7 @@ gem1: ethernet@ff0c0000 {
 		};
 
 		gem2: ethernet@ff0d0000 {
-			compatible = "cdns,zynqmp-gem", "cdns,gem";
+			compatible = "xlnx,zynqmp-gem", "cdns,gem";
 			status = "disabled";
 			interrupt-parent = <&gic>;
 			interrupts = <0 61 4>, <0 61 4>;
@@ -585,7 +585,7 @@ gem2: ethernet@ff0d0000 {
 		};
 
 		gem3: ethernet@ff0e0000 {
-			compatible = "cdns,zynqmp-gem", "cdns,gem";
+			compatible = "xlnx,zynqmp-gem", "cdns,gem";
 			status = "disabled";
 			interrupt-parent = <&gic>;
 			interrupts = <0 63 4>, <0 63 4>;
-- 
2.36.1
Re: [PATCH v2] arm64: dts: zynqmp: Add xlnx prefix to GEM compatible string
Posted by Michal Simek 2 years, 7 months ago 

On 1/5/23 10:03, 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,zynqmp-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/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 2ff4b788e094..153db59dc4b3 100644
> --- a/arch/arm64/boot/dts/xilinx/zynqmp.dtsi
> +++ b/arch/arm64/boot/dts/xilinx/zynqmp.dtsi
> @@ -540,7 +540,7 @@ nand0: nand-controller@ff100000 {
>   		};
>   
>   		gem0: ethernet@ff0b0000 {
> -			compatible = "cdns,zynqmp-gem", "cdns,gem";
> +			compatible = "xlnx,zynqmp-gem", "cdns,gem";
>   			status = "disabled";
>   			interrupt-parent = <&gic>;
>   			interrupts = <0 57 4>, <0 57 4>;
> @@ -555,7 +555,7 @@ gem0: ethernet@ff0b0000 {
>   		};
>   
>   		gem1: ethernet@ff0c0000 {
> -			compatible = "cdns,zynqmp-gem", "cdns,gem";
> +			compatible = "xlnx,zynqmp-gem", "cdns,gem";
>   			status = "disabled";
>   			interrupt-parent = <&gic>;
>   			interrupts = <0 59 4>, <0 59 4>;
> @@ -570,7 +570,7 @@ gem1: ethernet@ff0c0000 {
>   		};
>   
>   		gem2: ethernet@ff0d0000 {
> -			compatible = "cdns,zynqmp-gem", "cdns,gem";
> +			compatible = "xlnx,zynqmp-gem", "cdns,gem";
>   			status = "disabled";
>   			interrupt-parent = <&gic>;
>   			interrupts = <0 61 4>, <0 61 4>;
> @@ -585,7 +585,7 @@ gem2: ethernet@ff0d0000 {
>   		};
>   
>   		gem3: ethernet@ff0e0000 {
> -			compatible = "cdns,zynqmp-gem", "cdns,gem";
> +			compatible = "xlnx,zynqmp-gem", "cdns,gem";
>   			status = "disabled";
>   			interrupt-parent = <&gic>;
>   			interrupts = <0 63 4>, <0 63 4>;


Applied.
M
Re: [PATCH v2] arm64: dts: zynqmp: Add xlnx prefix to GEM compatible string
Posted by Laurent Pinchart 2 years, 8 months ago 
Hi Michal,

Thank you for the patch.

On Thu, Jan 05, 2023 at 10:03:51AM +0100, 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,zynqmp-gem compatible string.
> 
> Signed-off-by: Harini Katakam <harini.katakam@amd.com>
> Signed-off-by: Michal Simek <michal.simek@amd.com>

Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>

> ---
> 
> Changes in v2:
> - Remove deprecated compatible string
> - Update commit message
> 
>  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 2ff4b788e094..153db59dc4b3 100644
> --- a/arch/arm64/boot/dts/xilinx/zynqmp.dtsi
> +++ b/arch/arm64/boot/dts/xilinx/zynqmp.dtsi
> @@ -540,7 +540,7 @@ nand0: nand-controller@ff100000 {
>  		};
>  
>  		gem0: ethernet@ff0b0000 {
> -			compatible = "cdns,zynqmp-gem", "cdns,gem";
> +			compatible = "xlnx,zynqmp-gem", "cdns,gem";
>  			status = "disabled";
>  			interrupt-parent = <&gic>;
>  			interrupts = <0 57 4>, <0 57 4>;
> @@ -555,7 +555,7 @@ gem0: ethernet@ff0b0000 {
>  		};
>  
>  		gem1: ethernet@ff0c0000 {
> -			compatible = "cdns,zynqmp-gem", "cdns,gem";
> +			compatible = "xlnx,zynqmp-gem", "cdns,gem";
>  			status = "disabled";
>  			interrupt-parent = <&gic>;
>  			interrupts = <0 59 4>, <0 59 4>;
> @@ -570,7 +570,7 @@ gem1: ethernet@ff0c0000 {
>  		};
>  
>  		gem2: ethernet@ff0d0000 {
> -			compatible = "cdns,zynqmp-gem", "cdns,gem";
> +			compatible = "xlnx,zynqmp-gem", "cdns,gem";
>  			status = "disabled";
>  			interrupt-parent = <&gic>;
>  			interrupts = <0 61 4>, <0 61 4>;
> @@ -585,7 +585,7 @@ gem2: ethernet@ff0d0000 {
>  		};
>  
>  		gem3: ethernet@ff0e0000 {
> -			compatible = "cdns,zynqmp-gem", "cdns,gem";
> +			compatible = "xlnx,zynqmp-gem", "cdns,gem";
>  			status = "disabled";
>  			interrupt-parent = <&gic>;
>  			interrupts = <0 63 4>, <0 63 4>;

-- 
Regards,

Laurent Pinchart

Patchew 2.1-devel-b67e4c2

© 2016 - 2025 Red Hat, Inc.