| Message ID | 20210701132118.759454-1-sudeep.holla@arm.com (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | 82a1c67554dff610d6be4e1982c425717b3c6a23 |
| Headers | show |
| Series | [v2] ARM: dts: versatile: Fix up interrupt controller node names | expand |
Hello: This patch was applied to soc/soc.git (refs/heads/arm/fixes): On Thu, 1 Jul 2021 14:21:18 +0100 you wrote: > Once the new schema interrupt-controller/arm,vic.yaml is added, we get > the below warnings: > > arch/arm/boot/dts/versatile-ab.dt.yaml: > intc@10140000: $nodename:0: 'intc@10140000' does not match > '^interrupt-controller(@[0-9a-f,]+)*$' > > [...] Here is the summary with links: - [v2] ARM: dts: versatile: Fix up interrupt controller node names https://git.kernel.org/soc/soc/c/82a1c67554df You are awesome, thank you! -- Deet-doot-dot, I am a bot. https://korg.docs.kernel.org/patchwork/pwbot.html
From: Arnd Bergmann <arnd@arndb.de> On Thu, 1 Jul 2021 14:21:18 +0100, Sudeep Holla wrote: > Once the new schema interrupt-controller/arm,vic.yaml is added, we get > the below warnings: > > arch/arm/boot/dts/versatile-ab.dt.yaml: > intc@10140000: $nodename:0: 'intc@10140000' does not match > '^interrupt-controller(@[0-9a-f,]+)*$' > > [...] Applied to arm/fixes, thanks! [1/1] ARM: dts: versatile: Fix up interrupt controller node names commit: 82a1c67554dff610d6be4e1982c425717b3c6a23 Arnd
diff --git a/arch/arm/boot/dts/versatile-ab.dts b/arch/arm/boot/dts/versatile-ab.dts index 37bd41ff8dff..151c0220047d 100644 --- a/arch/arm/boot/dts/versatile-ab.dts +++ b/arch/arm/boot/dts/versatile-ab.dts @@ -195,16 +195,15 @@ amba { #size-cells = <1>; ranges; - vic: intc@10140000 { + vic: interrupt-controller@10140000 { compatible = "arm,versatile-vic"; interrupt-controller; #interrupt-cells = <1>; reg = <0x10140000 0x1000>; - clear-mask = <0xffffffff>; valid-mask = <0xffffffff>; }; - sic: intc@10003000 { + sic: interrupt-controller@10003000 { compatible = "arm,versatile-sic"; interrupt-controller; #interrupt-cells = <1>; diff --git a/arch/arm/boot/dts/versatile-pb.dts b/arch/arm/boot/dts/versatile-pb.dts index 06a0fdf24026..e7e751a858d8 100644 --- a/arch/arm/boot/dts/versatile-pb.dts +++ b/arch/arm/boot/dts/versatile-pb.dts @@ -7,7 +7,7 @@ / { amba { /* The Versatile PB is using more SIC IRQ lines than the AB */ - sic: intc@10003000 { + sic: interrupt-controller@10003000 { clear-mask = <0xffffffff>; /* * Valid interrupt lines mask according to
Once the new schema interrupt-controller/arm,vic.yaml is added, we get the below warnings: arch/arm/boot/dts/versatile-ab.dt.yaml: intc@10140000: $nodename:0: 'intc@10140000' does not match '^interrupt-controller(@[0-9a-f,]+)*$' arch/arm/boot/dts/versatile-ab.dt.yaml: intc@10140000: 'clear-mask' does not match any of the regexes Fix the node names for the interrupt controller to conform to the standard node name interrupt-controller@.. Also drop invalid clear-mask property. Acked-by: Linus Walleij <linus.walleij@linaro.org> Signed-off-by: Sudeep Holla <sudeep.holla@arm.com> --- arch/arm/boot/dts/versatile-ab.dts | 5 ++--- arch/arm/boot/dts/versatile-pb.dts | 2 +- 2 files changed, 3 insertions(+), 4 deletions(-) Hi SoC people, please apply this directly to DTS fixes, Linus W doesn't have no other Versatile DTS changes coming right now, so sending it to you directly. v1->v2: - Fix the build error reported by kbuild-bot which I missed as I had assumed multi_v5_defconfig to include versatile :(