| From 017e778c4d3ec70a44fec329eaf96ee4d88b8e64 Mon Sep 17 00:00:00 2001 |
| From: Sasha Levin <sashal@kernel.org> |
| Date: Thu, 1 Jul 2021 14:21:18 +0100 |
| Subject: ARM: dts: versatile: Fix up interrupt controller node names |
| |
| From: Sudeep Holla <sudeep.holla@arm.com> |
| |
| [ Upstream commit 82a1c67554dff610d6be4e1982c425717b3c6a23 ] |
| |
| 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. |
| |
| Signed-off-by: Sudeep Holla <sudeep.holla@arm.com> |
| Acked-by: Linus Walleij <linus.walleij@linaro.org> |
| Link: https://lore.kernel.org/r/20210701132118.759454-1-sudeep.holla@arm.com' |
| Signed-off-by: Arnd Bergmann <arnd@arndb.de> |
| Signed-off-by: Sasha Levin <sashal@kernel.org> |
| --- |
| arch/arm/boot/dts/versatile-ab.dts | 5 ++--- |
| arch/arm/boot/dts/versatile-pb.dts | 2 +- |
| 2 files changed, 3 insertions(+), 4 deletions(-) |
| |
| --- a/arch/arm/boot/dts/versatile-ab.dts |
| +++ b/arch/arm/boot/dts/versatile-ab.dts |
| @@ -154,16 +154,15 @@ |
| #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>; |
| --- a/arch/arm/boot/dts/versatile-pb.dts |
| +++ b/arch/arm/boot/dts/versatile-pb.dts |
| @@ -6,7 +6,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 |
