diff mbox series

[14/20] arm64: dts: renesas: Use interrupts-extended for I/O expanders

Message ID 8409a184db92b8d03d95beffde2cc9a9752366a9.1728045620.git.geert+renesas@glider.be (mailing list archive)
State New, archived
Headers show
Series renesas: dts: Use interrupts-extended | expand

Commit Message

Geert Uytterhoeven Oct. 4, 2024, 12:52 p.m. UTC 
Use the more concise interrupts-extended property to fully describe the
interrupts.

Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
---
 arch/arm64/boot/dts/renesas/beacon-renesom-som.dtsi  |  3 +--
 arch/arm64/boot/dts/renesas/ebisu.dtsi               |  3 +--
 .../boot/dts/renesas/r8a779h0-gray-hawk-single.dts   |  3 +--
 arch/arm64/boot/dts/renesas/ulcb-kf.dtsi             | 12 ++++--------
 .../boot/dts/renesas/white-hawk-cpu-common.dtsi      |  3 +--
 5 files changed, 8 insertions(+), 16 deletions(-)

Comments

Niklas Söderlund Oct. 4, 2024, 4:56 p.m. UTC | #1 
On 2024-10-04 14:52:56 +0200, Geert Uytterhoeven wrote:
> Use the more concise interrupts-extended property to fully describe the
> interrupts.
> 
> Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>

Reviewed-by: Niklas Söderlund <niklas.soderlund+renesas@ragnatech.se>

> ---
>  arch/arm64/boot/dts/renesas/beacon-renesom-som.dtsi  |  3 +--
>  arch/arm64/boot/dts/renesas/ebisu.dtsi               |  3 +--
>  .../boot/dts/renesas/r8a779h0-gray-hawk-single.dts   |  3 +--
>  arch/arm64/boot/dts/renesas/ulcb-kf.dtsi             | 12 ++++--------
>  .../boot/dts/renesas/white-hawk-cpu-common.dtsi      |  3 +--
>  5 files changed, 8 insertions(+), 16 deletions(-)
> 
> diff --git a/arch/arm64/boot/dts/renesas/beacon-renesom-som.dtsi b/arch/arm64/boot/dts/renesas/beacon-renesom-som.dtsi
> index 5a15a956702a6be8..4a9d20249eaa9bc0 100644
> --- a/arch/arm64/boot/dts/renesas/beacon-renesom-som.dtsi
> +++ b/arch/arm64/boot/dts/renesas/beacon-renesom-som.dtsi
> @@ -130,8 +130,7 @@ pca9654: gpio@20 {
>  	pca9654_lte: gpio@21 {
>  		compatible = "onnn,pca9654";
>  		reg = <0x21>;
> -		interrupt-parent = <&gpio5>;
> -		interrupts = <25 IRQ_TYPE_EDGE_FALLING>;
> +		interrupts-extended = <&gpio5 25 IRQ_TYPE_EDGE_FALLING>;
>  		interrupt-controller;
>  		#interrupt-cells = <2>;
>  		gpio-controller;
> diff --git a/arch/arm64/boot/dts/renesas/ebisu.dtsi b/arch/arm64/boot/dts/renesas/ebisu.dtsi
> index 4d16b8f0eae5474b..54ebffcd82d4337b 100644
> --- a/arch/arm64/boot/dts/renesas/ebisu.dtsi
> +++ b/arch/arm64/boot/dts/renesas/ebisu.dtsi
> @@ -392,8 +392,7 @@ io_expander: gpio@20 {
>  		reg = <0x20>;
>  		gpio-controller;
>  		#gpio-cells = <2>;
> -		interrupt-parent = <&gpio2>;
> -		interrupts = <22 IRQ_TYPE_LEVEL_LOW>;
> +		interrupts-extended = <&gpio2 22 IRQ_TYPE_LEVEL_LOW>;
>  	};
>  
>  	hdmi-encoder@39 {
> diff --git a/arch/arm64/boot/dts/renesas/r8a779h0-gray-hawk-single.dts b/arch/arm64/boot/dts/renesas/r8a779h0-gray-hawk-single.dts
> index b1d035ca4d97a51a..58eabcc7e0e07f49 100644
> --- a/arch/arm64/boot/dts/renesas/r8a779h0-gray-hawk-single.dts
> +++ b/arch/arm64/boot/dts/renesas/r8a779h0-gray-hawk-single.dts
> @@ -248,8 +248,7 @@ &i2c0 {
>  	io_expander_a: gpio@20 {
>  		compatible = "onnn,pca9654";
>  		reg = <0x20>;
> -		interrupt-parent = <&gpio0>;
> -		interrupts = <0 IRQ_TYPE_LEVEL_LOW>;
> +		interrupts-extended = <&gpio0 0 IRQ_TYPE_LEVEL_LOW>;
>  		gpio-controller;
>  		#gpio-cells = <2>;
>  		interrupt-controller;
> diff --git a/arch/arm64/boot/dts/renesas/ulcb-kf.dtsi b/arch/arm64/boot/dts/renesas/ulcb-kf.dtsi
> index 5a5dd5ecb75e0e7c..f7330b2262b8af0c 100644
> --- a/arch/arm64/boot/dts/renesas/ulcb-kf.dtsi
> +++ b/arch/arm64/boot/dts/renesas/ulcb-kf.dtsi
> @@ -235,8 +235,7 @@ gpio_exp_74: gpio@74 {
>  		#gpio-cells = <2>;
>  		interrupt-controller;
>  		#interrupt-cells = <2>;
> -		interrupt-parent = <&gpio6>;
> -		interrupts = <8 IRQ_TYPE_EDGE_FALLING>;
> +		interrupts-extended = <&gpio6 8 IRQ_TYPE_EDGE_FALLING>;
>  
>  		audio-out-off-hog {
>  			gpio-hog;
> @@ -296,8 +295,7 @@ gpio_exp_75: gpio@75 {
>  		#gpio-cells = <2>;
>  		interrupt-controller;
>  		#interrupt-cells = <2>;
> -		interrupt-parent = <&gpio6>;
> -		interrupts = <4 IRQ_TYPE_EDGE_FALLING>;
> +		interrupts-extended = <&gpio6 4 IRQ_TYPE_EDGE_FALLING>;
>  	};
>  };
>  
> @@ -317,8 +315,7 @@ gpio_exp_76: gpio@76 {
>  		#gpio-cells = <2>;
>  		interrupt-controller;
>  		#interrupt-cells = <2>;
> -		interrupt-parent = <&gpio7>;
> -		interrupts = <3 IRQ_TYPE_EDGE_FALLING>;
> +		interrupts-extended = <&gpio7 3 IRQ_TYPE_EDGE_FALLING>;
>  	};
>  
>  	gpio_exp_77: gpio@77 {
> @@ -328,8 +325,7 @@ gpio_exp_77: gpio@77 {
>  		#gpio-cells = <2>;
>  		interrupt-controller;
>  		#interrupt-cells = <2>;
> -		interrupt-parent = <&gpio5>;
> -		interrupts = <9 IRQ_TYPE_EDGE_FALLING>;
> +		interrupts-extended = <&gpio5 9 IRQ_TYPE_EDGE_FALLING>;
>  	};
>  };
>  
> diff --git a/arch/arm64/boot/dts/renesas/white-hawk-cpu-common.dtsi b/arch/arm64/boot/dts/renesas/white-hawk-cpu-common.dtsi
> index 209cba75adec6d6c..337ba68342c475b5 100644
> --- a/arch/arm64/boot/dts/renesas/white-hawk-cpu-common.dtsi
> +++ b/arch/arm64/boot/dts/renesas/white-hawk-cpu-common.dtsi
> @@ -215,8 +215,7 @@ &i2c0 {
>  	io_expander_a: gpio@20 {
>  		compatible = "onnn,pca9654";
>  		reg = <0x20>;
> -		interrupt-parent = <&gpio0>;
> -		interrupts = <0 IRQ_TYPE_LEVEL_LOW>;
> +		interrupts-extended = <&gpio0 0 IRQ_TYPE_LEVEL_LOW>;
>  		gpio-controller;
>  		#gpio-cells = <2>;
>  		interrupt-controller;
> -- 
> 2.34.1
> 
>
Lad, Prabhakar Oct. 7, 2024, 6:22 p.m. UTC | #2 
On Fri, Oct 4, 2024 at 2:27 PM Geert Uytterhoeven
<geert+renesas@glider.be> wrote:
>
> Use the more concise interrupts-extended property to fully describe the
> interrupts.
>
> Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
> ---
>  arch/arm64/boot/dts/renesas/beacon-renesom-som.dtsi  |  3 +--
>  arch/arm64/boot/dts/renesas/ebisu.dtsi               |  3 +--
>  .../boot/dts/renesas/r8a779h0-gray-hawk-single.dts   |  3 +--
>  arch/arm64/boot/dts/renesas/ulcb-kf.dtsi             | 12 ++++--------
>  .../boot/dts/renesas/white-hawk-cpu-common.dtsi      |  3 +--
>  5 files changed, 8 insertions(+), 16 deletions(-)
>
Reviewed-by:  Lad Prabhakar <prabhakar.mahadev-lad.rj@bp.renesas.com>

Cheers,
Prabhakar

> diff --git a/arch/arm64/boot/dts/renesas/beacon-renesom-som.dtsi b/arch/arm64/boot/dts/renesas/beacon-renesom-som.dtsi
> index 5a15a956702a6be8..4a9d20249eaa9bc0 100644
> --- a/arch/arm64/boot/dts/renesas/beacon-renesom-som.dtsi
> +++ b/arch/arm64/boot/dts/renesas/beacon-renesom-som.dtsi
> @@ -130,8 +130,7 @@ pca9654: gpio@20 {
>         pca9654_lte: gpio@21 {
>                 compatible = "onnn,pca9654";
>                 reg = <0x21>;
> -               interrupt-parent = <&gpio5>;
> -               interrupts = <25 IRQ_TYPE_EDGE_FALLING>;
> +               interrupts-extended = <&gpio5 25 IRQ_TYPE_EDGE_FALLING>;
>                 interrupt-controller;
>                 #interrupt-cells = <2>;
>                 gpio-controller;
> diff --git a/arch/arm64/boot/dts/renesas/ebisu.dtsi b/arch/arm64/boot/dts/renesas/ebisu.dtsi
> index 4d16b8f0eae5474b..54ebffcd82d4337b 100644
> --- a/arch/arm64/boot/dts/renesas/ebisu.dtsi
> +++ b/arch/arm64/boot/dts/renesas/ebisu.dtsi
> @@ -392,8 +392,7 @@ io_expander: gpio@20 {
>                 reg = <0x20>;
>                 gpio-controller;
>                 #gpio-cells = <2>;
> -               interrupt-parent = <&gpio2>;
> -               interrupts = <22 IRQ_TYPE_LEVEL_LOW>;
> +               interrupts-extended = <&gpio2 22 IRQ_TYPE_LEVEL_LOW>;
>         };
>
>         hdmi-encoder@39 {
> diff --git a/arch/arm64/boot/dts/renesas/r8a779h0-gray-hawk-single.dts b/arch/arm64/boot/dts/renesas/r8a779h0-gray-hawk-single.dts
> index b1d035ca4d97a51a..58eabcc7e0e07f49 100644
> --- a/arch/arm64/boot/dts/renesas/r8a779h0-gray-hawk-single.dts
> +++ b/arch/arm64/boot/dts/renesas/r8a779h0-gray-hawk-single.dts
> @@ -248,8 +248,7 @@ &i2c0 {
>         io_expander_a: gpio@20 {
>                 compatible = "onnn,pca9654";
>                 reg = <0x20>;
> -               interrupt-parent = <&gpio0>;
> -               interrupts = <0 IRQ_TYPE_LEVEL_LOW>;
> +               interrupts-extended = <&gpio0 0 IRQ_TYPE_LEVEL_LOW>;
>                 gpio-controller;
>                 #gpio-cells = <2>;
>                 interrupt-controller;
> diff --git a/arch/arm64/boot/dts/renesas/ulcb-kf.dtsi b/arch/arm64/boot/dts/renesas/ulcb-kf.dtsi
> index 5a5dd5ecb75e0e7c..f7330b2262b8af0c 100644
> --- a/arch/arm64/boot/dts/renesas/ulcb-kf.dtsi
> +++ b/arch/arm64/boot/dts/renesas/ulcb-kf.dtsi
> @@ -235,8 +235,7 @@ gpio_exp_74: gpio@74 {
>                 #gpio-cells = <2>;
>                 interrupt-controller;
>                 #interrupt-cells = <2>;
> -               interrupt-parent = <&gpio6>;
> -               interrupts = <8 IRQ_TYPE_EDGE_FALLING>;
> +               interrupts-extended = <&gpio6 8 IRQ_TYPE_EDGE_FALLING>;
>
>                 audio-out-off-hog {
>                         gpio-hog;
> @@ -296,8 +295,7 @@ gpio_exp_75: gpio@75 {
>                 #gpio-cells = <2>;
>                 interrupt-controller;
>                 #interrupt-cells = <2>;
> -               interrupt-parent = <&gpio6>;
> -               interrupts = <4 IRQ_TYPE_EDGE_FALLING>;
> +               interrupts-extended = <&gpio6 4 IRQ_TYPE_EDGE_FALLING>;
>         };
>  };
>
> @@ -317,8 +315,7 @@ gpio_exp_76: gpio@76 {
>                 #gpio-cells = <2>;
>                 interrupt-controller;
>                 #interrupt-cells = <2>;
> -               interrupt-parent = <&gpio7>;
> -               interrupts = <3 IRQ_TYPE_EDGE_FALLING>;
> +               interrupts-extended = <&gpio7 3 IRQ_TYPE_EDGE_FALLING>;
>         };
>
>         gpio_exp_77: gpio@77 {
> @@ -328,8 +325,7 @@ gpio_exp_77: gpio@77 {
>                 #gpio-cells = <2>;
>                 interrupt-controller;
>                 #interrupt-cells = <2>;
> -               interrupt-parent = <&gpio5>;
> -               interrupts = <9 IRQ_TYPE_EDGE_FALLING>;
> +               interrupts-extended = <&gpio5 9 IRQ_TYPE_EDGE_FALLING>;
>         };
>  };
>
> diff --git a/arch/arm64/boot/dts/renesas/white-hawk-cpu-common.dtsi b/arch/arm64/boot/dts/renesas/white-hawk-cpu-common.dtsi
> index 209cba75adec6d6c..337ba68342c475b5 100644
> --- a/arch/arm64/boot/dts/renesas/white-hawk-cpu-common.dtsi
> +++ b/arch/arm64/boot/dts/renesas/white-hawk-cpu-common.dtsi
> @@ -215,8 +215,7 @@ &i2c0 {
>         io_expander_a: gpio@20 {
>                 compatible = "onnn,pca9654";
>                 reg = <0x20>;
> -               interrupt-parent = <&gpio0>;
> -               interrupts = <0 IRQ_TYPE_LEVEL_LOW>;
> +               interrupts-extended = <&gpio0 0 IRQ_TYPE_LEVEL_LOW>;
>                 gpio-controller;
>                 #gpio-cells = <2>;
>                 interrupt-controller;
> --
> 2.34.1
>
>
diff mbox series

Patch

diff --git a/arch/arm64/boot/dts/renesas/beacon-renesom-som.dtsi b/arch/arm64/boot/dts/renesas/beacon-renesom-som.dtsi
index 5a15a956702a6be8..4a9d20249eaa9bc0 100644
--- a/arch/arm64/boot/dts/renesas/beacon-renesom-som.dtsi
+++ b/arch/arm64/boot/dts/renesas/beacon-renesom-som.dtsi
@@ -130,8 +130,7 @@  pca9654: gpio@20 {
 	pca9654_lte: gpio@21 {
 		compatible = "onnn,pca9654";
 		reg = <0x21>;
-		interrupt-parent = <&gpio5>;
-		interrupts = <25 IRQ_TYPE_EDGE_FALLING>;
+		interrupts-extended = <&gpio5 25 IRQ_TYPE_EDGE_FALLING>;
 		interrupt-controller;
 		#interrupt-cells = <2>;
 		gpio-controller;
diff --git a/arch/arm64/boot/dts/renesas/ebisu.dtsi b/arch/arm64/boot/dts/renesas/ebisu.dtsi
index 4d16b8f0eae5474b..54ebffcd82d4337b 100644
--- a/arch/arm64/boot/dts/renesas/ebisu.dtsi
+++ b/arch/arm64/boot/dts/renesas/ebisu.dtsi
@@ -392,8 +392,7 @@  io_expander: gpio@20 {
 		reg = <0x20>;
 		gpio-controller;
 		#gpio-cells = <2>;
-		interrupt-parent = <&gpio2>;
-		interrupts = <22 IRQ_TYPE_LEVEL_LOW>;
+		interrupts-extended = <&gpio2 22 IRQ_TYPE_LEVEL_LOW>;
 	};
 
 	hdmi-encoder@39 {
diff --git a/arch/arm64/boot/dts/renesas/r8a779h0-gray-hawk-single.dts b/arch/arm64/boot/dts/renesas/r8a779h0-gray-hawk-single.dts
index b1d035ca4d97a51a..58eabcc7e0e07f49 100644
--- a/arch/arm64/boot/dts/renesas/r8a779h0-gray-hawk-single.dts
+++ b/arch/arm64/boot/dts/renesas/r8a779h0-gray-hawk-single.dts
@@ -248,8 +248,7 @@  &i2c0 {
 	io_expander_a: gpio@20 {
 		compatible = "onnn,pca9654";
 		reg = <0x20>;
-		interrupt-parent = <&gpio0>;
-		interrupts = <0 IRQ_TYPE_LEVEL_LOW>;
+		interrupts-extended = <&gpio0 0 IRQ_TYPE_LEVEL_LOW>;
 		gpio-controller;
 		#gpio-cells = <2>;
 		interrupt-controller;
diff --git a/arch/arm64/boot/dts/renesas/ulcb-kf.dtsi b/arch/arm64/boot/dts/renesas/ulcb-kf.dtsi
index 5a5dd5ecb75e0e7c..f7330b2262b8af0c 100644
--- a/arch/arm64/boot/dts/renesas/ulcb-kf.dtsi
+++ b/arch/arm64/boot/dts/renesas/ulcb-kf.dtsi
@@ -235,8 +235,7 @@  gpio_exp_74: gpio@74 {
 		#gpio-cells = <2>;
 		interrupt-controller;
 		#interrupt-cells = <2>;
-		interrupt-parent = <&gpio6>;
-		interrupts = <8 IRQ_TYPE_EDGE_FALLING>;
+		interrupts-extended = <&gpio6 8 IRQ_TYPE_EDGE_FALLING>;
 
 		audio-out-off-hog {
 			gpio-hog;
@@ -296,8 +295,7 @@  gpio_exp_75: gpio@75 {
 		#gpio-cells = <2>;
 		interrupt-controller;
 		#interrupt-cells = <2>;
-		interrupt-parent = <&gpio6>;
-		interrupts = <4 IRQ_TYPE_EDGE_FALLING>;
+		interrupts-extended = <&gpio6 4 IRQ_TYPE_EDGE_FALLING>;
 	};
 };
 
@@ -317,8 +315,7 @@  gpio_exp_76: gpio@76 {
 		#gpio-cells = <2>;
 		interrupt-controller;
 		#interrupt-cells = <2>;
-		interrupt-parent = <&gpio7>;
-		interrupts = <3 IRQ_TYPE_EDGE_FALLING>;
+		interrupts-extended = <&gpio7 3 IRQ_TYPE_EDGE_FALLING>;
 	};
 
 	gpio_exp_77: gpio@77 {
@@ -328,8 +325,7 @@  gpio_exp_77: gpio@77 {
 		#gpio-cells = <2>;
 		interrupt-controller;
 		#interrupt-cells = <2>;
-		interrupt-parent = <&gpio5>;
-		interrupts = <9 IRQ_TYPE_EDGE_FALLING>;
+		interrupts-extended = <&gpio5 9 IRQ_TYPE_EDGE_FALLING>;
 	};
 };
 
diff --git a/arch/arm64/boot/dts/renesas/white-hawk-cpu-common.dtsi b/arch/arm64/boot/dts/renesas/white-hawk-cpu-common.dtsi
index 209cba75adec6d6c..337ba68342c475b5 100644
--- a/arch/arm64/boot/dts/renesas/white-hawk-cpu-common.dtsi
+++ b/arch/arm64/boot/dts/renesas/white-hawk-cpu-common.dtsi
@@ -215,8 +215,7 @@  &i2c0 {
 	io_expander_a: gpio@20 {
 		compatible = "onnn,pca9654";
 		reg = <0x20>;
-		interrupt-parent = <&gpio0>;
-		interrupts = <0 IRQ_TYPE_LEVEL_LOW>;
+		interrupts-extended = <&gpio0 0 IRQ_TYPE_LEVEL_LOW>;
 		gpio-controller;
 		#gpio-cells = <2>;
 		interrupt-controller;