| Message ID | 20230604121223.9625-5-stefan.wahren@i2se.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | ARM: dts: bcm283x: Improve device-trees and bindings | expand |
On Sun, Jun 04, 2023 at 02:12:17PM +0200, Stefan Wahren wrote: > After converting the bcm2835-dma DT binding to YAML, the DT schema > checks gave warnings like: > > $nodename:0: 'dma@7e007000' does not match '^dma-controller(@.*)?$' > 'dma-channel-mask' is a required property > Unevaluated properties are not allowed ('brcm,dma-channel-mask' was unexpected) > > So fix them accordingly. > > Signed-off-by: Stefan Wahren <stefan.wahren@i2se.com> > --- > arch/arm/boot/dts/bcm2711.dtsi | 4 ++-- > arch/arm/boot/dts/bcm2835-common.dtsi | 4 ++-- > 2 files changed, 4 insertions(+), 4 deletions(-) > > diff --git a/arch/arm/boot/dts/bcm2711.dtsi b/arch/arm/boot/dts/bcm2711.dtsi > index 097e9f252235..83745672a120 100644 > --- a/arch/arm/boot/dts/bcm2711.dtsi > +++ b/arch/arm/boot/dts/bcm2711.dtsi > @@ -76,7 +76,7 @@ thermal: thermal { > }; > }; > > - dma: dma@7e007000 { > + dma: dma-controller@7e007000 { > compatible = "brcm,bcm2835-dma"; > reg = <0x7e007000 0xb00>; > interrupts = <GIC_SPI 80 IRQ_TYPE_LEVEL_HIGH>, > @@ -103,7 +103,7 @@ dma: dma@7e007000 { > "dma9", > "dma10"; > #dma-cells = <1>; > - brcm,dma-channel-mask = <0x07f5>; > + dma-channel-mask = <0x07f5>; You're breaking the ABI here. I'd think RPi users would care. You should either list both properties or just leave this as-is. You could also mark the driver "dma-channel-mask" support for stable and somewhat avoid the ABI issue. > }; > > pm: watchdog@7e100000 { > diff --git a/arch/arm/boot/dts/bcm2835-common.dtsi b/arch/arm/boot/dts/bcm2835-common.dtsi > index bb7e8f7facaf..3ba8db8eed0f 100644 > --- a/arch/arm/boot/dts/bcm2835-common.dtsi > +++ b/arch/arm/boot/dts/bcm2835-common.dtsi > @@ -8,7 +8,7 @@ / { > interrupt-parent = <&intc>; > > soc { > - dma: dma@7e007000 { > + dma: dma-controller@7e007000 { > compatible = "brcm,bcm2835-dma"; > reg = <0x7e007000 0xf00>; > interrupts = <1 16>, > @@ -46,7 +46,7 @@ dma: dma@7e007000 { > "dma14", > "dma-shared-all"; > #dma-cells = <1>; > - brcm,dma-channel-mask = <0x7f35>; > + dma-channel-mask = <0x7f35>; > }; > > intc: interrupt-controller@7e00b200 { > -- > 2.34.1 >
diff --git a/arch/arm/boot/dts/bcm2711.dtsi b/arch/arm/boot/dts/bcm2711.dtsi index 097e9f252235..83745672a120 100644 --- a/arch/arm/boot/dts/bcm2711.dtsi +++ b/arch/arm/boot/dts/bcm2711.dtsi @@ -76,7 +76,7 @@ thermal: thermal { }; }; - dma: dma@7e007000 { + dma: dma-controller@7e007000 { compatible = "brcm,bcm2835-dma"; reg = <0x7e007000 0xb00>; interrupts = <GIC_SPI 80 IRQ_TYPE_LEVEL_HIGH>, @@ -103,7 +103,7 @@ dma: dma@7e007000 { "dma9", "dma10"; #dma-cells = <1>; - brcm,dma-channel-mask = <0x07f5>; + dma-channel-mask = <0x07f5>; }; pm: watchdog@7e100000 { diff --git a/arch/arm/boot/dts/bcm2835-common.dtsi b/arch/arm/boot/dts/bcm2835-common.dtsi index bb7e8f7facaf..3ba8db8eed0f 100644 --- a/arch/arm/boot/dts/bcm2835-common.dtsi +++ b/arch/arm/boot/dts/bcm2835-common.dtsi @@ -8,7 +8,7 @@ / { interrupt-parent = <&intc>; soc { - dma: dma@7e007000 { + dma: dma-controller@7e007000 { compatible = "brcm,bcm2835-dma"; reg = <0x7e007000 0xf00>; interrupts = <1 16>, @@ -46,7 +46,7 @@ dma: dma@7e007000 { "dma14", "dma-shared-all"; #dma-cells = <1>; - brcm,dma-channel-mask = <0x7f35>; + dma-channel-mask = <0x7f35>; }; intc: interrupt-controller@7e00b200 {
After converting the bcm2835-dma DT binding to YAML, the DT schema checks gave warnings like: $nodename:0: 'dma@7e007000' does not match '^dma-controller(@.*)?$' 'dma-channel-mask' is a required property Unevaluated properties are not allowed ('brcm,dma-channel-mask' was unexpected) So fix them accordingly. Signed-off-by: Stefan Wahren <stefan.wahren@i2se.com> --- arch/arm/boot/dts/bcm2711.dtsi | 4 ++-- arch/arm/boot/dts/bcm2835-common.dtsi | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-)