1 From 6fe41cac345c8010943defa4ebc2496dd7ca05a1 Mon Sep 17 00:00:00 2001
2 From: Hristo Venev <hristo@venev.name>
3 Date: Wed, 22 Apr 2020 13:40:47 +0300
4 Subject: [PATCH] dts: bcm2711: set #size-cells = <2>
6 There already is one 4 GiB range, and one more will appear when high
7 peripheral mode is enabled.
9 Signed-off-by: Hristo Venev <hristo@venev.name>
11 arch/arm/boot/dts/bcm2711-rpi.dtsi | 27 +++++++++++++--------------
12 arch/arm/boot/dts/bcm2711.dtsi | 10 +++++-----
13 2 files changed, 18 insertions(+), 19 deletions(-)
15 --- a/arch/arm/boot/dts/bcm2711-rpi.dtsi
16 +++ b/arch/arm/boot/dts/bcm2711-rpi.dtsi
21 - ranges = <0x0 0x7c000000 0x0 0xfc000000 0x03800000>,
22 - <0x0 0x40000000 0x0 0xff800000 0x00800000>,
23 - <0x6 0x00000000 0x6 0x00000000 0x40000000>,
24 - <0x0 0x00000000 0x0 0x00000000 0xfc000000>;
25 - dma-ranges = <0x0 0x00000000 0x0 0x00000000 0xfc000000>,
26 - <0x1 0x00000000 0x1 0x00000000 0x80000000>,
27 - <0x1 0x80000000 0x1 0x80000000 0x80000000>;
28 + ranges = <0x0 0x7c000000 0x0 0xfc000000 0x0 0x03800000>,
29 + <0x0 0x40000000 0x0 0xff800000 0x0 0x00800000>,
30 + <0x6 0x00000000 0x6 0x00000000 0x0 0x40000000>,
31 + <0x0 0x00000000 0x0 0x00000000 0x0 0xfc000000>;
32 + dma-ranges = <0x0 0x00000000 0x0 0x00000000 0x0 0xfc000000>,
33 + <0x1 0x00000000 0x1 0x00000000 0x1 0x00000000>;
36 compatible = "brcm,bcm2711-dma";
37 - reg = <0x0 0x7e007b00 0x400>;
38 + reg = <0x0 0x7e007b00 0x0 0x400>;
40 <GIC_SPI 89 IRQ_TYPE_LEVEL_HIGH>, /* dma4 11 */
41 <GIC_SPI 90 IRQ_TYPE_LEVEL_HIGH>, /* dma4 12 */
44 vchiq: mailbox@7e00b840 {
45 compatible = "brcm,bcm2711-vchiq";
46 - reg = <0 0x7e00b840 0x3c>;
47 + reg = <0 0x7e00b840 0x0 0x3c>;
48 interrupts = <GIC_SPI 34 IRQ_TYPE_LEVEL_HIGH>;
52 compatible = "generic-xhci";
54 - reg = <0x0 0x7e9c0000 0x100000>;
55 + reg = <0x0 0x7e9c0000 0x0 0x100000>;
56 interrupts = <GIC_SPI 176 IRQ_TYPE_LEVEL_HIGH>;
59 hevc-decoder@7eb00000 {
60 compatible = "raspberrypi,rpivid-hevc-decoder";
61 - reg = <0x0 0x7eb00000 0x10000>;
62 + reg = <0x0 0x7eb00000 0x0 0x10000>;
66 rpivid-local-intc@7eb10000 {
67 compatible = "raspberrypi,rpivid-local-intc";
68 - reg = <0x0 0x7eb10000 0x1000>;
69 + reg = <0x0 0x7eb10000 0x0 0x1000>;
71 interrupts = <GIC_SPI 98 IRQ_TYPE_LEVEL_HIGH>;
74 h264-decoder@7eb20000 {
75 compatible = "raspberrypi,rpivid-h264-decoder";
76 - reg = <0x0 0x7eb20000 0x10000>;
77 + reg = <0x0 0x7eb20000 0x0 0x10000>;
81 vp9-decoder@7eb30000 {
82 compatible = "raspberrypi,rpivid-vp9-decoder";
83 - reg = <0x0 0x7eb30000 0x10000>;
84 + reg = <0x0 0x7eb30000 0x0 0x10000>;
88 --- a/arch/arm/boot/dts/bcm2711.dtsi
89 +++ b/arch/arm/boot/dts/bcm2711.dtsi
92 compatible = "simple-bus";
97 - ranges = <0x0 0x7c000000 0x0 0xfc000000 0x03800000>,
98 - <0x6 0x00000000 0x6 0x00000000 0x40000000>;
99 + ranges = <0x0 0x7c000000 0x0 0xfc000000 0x0 0x03800000>,
100 + <0x6 0x00000000 0x6 0x00000000 0x0 0x40000000>;
102 pcie0: pcie@7d500000 {
103 compatible = "brcm,bcm2711-pcie";
104 - reg = <0x0 0x7d500000 0x9310>;
105 + reg = <0x0 0x7d500000 0x0 0x9310>;
107 #address-cells = <3>;
108 #interrupt-cells = <1>;
111 genet: ethernet@7d580000 {
112 compatible = "brcm,bcm2711-genet-v5";
113 - reg = <0x0 0x7d580000 0x10000>;
114 + reg = <0x0 0x7d580000 0x0 0x10000>;
115 #address-cells = <0x1>;
117 interrupts = <GIC_SPI 157 IRQ_TYPE_LEVEL_HIGH>,