diff mbox series

Revert "arm64: dts: zynqmp: Add address-cells property to interrupt controllers"

Message ID e3312910db0922bb8c24a8e681de41709ca11bdf.1683035456.git.michal.simek@amd.com
State New
Headers
Series Revert "arm64: dts: zynqmp: Add address-cells property to interrupt controllers" |

Commit Message

Michal Simek May 2, 2023, 1:51 p.m. UTC 
  This reverts commit c6badbd2d321c19d4f55ee56b0ef12bb3352feac.

Long time ago this was discussed with Rob at link below that there is no
need to add address-cells to gpio and interrupt nodes that's why reverting
this patch for ZynqMP.
Also there is no visible DTC warning which was seen in past.

Link: https://lore.kernel.org/r/91e3405245c89f134676449cf3822285798d2ed2.1612189652.git.michal.simek@xilinx.com
Signed-off-by: Michal Simek <michal.simek@amd.com>
---

 arch/arm64/boot/dts/xilinx/zynqmp.dtsi | 2 --
 1 file changed, 2 deletions(-)

Comments

Krzysztof Kozlowski May 2, 2023, 8:12 p.m. UTC | #1 
On 02/05/2023 15:51, Michal Simek wrote:
> This reverts commit c6badbd2d321c19d4f55ee56b0ef12bb3352feac.
> 
> Long time ago this was discussed with Rob at link below that there is no
> need to add address-cells to gpio and interrupt nodes that's why reverting
> this patch for ZynqMP.
> Also there is no visible DTC warning which was seen in past.
> 
> Link: https://lore.kernel.org/r/91e3405245c89f134676449cf3822285798d2ed2.1612189652.git.michal.simek@xilinx.com
> Signed-off-by: Michal Simek <michal.simek@amd.com>

That seems right:
https://devicetree-specification.readthedocs.io/en/latest/chapter2-devicetree-basics.html#interrupt-map


Reviewed-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>

Best regards,
Krzysztof
Laurent Pinchart May 3, 2023, 12:47 p.m. UTC | #2 
Hi Michal,

Thank you for the patch.

On Tue, May 02, 2023 at 03:51:01PM +0200, Michal Simek wrote:
> This reverts commit c6badbd2d321c19d4f55ee56b0ef12bb3352feac.
> 
> Long time ago this was discussed with Rob at link below that there is no
> need to add address-cells to gpio and interrupt nodes that's why reverting
> this patch for ZynqMP.
> Also there is no visible DTC warning which was seen in past.
> 
> Link: https://lore.kernel.org/r/91e3405245c89f134676449cf3822285798d2ed2.1612189652.git.michal.simek@xilinx.com
> Signed-off-by: Michal Simek <michal.simek@amd.com>

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

> ---
> 
>  arch/arm64/boot/dts/xilinx/zynqmp.dtsi | 2 --
>  1 file changed, 2 deletions(-)
> 
> diff --git a/arch/arm64/boot/dts/xilinx/zynqmp.dtsi b/arch/arm64/boot/dts/xilinx/zynqmp.dtsi
> index 51b8349dcacd..2d564ba7e9e4 100644
> --- a/arch/arm64/boot/dts/xilinx/zynqmp.dtsi
> +++ b/arch/arm64/boot/dts/xilinx/zynqmp.dtsi
> @@ -419,7 +419,6 @@ fpd_dma_chan8: dma-controller@fd570000 {
>  
>  		gic: interrupt-controller@f9010000 {
>  			compatible = "arm,gic-400";
> -			#address-cells = <0>;
>  			#interrupt-cells = <3>;
>  			reg = <0x0 0xf9010000 0x0 0x10000>,
>  			      <0x0 0xf9020000 0x0 0x20000>,
> @@ -633,7 +632,6 @@ gem3: ethernet@ff0e0000 {
>  		gpio: gpio@ff0a0000 {
>  			compatible = "xlnx,zynqmp-gpio-1.0";
>  			status = "disabled";
> -			#address-cells = <0>;
>  			#gpio-cells = <0x2>;
>  			gpio-controller;
>  			interrupt-parent = <&gic>;
Michal Simek May 12, 2023, 11:28 a.m. UTC | #3 
On 5/2/23 15:51, Michal Simek wrote:
> This reverts commit c6badbd2d321c19d4f55ee56b0ef12bb3352feac.
> 
> Long time ago this was discussed with Rob at link below that there is no
> need to add address-cells to gpio and interrupt nodes that's why reverting
> this patch for ZynqMP.
> Also there is no visible DTC warning which was seen in past.
> 
> Link: https://lore.kernel.org/r/91e3405245c89f134676449cf3822285798d2ed2.1612189652.git.michal.simek@xilinx.com
> Signed-off-by: Michal Simek <michal.simek@amd.com>
> ---
> 
>   arch/arm64/boot/dts/xilinx/zynqmp.dtsi | 2 --
>   1 file changed, 2 deletions(-)
> 
> diff --git a/arch/arm64/boot/dts/xilinx/zynqmp.dtsi b/arch/arm64/boot/dts/xilinx/zynqmp.dtsi
> index 51b8349dcacd..2d564ba7e9e4 100644
> --- a/arch/arm64/boot/dts/xilinx/zynqmp.dtsi
> +++ b/arch/arm64/boot/dts/xilinx/zynqmp.dtsi
> @@ -419,7 +419,6 @@ fpd_dma_chan8: dma-controller@fd570000 {
>   
>   		gic: interrupt-controller@f9010000 {
>   			compatible = "arm,gic-400";
> -			#address-cells = <0>;
>   			#interrupt-cells = <3>;
>   			reg = <0x0 0xf9010000 0x0 0x10000>,
>   			      <0x0 0xf9020000 0x0 0x20000>,
> @@ -633,7 +632,6 @@ gem3: ethernet@ff0e0000 {
>   		gpio: gpio@ff0a0000 {
>   			compatible = "xlnx,zynqmp-gpio-1.0";
>   			status = "disabled";
> -			#address-cells = <0>;
>   			#gpio-cells = <0x2>;
>   			gpio-controller;
>   			interrupt-parent = <&gic>;

Applied.
M
diff mbox series

Patch

diff --git a/arch/arm64/boot/dts/xilinx/zynqmp.dtsi b/arch/arm64/boot/dts/xilinx/zynqmp.dtsi
index 51b8349dcacd..2d564ba7e9e4 100644
--- a/arch/arm64/boot/dts/xilinx/zynqmp.dtsi
+++ b/arch/arm64/boot/dts/xilinx/zynqmp.dtsi
@@ -419,7 +419,6 @@  fpd_dma_chan8: dma-controller@fd570000 {
 
 		gic: interrupt-controller@f9010000 {
 			compatible = "arm,gic-400";
-			#address-cells = <0>;
 			#interrupt-cells = <3>;
 			reg = <0x0 0xf9010000 0x0 0x10000>,
 			      <0x0 0xf9020000 0x0 0x20000>,
@@ -633,7 +632,6 @@  gem3: ethernet@ff0e0000 {
 		gpio: gpio@ff0a0000 {
 			compatible = "xlnx,zynqmp-gpio-1.0";
 			status = "disabled";
-			#address-cells = <0>;
 			#gpio-cells = <0x2>;
 			gpio-controller;
 			interrupt-parent = <&gic>;