| Message ID | f51de53cb003f850751e13fdbddea64ad942ee7b.1728045620.git.geert+renesas@glider.be (mailing list archive) |
|---|---|
| State | Mainlined |
| Commit | 1d7d6633d70515bd1bfc83a270a9a5d18c21af36 |
| Delegated to: | Geert Uytterhoeven |
| Headers | show |
| Series | renesas: dts: Use interrupts-extended | expand |
On 2024-10-04 14:52:43 +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/arm/boot/dts/renesas/emev2-kzm9d.dts | 3 +-- > arch/arm/boot/dts/renesas/r8a73a4-ape6evm.dts | 3 +-- > arch/arm/boot/dts/renesas/r8a7778-bockw.dts | 3 +-- > arch/arm/boot/dts/renesas/r8a7779-marzen.dts | 3 +-- > arch/arm/boot/dts/renesas/r8a7792-blanche.dts | 3 +-- > arch/arm/boot/dts/renesas/r8a7792-wheat.dts | 3 +-- > arch/arm/boot/dts/renesas/sh73a0-kzm9g.dts | 3 +-- > 7 files changed, 7 insertions(+), 14 deletions(-) > > diff --git a/arch/arm/boot/dts/renesas/emev2-kzm9d.dts b/arch/arm/boot/dts/renesas/emev2-kzm9d.dts > index 89495dd373585e94..c624fd61578b3b72 100644 > --- a/arch/arm/boot/dts/renesas/emev2-kzm9d.dts > +++ b/arch/arm/boot/dts/renesas/emev2-kzm9d.dts > @@ -83,8 +83,7 @@ ethernet@20000000 { > compatible = "smsc,lan9221", "smsc,lan9115"; > reg = <0x20000000 0x10000>; > phy-mode = "mii"; > - interrupt-parent = <&gpio0>; > - interrupts = <1 IRQ_TYPE_EDGE_RISING>; > + interrupts-extended = <&gpio0 1 IRQ_TYPE_EDGE_RISING>; > reg-io-width = <4>; > smsc,irq-active-high; > smsc,irq-push-pull; > diff --git a/arch/arm/boot/dts/renesas/r8a73a4-ape6evm.dts b/arch/arm/boot/dts/renesas/r8a73a4-ape6evm.dts > index ae656ee27124c745..94a39ffc4297b788 100644 > --- a/arch/arm/boot/dts/renesas/r8a73a4-ape6evm.dts > +++ b/arch/arm/boot/dts/renesas/r8a73a4-ape6evm.dts > @@ -207,8 +207,7 @@ partition@80000 { > ethernet@8000000 { > compatible = "smsc,lan9220", "smsc,lan9115"; > reg = <0x08000000 0x1000>; > - interrupt-parent = <&irqc1>; > - interrupts = <8 IRQ_TYPE_LEVEL_HIGH>; > + interrupts-extended = <&irqc1 8 IRQ_TYPE_LEVEL_HIGH>; > phy-mode = "mii"; > reg-io-width = <4>; > smsc,irq-active-high; > diff --git a/arch/arm/boot/dts/renesas/r8a7778-bockw.dts b/arch/arm/boot/dts/renesas/r8a7778-bockw.dts > index a3f9d74e8877b72b..e27d7dd8c869bb2d 100644 > --- a/arch/arm/boot/dts/renesas/r8a7778-bockw.dts > +++ b/arch/arm/boot/dts/renesas/r8a7778-bockw.dts > @@ -96,8 +96,7 @@ ethernet@18300000 { > reg = <0x18300000 0x1000>; > > phy-mode = "mii"; > - interrupt-parent = <&irqpin>; > - interrupts = <0 IRQ_TYPE_EDGE_FALLING>; > + interrupts-extended = <&irqpin 0 IRQ_TYPE_EDGE_FALLING>; > reg-io-width = <4>; > vddvario-supply = <&fixedregulator3v3>; > vdd33a-supply = <&fixedregulator3v3>; > diff --git a/arch/arm/boot/dts/renesas/r8a7779-marzen.dts b/arch/arm/boot/dts/renesas/r8a7779-marzen.dts > index fec08562d12c1813..9793d8781d6e9425 100644 > --- a/arch/arm/boot/dts/renesas/r8a7779-marzen.dts > +++ b/arch/arm/boot/dts/renesas/r8a7779-marzen.dts > @@ -261,8 +261,7 @@ ethernet@18000000 { > pinctrl-names = "default"; > > phy-mode = "mii"; > - interrupt-parent = <&irqpin0>; > - interrupts = <1 IRQ_TYPE_EDGE_FALLING>; > + interrupts-extended = <&irqpin0 1 IRQ_TYPE_EDGE_FALLING>; > smsc,irq-push-pull; > reg-io-width = <4>; > vddvario-supply = <&fixedregulator3v3>; > diff --git a/arch/arm/boot/dts/renesas/r8a7792-blanche.dts b/arch/arm/boot/dts/renesas/r8a7792-blanche.dts > index 540a9ad28f28ac1a..7eefa227d65514a9 100644 > --- a/arch/arm/boot/dts/renesas/r8a7792-blanche.dts > +++ b/arch/arm/boot/dts/renesas/r8a7792-blanche.dts > @@ -224,8 +224,7 @@ ethernet@18000000 { > compatible = "smsc,lan89218", "smsc,lan9115"; > reg = <0x18000000 0x100>; > phy-mode = "mii"; > - interrupt-parent = <&irqc>; > - interrupts = <0 IRQ_TYPE_EDGE_FALLING>; > + interrupts-extended = <&irqc 0 IRQ_TYPE_EDGE_FALLING>; > smsc,irq-push-pull; > reg-io-width = <4>; > vddvario-supply = <&d3_3v>; > diff --git a/arch/arm/boot/dts/renesas/r8a7792-wheat.dts b/arch/arm/boot/dts/renesas/r8a7792-wheat.dts > index 000f21a2a8630a8e..bfc780f7e396b408 100644 > --- a/arch/arm/boot/dts/renesas/r8a7792-wheat.dts > +++ b/arch/arm/boot/dts/renesas/r8a7792-wheat.dts > @@ -115,8 +115,7 @@ ethernet@18000000 { > compatible = "smsc,lan89218", "smsc,lan9115"; > reg = <0x18000000 0x100>; > phy-mode = "mii"; > - interrupt-parent = <&irqc>; > - interrupts = <0 IRQ_TYPE_EDGE_FALLING>; > + interrupts-extended = <&irqc 0 IRQ_TYPE_EDGE_FALLING>; > smsc,irq-push-pull; > smsc,save-mac-address; > reg-io-width = <4>; > diff --git a/arch/arm/boot/dts/renesas/sh73a0-kzm9g.dts b/arch/arm/boot/dts/renesas/sh73a0-kzm9g.dts > index 98897f710063a91b..15d89c20618a16b7 100644 > --- a/arch/arm/boot/dts/renesas/sh73a0-kzm9g.dts > +++ b/arch/arm/boot/dts/renesas/sh73a0-kzm9g.dts > @@ -172,8 +172,7 @@ ethernet@10000000 { > compatible = "smsc,lan9221", "smsc,lan9115"; > reg = <0x10000000 0x100>; > phy-mode = "mii"; > - interrupt-parent = <&irqpin0>; > - interrupts = <3 IRQ_TYPE_EDGE_FALLING>; > + interrupts-extended = <&irqpin0 3 IRQ_TYPE_EDGE_FALLING>; > reg-io-width = <4>; > smsc,irq-push-pull; > smsc,save-mac-address; > -- > 2.34.1 > >
On Fri, Oct 4, 2024 at 2:30 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/arm/boot/dts/renesas/emev2-kzm9d.dts | 3 +-- > arch/arm/boot/dts/renesas/r8a73a4-ape6evm.dts | 3 +-- > arch/arm/boot/dts/renesas/r8a7778-bockw.dts | 3 +-- > arch/arm/boot/dts/renesas/r8a7779-marzen.dts | 3 +-- > arch/arm/boot/dts/renesas/r8a7792-blanche.dts | 3 +-- > arch/arm/boot/dts/renesas/r8a7792-wheat.dts | 3 +-- > arch/arm/boot/dts/renesas/sh73a0-kzm9g.dts | 3 +-- > 7 files changed, 7 insertions(+), 14 deletions(-) > Reviewed-by: Lad Prabhakar <prabhakar.mahadev-lad.rj@bp.renesas.com> Cheers, Prabhakar > diff --git a/arch/arm/boot/dts/renesas/emev2-kzm9d.dts b/arch/arm/boot/dts/renesas/emev2-kzm9d.dts > index 89495dd373585e94..c624fd61578b3b72 100644 > --- a/arch/arm/boot/dts/renesas/emev2-kzm9d.dts > +++ b/arch/arm/boot/dts/renesas/emev2-kzm9d.dts > @@ -83,8 +83,7 @@ ethernet@20000000 { > compatible = "smsc,lan9221", "smsc,lan9115"; > reg = <0x20000000 0x10000>; > phy-mode = "mii"; > - interrupt-parent = <&gpio0>; > - interrupts = <1 IRQ_TYPE_EDGE_RISING>; > + interrupts-extended = <&gpio0 1 IRQ_TYPE_EDGE_RISING>; > reg-io-width = <4>; > smsc,irq-active-high; > smsc,irq-push-pull; > diff --git a/arch/arm/boot/dts/renesas/r8a73a4-ape6evm.dts b/arch/arm/boot/dts/renesas/r8a73a4-ape6evm.dts > index ae656ee27124c745..94a39ffc4297b788 100644 > --- a/arch/arm/boot/dts/renesas/r8a73a4-ape6evm.dts > +++ b/arch/arm/boot/dts/renesas/r8a73a4-ape6evm.dts > @@ -207,8 +207,7 @@ partition@80000 { > ethernet@8000000 { > compatible = "smsc,lan9220", "smsc,lan9115"; > reg = <0x08000000 0x1000>; > - interrupt-parent = <&irqc1>; > - interrupts = <8 IRQ_TYPE_LEVEL_HIGH>; > + interrupts-extended = <&irqc1 8 IRQ_TYPE_LEVEL_HIGH>; > phy-mode = "mii"; > reg-io-width = <4>; > smsc,irq-active-high; > diff --git a/arch/arm/boot/dts/renesas/r8a7778-bockw.dts b/arch/arm/boot/dts/renesas/r8a7778-bockw.dts > index a3f9d74e8877b72b..e27d7dd8c869bb2d 100644 > --- a/arch/arm/boot/dts/renesas/r8a7778-bockw.dts > +++ b/arch/arm/boot/dts/renesas/r8a7778-bockw.dts > @@ -96,8 +96,7 @@ ethernet@18300000 { > reg = <0x18300000 0x1000>; > > phy-mode = "mii"; > - interrupt-parent = <&irqpin>; > - interrupts = <0 IRQ_TYPE_EDGE_FALLING>; > + interrupts-extended = <&irqpin 0 IRQ_TYPE_EDGE_FALLING>; > reg-io-width = <4>; > vddvario-supply = <&fixedregulator3v3>; > vdd33a-supply = <&fixedregulator3v3>; > diff --git a/arch/arm/boot/dts/renesas/r8a7779-marzen.dts b/arch/arm/boot/dts/renesas/r8a7779-marzen.dts > index fec08562d12c1813..9793d8781d6e9425 100644 > --- a/arch/arm/boot/dts/renesas/r8a7779-marzen.dts > +++ b/arch/arm/boot/dts/renesas/r8a7779-marzen.dts > @@ -261,8 +261,7 @@ ethernet@18000000 { > pinctrl-names = "default"; > > phy-mode = "mii"; > - interrupt-parent = <&irqpin0>; > - interrupts = <1 IRQ_TYPE_EDGE_FALLING>; > + interrupts-extended = <&irqpin0 1 IRQ_TYPE_EDGE_FALLING>; > smsc,irq-push-pull; > reg-io-width = <4>; > vddvario-supply = <&fixedregulator3v3>; > diff --git a/arch/arm/boot/dts/renesas/r8a7792-blanche.dts b/arch/arm/boot/dts/renesas/r8a7792-blanche.dts > index 540a9ad28f28ac1a..7eefa227d65514a9 100644 > --- a/arch/arm/boot/dts/renesas/r8a7792-blanche.dts > +++ b/arch/arm/boot/dts/renesas/r8a7792-blanche.dts > @@ -224,8 +224,7 @@ ethernet@18000000 { > compatible = "smsc,lan89218", "smsc,lan9115"; > reg = <0x18000000 0x100>; > phy-mode = "mii"; > - interrupt-parent = <&irqc>; > - interrupts = <0 IRQ_TYPE_EDGE_FALLING>; > + interrupts-extended = <&irqc 0 IRQ_TYPE_EDGE_FALLING>; > smsc,irq-push-pull; > reg-io-width = <4>; > vddvario-supply = <&d3_3v>; > diff --git a/arch/arm/boot/dts/renesas/r8a7792-wheat.dts b/arch/arm/boot/dts/renesas/r8a7792-wheat.dts > index 000f21a2a8630a8e..bfc780f7e396b408 100644 > --- a/arch/arm/boot/dts/renesas/r8a7792-wheat.dts > +++ b/arch/arm/boot/dts/renesas/r8a7792-wheat.dts > @@ -115,8 +115,7 @@ ethernet@18000000 { > compatible = "smsc,lan89218", "smsc,lan9115"; > reg = <0x18000000 0x100>; > phy-mode = "mii"; > - interrupt-parent = <&irqc>; > - interrupts = <0 IRQ_TYPE_EDGE_FALLING>; > + interrupts-extended = <&irqc 0 IRQ_TYPE_EDGE_FALLING>; > smsc,irq-push-pull; > smsc,save-mac-address; > reg-io-width = <4>; > diff --git a/arch/arm/boot/dts/renesas/sh73a0-kzm9g.dts b/arch/arm/boot/dts/renesas/sh73a0-kzm9g.dts > index 98897f710063a91b..15d89c20618a16b7 100644 > --- a/arch/arm/boot/dts/renesas/sh73a0-kzm9g.dts > +++ b/arch/arm/boot/dts/renesas/sh73a0-kzm9g.dts > @@ -172,8 +172,7 @@ ethernet@10000000 { > compatible = "smsc,lan9221", "smsc,lan9115"; > reg = <0x10000000 0x100>; > phy-mode = "mii"; > - interrupt-parent = <&irqpin0>; > - interrupts = <3 IRQ_TYPE_EDGE_FALLING>; > + interrupts-extended = <&irqpin0 3 IRQ_TYPE_EDGE_FALLING>; > reg-io-width = <4>; > smsc,irq-push-pull; > smsc,save-mac-address; > -- > 2.34.1 > >
diff --git a/arch/arm/boot/dts/renesas/emev2-kzm9d.dts b/arch/arm/boot/dts/renesas/emev2-kzm9d.dts index 89495dd373585e94..c624fd61578b3b72 100644 --- a/arch/arm/boot/dts/renesas/emev2-kzm9d.dts +++ b/arch/arm/boot/dts/renesas/emev2-kzm9d.dts @@ -83,8 +83,7 @@ ethernet@20000000 { compatible = "smsc,lan9221", "smsc,lan9115"; reg = <0x20000000 0x10000>; phy-mode = "mii"; - interrupt-parent = <&gpio0>; - interrupts = <1 IRQ_TYPE_EDGE_RISING>; + interrupts-extended = <&gpio0 1 IRQ_TYPE_EDGE_RISING>; reg-io-width = <4>; smsc,irq-active-high; smsc,irq-push-pull; diff --git a/arch/arm/boot/dts/renesas/r8a73a4-ape6evm.dts b/arch/arm/boot/dts/renesas/r8a73a4-ape6evm.dts index ae656ee27124c745..94a39ffc4297b788 100644 --- a/arch/arm/boot/dts/renesas/r8a73a4-ape6evm.dts +++ b/arch/arm/boot/dts/renesas/r8a73a4-ape6evm.dts @@ -207,8 +207,7 @@ partition@80000 { ethernet@8000000 { compatible = "smsc,lan9220", "smsc,lan9115"; reg = <0x08000000 0x1000>; - interrupt-parent = <&irqc1>; - interrupts = <8 IRQ_TYPE_LEVEL_HIGH>; + interrupts-extended = <&irqc1 8 IRQ_TYPE_LEVEL_HIGH>; phy-mode = "mii"; reg-io-width = <4>; smsc,irq-active-high; diff --git a/arch/arm/boot/dts/renesas/r8a7778-bockw.dts b/arch/arm/boot/dts/renesas/r8a7778-bockw.dts index a3f9d74e8877b72b..e27d7dd8c869bb2d 100644 --- a/arch/arm/boot/dts/renesas/r8a7778-bockw.dts +++ b/arch/arm/boot/dts/renesas/r8a7778-bockw.dts @@ -96,8 +96,7 @@ ethernet@18300000 { reg = <0x18300000 0x1000>; phy-mode = "mii"; - interrupt-parent = <&irqpin>; - interrupts = <0 IRQ_TYPE_EDGE_FALLING>; + interrupts-extended = <&irqpin 0 IRQ_TYPE_EDGE_FALLING>; reg-io-width = <4>; vddvario-supply = <&fixedregulator3v3>; vdd33a-supply = <&fixedregulator3v3>; diff --git a/arch/arm/boot/dts/renesas/r8a7779-marzen.dts b/arch/arm/boot/dts/renesas/r8a7779-marzen.dts index fec08562d12c1813..9793d8781d6e9425 100644 --- a/arch/arm/boot/dts/renesas/r8a7779-marzen.dts +++ b/arch/arm/boot/dts/renesas/r8a7779-marzen.dts @@ -261,8 +261,7 @@ ethernet@18000000 { pinctrl-names = "default"; phy-mode = "mii"; - interrupt-parent = <&irqpin0>; - interrupts = <1 IRQ_TYPE_EDGE_FALLING>; + interrupts-extended = <&irqpin0 1 IRQ_TYPE_EDGE_FALLING>; smsc,irq-push-pull; reg-io-width = <4>; vddvario-supply = <&fixedregulator3v3>; diff --git a/arch/arm/boot/dts/renesas/r8a7792-blanche.dts b/arch/arm/boot/dts/renesas/r8a7792-blanche.dts index 540a9ad28f28ac1a..7eefa227d65514a9 100644 --- a/arch/arm/boot/dts/renesas/r8a7792-blanche.dts +++ b/arch/arm/boot/dts/renesas/r8a7792-blanche.dts @@ -224,8 +224,7 @@ ethernet@18000000 { compatible = "smsc,lan89218", "smsc,lan9115"; reg = <0x18000000 0x100>; phy-mode = "mii"; - interrupt-parent = <&irqc>; - interrupts = <0 IRQ_TYPE_EDGE_FALLING>; + interrupts-extended = <&irqc 0 IRQ_TYPE_EDGE_FALLING>; smsc,irq-push-pull; reg-io-width = <4>; vddvario-supply = <&d3_3v>; diff --git a/arch/arm/boot/dts/renesas/r8a7792-wheat.dts b/arch/arm/boot/dts/renesas/r8a7792-wheat.dts index 000f21a2a8630a8e..bfc780f7e396b408 100644 --- a/arch/arm/boot/dts/renesas/r8a7792-wheat.dts +++ b/arch/arm/boot/dts/renesas/r8a7792-wheat.dts @@ -115,8 +115,7 @@ ethernet@18000000 { compatible = "smsc,lan89218", "smsc,lan9115"; reg = <0x18000000 0x100>; phy-mode = "mii"; - interrupt-parent = <&irqc>; - interrupts = <0 IRQ_TYPE_EDGE_FALLING>; + interrupts-extended = <&irqc 0 IRQ_TYPE_EDGE_FALLING>; smsc,irq-push-pull; smsc,save-mac-address; reg-io-width = <4>; diff --git a/arch/arm/boot/dts/renesas/sh73a0-kzm9g.dts b/arch/arm/boot/dts/renesas/sh73a0-kzm9g.dts index 98897f710063a91b..15d89c20618a16b7 100644 --- a/arch/arm/boot/dts/renesas/sh73a0-kzm9g.dts +++ b/arch/arm/boot/dts/renesas/sh73a0-kzm9g.dts @@ -172,8 +172,7 @@ ethernet@10000000 { compatible = "smsc,lan9221", "smsc,lan9115"; reg = <0x10000000 0x100>; phy-mode = "mii"; - interrupt-parent = <&irqpin0>; - interrupts = <3 IRQ_TYPE_EDGE_FALLING>; + interrupts-extended = <&irqpin0 3 IRQ_TYPE_EDGE_FALLING>; reg-io-width = <4>; smsc,irq-push-pull; smsc,save-mac-address;
Use the more concise interrupts-extended property to fully describe the interrupts. Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be> --- arch/arm/boot/dts/renesas/emev2-kzm9d.dts | 3 +-- arch/arm/boot/dts/renesas/r8a73a4-ape6evm.dts | 3 +-- arch/arm/boot/dts/renesas/r8a7778-bockw.dts | 3 +-- arch/arm/boot/dts/renesas/r8a7779-marzen.dts | 3 +-- arch/arm/boot/dts/renesas/r8a7792-blanche.dts | 3 +-- arch/arm/boot/dts/renesas/r8a7792-wheat.dts | 3 +-- arch/arm/boot/dts/renesas/sh73a0-kzm9g.dts | 3 +-- 7 files changed, 7 insertions(+), 14 deletions(-)