aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/bcm27xx/patches-5.4/950-0669-dts-bcm2711-set-size-cells-2.patch
blob: fa5a2d4f546dade61ba1c868448ece7baf12d308 (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
From 6fe41cac345c8010943defa4ebc2496dd7ca05a1 Mon Sep 17 00:00:00 2001
From: Hristo Venev <hristo@venev.name>
Date: Wed, 22 Apr 2020 13:40:47 +0300
Subject: [PATCH] dts: bcm2711: set #size-cells = <2>

There already is one 4 GiB range, and one more will appear when high
peripheral mode is enabled.

Signed-off-by: Hristo Venev <hristo@venev.name>
---
 arch/arm/boot/dts/bcm2711-rpi.dtsi | 27 +++++++++++++--------------
 arch/arm/boot/dts/bcm2711.dtsi     | 10 +++++-----
 2 files changed, 18 insertions(+), 19 deletions(-)

--- a/arch/arm/boot/dts/bcm2711-rpi.dtsi
+++ b/arch/arm/boot/dts/bcm2711-rpi.dtsi
@@ -65,17 +65,16 @@
 };
 
 &scb {
-	ranges = <0x0 0x7c000000  0x0 0xfc000000  0x03800000>,
-		 <0x0 0x40000000  0x0 0xff800000  0x00800000>,
-		 <0x6 0x00000000  0x6 0x00000000  0x40000000>,
-		 <0x0 0x00000000  0x0 0x00000000  0xfc000000>;
-	dma-ranges = <0x0 0x00000000  0x0 0x00000000  0xfc000000>,
-		     <0x1 0x00000000  0x1 0x00000000  0x80000000>,
-		     <0x1 0x80000000  0x1 0x80000000  0x80000000>;
+	ranges = <0x0 0x7c000000  0x0 0xfc000000  0x0 0x03800000>,
+		 <0x0 0x40000000  0x0 0xff800000  0x0 0x00800000>,
+		 <0x6 0x00000000  0x6 0x00000000  0x0 0x40000000>,
+		 <0x0 0x00000000  0x0 0x00000000  0x0 0xfc000000>;
+	dma-ranges = <0x0 0x00000000  0x0 0x00000000  0x0 0xfc000000>,
+		     <0x1 0x00000000  0x1 0x00000000  0x1 0x00000000>;
 
 	dma40: dma@7e007b00 {
 		compatible = "brcm,bcm2711-dma";
-		reg = <0x0 0x7e007b00 0x400>;
+		reg = <0x0 0x7e007b00  0x0 0x400>;
 		interrupts =
 			<GIC_SPI 89 IRQ_TYPE_LEVEL_HIGH>, /* dma4 11 */
 			<GIC_SPI 90 IRQ_TYPE_LEVEL_HIGH>, /* dma4 12 */
@@ -91,39 +90,39 @@
 
 	vchiq: mailbox@7e00b840 {
 		compatible = "brcm,bcm2711-vchiq";
-		reg = <0 0x7e00b840 0x3c>;
+		reg = <0 0x7e00b840  0x0 0x3c>;
 		interrupts = <GIC_SPI 34 IRQ_TYPE_LEVEL_HIGH>;
 	};
 
 	xhci: xhci@7e9c0000 {
 		compatible = "generic-xhci";
 		status = "disabled";
-		reg = <0x0 0x7e9c0000 0x100000>;
+		reg = <0x0 0x7e9c0000  0x0 0x100000>;
 		interrupts = <GIC_SPI 176 IRQ_TYPE_LEVEL_HIGH>;
 	};
 
 	hevc-decoder@7eb00000 {
 		compatible = "raspberrypi,rpivid-hevc-decoder";
-		reg = <0x0 0x7eb00000 0x10000>;
+		reg = <0x0 0x7eb00000  0x0 0x10000>;
 		status = "okay";
 	};
 
 	rpivid-local-intc@7eb10000 {
 		compatible = "raspberrypi,rpivid-local-intc";
-		reg = <0x0 0x7eb10000 0x1000>;
+		reg = <0x0 0x7eb10000  0x0 0x1000>;
 		status = "okay";
 		interrupts = <GIC_SPI 98 IRQ_TYPE_LEVEL_HIGH>;
 	};
 
 	h264-decoder@7eb20000 {
 		compatible = "raspberrypi,rpivid-h264-decoder";
-		reg = <0x0 0x7eb20000 0x10000>;
+		reg = <0x0 0x7eb20000  0x0 0x10000>;
 		status = "okay";
 	};
 
 	vp9-decoder@7eb30000 {
 		compatible = "raspberrypi,rpivid-vp9-decoder";
-		reg = <0x0 0x7eb30000 0x10000>;
+		reg = <0x0 0x7eb30000  0x0 0x10000>;
 		status = "okay";
 	};
 };
--- a/arch/arm/boot/dts/bcm2711.dtsi
+++ b/arch/arm/boot/dts/bcm2711.dtsi
@@ -445,14 +445,14 @@
 	scb {
 		compatible = "simple-bus";
 		#address-cells = <2>;
-		#size-cells = <1>;
+		#size-cells = <2>;
 
-		ranges = <0x0 0x7c000000  0x0 0xfc000000  0x03800000>,
-			 <0x6 0x00000000  0x6 0x00000000  0x40000000>;
+		ranges = <0x0 0x7c000000  0x0 0xfc000000  0x0 0x03800000>,
+			 <0x6 0x00000000  0x6 0x00000000  0x0 0x40000000>;
 
 		pcie0: pcie@7d500000 {
 			compatible = "brcm,bcm2711-pcie";
-			reg = <0x0 0x7d500000 0x9310>;
+			reg = <0x0 0x7d500000  0x0 0x9310>;
 			device_type = "pci";
 			#address-cells = <3>;
 			#interrupt-cells = <1>;
@@ -480,7 +480,7 @@
 
 		genet: ethernet@7d580000 {
 			compatible = "brcm,bcm2711-genet-v5";
-			reg = <0x0 0x7d580000 0x10000>;
+			reg = <0x0 0x7d580000  0x0 0x10000>;
 			#address-cells = <0x1>;
 			#size-cells = <0x1>;
 			interrupts = <GIC_SPI 157 IRQ_TYPE_LEVEL_HIGH>,