Commit ac5fe2e6 authored by Rob Herring's avatar Rob Herring

ARM: dts: sunxi: Fix dtc 'dma-ranges' warnings

'#address-cells' and '#size-cells' are needed in the same node (for the
child bus) as 'dma-ranges' in order to parse it. The kernel is more lax
and will walk up the tree to get the properties from a parent node, but
it's better to be explicit. dtc now does checks on 'dma-ranges' and is
more strict:

arch/arm/boot/dts/sun5i.dtsi:189.4-52: Warning (dma_ranges_format): \
/soc/dram-controller@1c01000:dma-ranges: "dma-ranges" property has invalid length (12 bytes) (parent #address-cells == 1, child #address-cells == 2, #size-cells == 1)
arch/arm/boot/dts/sun8i-r40.dtsi:742.4-52: Warning (dma_ranges_format): \
/soc/dram-controller@1c62000:dma-ranges: "dma-ranges" property has invalid length (12 bytes) (parent #address-cells == 1, child #address-cells == 2, #size-cells == 1)
arch/arm/boot/dts/sunxi-h3-h5.dtsi:563.4-52: Warning (dma_ranges_format): \
/soc/dram-controller@1c62000:dma-ranges: "dma-ranges" property has invalid length (12 bytes) (parent #address-cells == 1, child #address-cells == 2, #size-cells == 1)

Cc: Chen-Yu Tsai <wens@csie.org>
Acked-by: default avatarMaxime Ripard <mripard@kernel.org>
Signed-off-by: default avatarRob Herring <robh@kernel.org>
parent d047cd8a
...@@ -186,6 +186,8 @@ mbus: dram-controller@1c01000 { ...@@ -186,6 +186,8 @@ mbus: dram-controller@1c01000 {
compatible = "allwinner,sun5i-a13-mbus"; compatible = "allwinner,sun5i-a13-mbus";
reg = <0x01c01000 0x1000>; reg = <0x01c01000 0x1000>;
clocks = <&ccu CLK_MBUS>; clocks = <&ccu CLK_MBUS>;
#address-cells = <1>;
#size-cells = <1>;
dma-ranges = <0x00000000 0x40000000 0x20000000>; dma-ranges = <0x00000000 0x40000000 0x20000000>;
#interconnect-cells = <1>; #interconnect-cells = <1>;
}; };
......
...@@ -739,6 +739,8 @@ mbus: dram-controller@1c62000 { ...@@ -739,6 +739,8 @@ mbus: dram-controller@1c62000 {
compatible = "allwinner,sun8i-r40-mbus"; compatible = "allwinner,sun8i-r40-mbus";
reg = <0x01c62000 0x1000>; reg = <0x01c62000 0x1000>;
clocks = <&ccu 155>; clocks = <&ccu 155>;
#address-cells = <1>;
#size-cells = <1>;
dma-ranges = <0x00000000 0x40000000 0x80000000>; dma-ranges = <0x00000000 0x40000000 0x80000000>;
#interconnect-cells = <1>; #interconnect-cells = <1>;
}; };
......
...@@ -560,6 +560,8 @@ mbus: dram-controller@1c62000 { ...@@ -560,6 +560,8 @@ mbus: dram-controller@1c62000 {
compatible = "allwinner,sun8i-h3-mbus"; compatible = "allwinner,sun8i-h3-mbus";
reg = <0x01c62000 0x1000>; reg = <0x01c62000 0x1000>;
clocks = <&ccu CLK_MBUS>; clocks = <&ccu CLK_MBUS>;
#address-cells = <1>;
#size-cells = <1>;
dma-ranges = <0x00000000 0x40000000 0xc0000000>; dma-ranges = <0x00000000 0x40000000 0xc0000000>;
#interconnect-cells = <1>; #interconnect-cells = <1>;
}; };
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment