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

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

Posted by Rob Herring (Arm) 1 month, 3 weeks ago

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) <robh@kernel.org>
---
 .../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
--- a/Documentation/devicetree/bindings/pci/socionext,uniphier-pcie.yaml
+++ b/Documentation/devicetree/bindings/pci/socionext,uniphier-pcie.yaml
@@ -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>;
-- 
2.51.0

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

Posted by Manivannan Sadhasivam 1 month, 1 week ago

On Mon, 15 Dec 2025 15:24:56 -0600, Rob Herring (Arm) wrote:
> 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,
-- 
Manivannan Sadhasivam <mani@kernel.org>

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

Posted by Kunihiko Hayashi 1 month, 3 weeks ago

Hi Rob,

Thank you for pointing out.

On 2025/12/16 6:24, Rob Herring (Arm) wrote:
> 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?

> 
> Signed-off-by: Rob Herring (Arm) <robh@kernel.org>
> ---
>   .../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
> --- a/Documentation/devicetree/bindings/pci/socionext,uniphier-pcie.yaml
> +++ b/Documentation/devicetree/bindings/pci/socionext,uniphier-pcie.yaml
> @@ -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>;

Thank you,

---
Best Regards
Kunihiko Hayashi

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

Posted by Rob Herring 1 month, 3 weeks ago

On Mon, Dec 15, 2025 at 7:21 PM Kunihiko Hayashi
<hayashi.kunihiko@socionext.com> wrote:
>
> Hi Rob,
>
> Thank you for pointing out.
>
> On 2025/12/16 6:24, Rob Herring (Arm) wrote:
> > 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

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

Posted by Kunihiko Hayashi 1 month, 3 weeks ago

On 2025/12/16 11:18, Rob Herring wrote:
> On Mon, Dec 15, 2025 at 7:21 PM Kunihiko Hayashi
> <hayashi.kunihiko@socionext.com> wrote:
>>
>> Hi Rob,
>>
>> Thank you for pointing out.
>>
>> On 2025/12/16 6:24, Rob Herring (Arm) wrote:
>>> 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).

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 <hayashi.kunihiko@socionext.com>

Thank you,

---
Best Regards
Kunihiko Hayashi