Skip to contentSkip to conversation

dt-bindings: PCI: socionext,uniphier-pcie: Fix interrupt controller node name

PATCH Applied Rob Herring (Arm) 3 participants 5 messages Dec 15, 2025 – Dec 30, 2025

Subsystems (5)
Device tree bindings PCI PCI native host bridge and endpoint drivers Arm/uniphier architecture +1 more subsystems
lore
Share & tools
lore

Rob Herring (Arm)

author maintainer
#0 lore raw

PATCH 1/1 dt-bindings: PCI: socionext,uniphier-pcie: Fix interrupt controller node name

The child node name in use by .dts files and the driver is "legacy-interrupt-controller", not "interrupt-controller".

Signed-off-by Rob Herring (Arm) <[email protected]>
---
 .../devicetree/bindings/pci/socionext,uniphier-pcie.yaml      | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
Documentation/devicetree/bindings/pci/socionext,uniphier-pcie.yaml +2 -2
index c07b0ed51613..8a2f1eef51bd 100644
@@ -51,7 +51,7 @@ properties:
   phy-names:
     const: pcie-phy
 
-  interrupt-controller:
+  legacy-interrupt-controller:
     type: object
     additionalProperties: false
 

@@ -111,7 +111,7 @@ examples:
                         <0 0 0  3  &pcie_intc 2>,
                         <0 0 0  4  &pcie_intc 3>;
 
-        pcie_intc: interrupt-controller {
+        pcie_intc: legacy-interrupt-controller {
             #address-cells = <0>;
             interrupt-controller;
             #interrupt-cells = <1>;
Signature · 1 line
2.51.0
maintainer
#1 lore raw

Hi Rob,

Thank you for pointing out.

Quoted 2 lines · Rob Herring (Arm)

The child node name in use by .dts files and the driver is "legacy-interrupt-controller", not "interrupt-controller".

After your change commit bcd7ec2cd720 were merged, it was a long time before I realized I needed to fix it.

"interrupt-controller" is included in the list of Generic Names Recommendation. Would it be better to apply (i.e. restore) this, or fix the PCI driver and .dts?

Quoted 22 lines
Signed-off-by Rob Herring (Arm) <[email protected]>
---
  .../devicetree/bindings/pci/socionext,uniphier-pcie.yaml      | 4 ++--
  1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Documentation/devicetree/bindings/pci/socionext,uniphier-pcie.yaml b/Documentation/devicetree/bindings/pci/socionext,uniphier-pcie.yaml index c07b0ed51613..8a2f1eef51bd 100644

Documentation/devicetree/bindings/pci/socionext,uniphier-pcie.yaml +1 -1
@@ -51,7 +51,7 @@ properties:
    phy-names:
      const: pcie-phy
 
-  interrupt-controller:
+  legacy-interrupt-controller:
      type: object
      additionalProperties: false

Documentation/devicetree/bindings/pci/socionext,uniphier-pcie.yaml examples: · line 117

Quoted 8 lines
Documentation/devicetree/bindings/pci/socionext,uniphier-pcie.yaml +1 -1
@@ -111,7 +111,7 @@ examples:
                          <0 0 0  3  &pcie_intc 2>,
                          <0 0 0  4  &pcie_intc 3>;
 
-        pcie_intc: interrupt-controller {
+        pcie_intc: legacy-interrupt-controller {
              #address-cells = <0>;
              interrupt-controller;
              #interrupt-cells = <1>;

Thank you,

---
Best Regards
Kunihiko Hayashi

author maintainer
#2 lore raw
Quoted 6 lines · Kunihiko Hayashi

Hi Rob,

Thank you for pointing out.

On 2025/12/16 6:24, Rob Herring (Arm) wrote:

Quoted 8 lines
Quoted 2 lines

The child node name in use by .dts files and the driver is "legacy-interrupt-controller", not "interrupt-controller".

After your change commit bcd7ec2cd720 were merged, it was a long time before I realized I needed to fix it.

"interrupt-controller" is included in the list of Generic Names Recommendation. Would it be better to apply (i.e. restore) this, or fix the PCI driver and .dts?

It's an ABI. So we are stuck with it or have to support both names in the driver forever (and backport the driver change).

Rob

maintainer Reviewed-by
#3 lore raw
Quoted 13 lines · Rob Herring
Quoted 11 lines · Kunihiko Hayashi

Hi Rob,

Thank you for pointing out.

Quoted 2 lines · Rob Herring (Arm)

The child node name in use by .dts files and the driver is "legacy-interrupt-controller", not "interrupt-controller".

After your change commit bcd7ec2cd720 were merged, it was a long time before I realized I needed to fix it.

Quoted 6 lines
Quoted 3 lines

"interrupt-controller" is included in the list of Generic Names Recommendation. Would it be better to apply (i.e. restore) this, or fix the PCI driver and .dts?

It's an ABI. So we are stuck with it or have to support both names in the driver forever (and backport the driver change).

I understand.
If allowing "interrupt-controller", should allow both names in the driver and bindings.

At this time, it's preferable to align the bindings definition to remove mismatch warnings.

Reviewed-by Kunihiko Hayashi <[email protected]>

Thank you,

---
Best Regards
Kunihiko Hayashi

Applied
#4 lore raw
In reply to Rob Herring (Arm)
Quoted 4 lines · Rob Herring (Arm)

The child node name in use by .dts files and the driver is "legacy-interrupt-controller", not "interrupt-controller".

Applied, thanks!

[1/1] dt-bindings: PCI: socionext,uniphier-pcie: Fix interrupt controller node name

      commit: 2cca8d79709e1debd27da5dcae2abc859f41db70

Best regards,

Signature · 1 line
Manivannan Sadhasivam <[email protected]>