aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorArnd Bergmann <arnd@arndb.de>2018-03-15 11:25:44 -0400
committerArnd Bergmann <arnd@arndb.de>2018-03-15 17:03:14 -0400
commit614bae98cb18674644817bedc1a767ce2a286196 (patch)
tree665927ccce3b6ed1a93161fad0a25cfcd338ea80
parent7a76aad0262e7eed6d7aca3b4c95e4621601d779 (diff)
parent4e017f1419397473cf3db6e9fa020013998b1aa4 (diff)
Merge tag 'imx-dt64-4.17' of ssh://gitolite.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux into next/dt
Pull "Freescale arm64 device tree updates for 4.17" from Shawn Guo: - Move cpu_thermal device out of bus node to fix DTC simple_bus_reg warning seen with W=1 switch. - Fix IFC child nodes' unit-address to eliminate DTC simple_bus_reg warnings. - Add a dummy size memory 'reg' property for LS1046A device tree to avoid unit_address_vs_reg DTC warning, and the real size will be filled by bootloader. - Update ls208xa-qds board device tree to fix unit_address_vs_reg warnings with DSPI device. - Add idle-states for LS1012A and LS1043A, and correct arm,psci-suspend-param setting for already added idle-states. - DPAA QBMan portal and watchdog device addition. * tag 'imx-dt64-4.17' of ssh://gitolite.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux: dt-bindings: ifc: Fix the unit address format in the examples arm64: dts: ls1046a: add a dummy memory 'reg' property arm64: dts: fsl: fix ifc simple-bus unit address format warnings arm64: dts: fsl: update the cpu idle node arm64: dts: ls1043a: add cpu idle support arm64: dts: ls1012a: add cpu idle support arm64: dts: ls208xa-qds: Fix the 'reg' property arm64: dts: ls208xa-qds: Pass unit name to dspi child nodes arm64: dts: ls208xa: Move cpu_thermal out of bus node arm64: dts: ls1088a: Move cpu_thermal out of bus node arm64: dts: ls1046a: Move cpu_thermal out of bus node arm64: dts: ls1043a: Move cpu_thermal out of bus node arm64: dts: ls1012a: Move cpu_thermal out of bus node arm64: dts: Add DPAA QBMan portal 9 arm64: dts: ls1088a: add DT node of watchdog
Diffstat
-rw-r--r--Documentation/devicetree/bindings/memory-controllers/fsl/ifc.txt6
-rw-r--r--arch/arm64/boot/dts/freescale/fsl-ls1012a.dtsi80
-rw-r--r--arch/arm64/boot/dts/freescale/fsl-ls1043a-qds.dts6
-rw-r--r--arch/arm64/boot/dts/freescale/fsl-ls1043a-rdb.dts6
-rw-r--r--arch/arm64/boot/dts/freescale/fsl-ls1043a.dtsi83
-rw-r--r--arch/arm64/boot/dts/freescale/fsl-ls1046a-qds.dts6
-rw-r--r--arch/arm64/boot/dts/freescale/fsl-ls1046a-rdb.dts4
-rw-r--r--arch/arm64/boot/dts/freescale/fsl-ls1046a.dtsi66
-rw-r--r--arch/arm64/boot/dts/freescale/fsl-ls1088a-qds.dts6
-rw-r--r--arch/arm64/boot/dts/freescale/fsl-ls1088a-rdb.dts4
-rw-r--r--arch/arm64/boot/dts/freescale/fsl-ls1088a.dtsi134
-rw-r--r--arch/arm64/boot/dts/freescale/fsl-ls2088a.dtsi2
-rw-r--r--arch/arm64/boot/dts/freescale/fsl-ls208xa-qds.dtsi14
-rw-r--r--arch/arm64/boot/dts/freescale/fsl-ls208xa.dtsi98
-rw-r--r--arch/arm64/boot/dts/freescale/qoriq-bman-portals.dtsi6
-rw-r--r--arch/arm64/boot/dts/freescale/qoriq-qman-portals.dtsi7
16 files changed, 319 insertions, 209 deletions
diff --git a/Documentation/devicetree/bindings/memory-controllers/fsl/ifc.txt b/Documentation/devicetree/bindings/memory-controllers/fsl/ifc.txt
index 89427b018ba7..a4d4b6a2ff0d 100644
--- a/Documentation/devicetree/bindings/memory-controllers/fsl/ifc.txt
+++ b/Documentation/devicetree/bindings/memory-controllers/fsl/ifc.txt
@@ -43,7 +43,7 @@ Example:
43 0x1 0x0 0x0 0xffa00000 0x00010000 43 0x1 0x0 0x0 0xffa00000 0x00010000
44 0x3 0x0 0x0 0xffb00000 0x00020000>; 44 0x3 0x0 0x0 0xffb00000 0x00020000>;
45 45
46 flash@0,0 { 46 flash@0 {
47 #address-cells = <1>; 47 #address-cells = <1>;
48 #size-cells = <1>; 48 #size-cells = <1>;
49 compatible = "cfi-flash"; 49 compatible = "cfi-flash";
@@ -58,7 +58,7 @@ Example:
58 }; 58 };
59 }; 59 };
60 60
61 flash@1,0 { 61 flash@100000000 {
62 #address-cells = <1>; 62 #address-cells = <1>;
63 #size-cells = <1>; 63 #size-cells = <1>;
64 compatible = "fsl,ifc-nand"; 64 compatible = "fsl,ifc-nand";
@@ -73,7 +73,7 @@ Example:
73 }; 73 };
74 }; 74 };
75 75
76 cpld@3,0 { 76 cpld@@300000000 {
77 #address-cells = <1>; 77 #address-cells = <1>;
78 #size-cells = <1>; 78 #size-cells = <1>;
79 compatible = "fsl,p1010rdb-cpld"; 79 compatible = "fsl,p1010rdb-cpld";
diff --git a/arch/arm64/boot/dts/freescale/fsl-ls1012a.dtsi b/arch/arm64/boot/dts/freescale/fsl-ls1012a.dtsi
index 82b272fb41b9..bb788eddf9f4 100644
--- a/arch/arm64/boot/dts/freescale/fsl-ls1012a.dtsi
+++ b/arch/arm64/boot/dts/freescale/fsl-ls1012a.dtsi
@@ -70,6 +70,24 @@
70 reg = <0x0>; 70 reg = <0x0>;
71 clocks = <&clockgen 1 0>; 71 clocks = <&clockgen 1 0>;
72 #cooling-cells = <2>; 72 #cooling-cells = <2>;
73 cpu-idle-states = <&CPU_PH20>;
74 };
75 };
76
77 idle-states {
78 /*
79 * PSCI node is not added default, U-boot will add missing
80 * parts if it determines to use PSCI.
81 */
82 entry-method = "arm,psci";
83
84 CPU_PH20: cpu-ph20 {
85 compatible = "arm,idle-state";
86 idle-state-name = "PH20";
87 arm,psci-suspend-param = <0x0>;
88 entry-latency-us = <1000>;
89 exit-latency-us = <1000>;
90 min-residency-us = <3000>;
73 }; 91 };
74 }; 92 };
75 93
@@ -118,6 +136,37 @@
118 mask = <0x02>; 136 mask = <0x02>;
119 }; 137 };
120 138
139 thermal-zones {
140 cpu_thermal: cpu-thermal {
141 polling-delay-passive = <1000>;
142 polling-delay = <5000>;
143 thermal-sensors = <&tmu 0>;
144
145 trips {
146 cpu_alert: cpu-alert {
147 temperature = <85000>;
148 hysteresis = <2000>;
149 type = "passive";
150 };
151
152 cpu_crit: cpu-crit {
153 temperature = <95000>;
154 hysteresis = <2000>;
155 type = "critical";
156 };
157 };
158
159 cooling-maps {
160 map0 {
161 trip = <&cpu_alert>;
162 cooling-device =
163 <&cpu0 THERMAL_NO_LIMIT
164 THERMAL_NO_LIMIT>;
165 };
166 };
167 };
168 };
169
121 soc { 170 soc {
122 compatible = "simple-bus"; 171 compatible = "simple-bus";
123 #address-cells = <2>; 172 #address-cells = <2>;
@@ -304,37 +353,6 @@
304 #thermal-sensor-cells = <1>; 353 #thermal-sensor-cells = <1>;
305 }; 354 };
306 355
307 thermal-zones {
308 cpu_thermal: cpu-thermal {
309 polling-delay-passive = <1000>;
310 polling-delay = <5000>;
311 thermal-sensors = <&tmu 0>;
312
313 trips {
314 cpu_alert: cpu-alert {
315 temperature = <85000>;
316 hysteresis = <2000>;
317 type = "passive";
318 };
319
320 cpu_crit: cpu-crit {
321 temperature = <95000>;
322 hysteresis = <2000>;
323 type = "critical";
324 };
325 };
326
327 cooling-maps {
328 map0 {
329 trip = <&cpu_alert>;
330 cooling-device =
331 <&cpu0 THERMAL_NO_LIMIT
332 THERMAL_NO_LIMIT>;
333 };
334 };
335 };
336 };
337
338 i2c0: i2c@2180000 { 356 i2c0: i2c@2180000 {
339 compatible = "fsl,vf610-i2c"; 357 compatible = "fsl,vf610-i2c";
340 #address-cells = <1>; 358 #address-cells = <1>;
diff --git a/arch/arm64/boot/dts/freescale/fsl-ls1043a-qds.dts b/arch/arm64/boot/dts/freescale/fsl-ls1043a-qds.dts
index 6341281485cf..3a09297dc0ef 100644
--- a/arch/arm64/boot/dts/freescale/fsl-ls1043a-qds.dts
+++ b/arch/arm64/boot/dts/freescale/fsl-ls1043a-qds.dts
@@ -84,19 +84,19 @@
84 0x2 0x0 0x0 0x7fb00000 0x00000100>; 84 0x2 0x0 0x0 0x7fb00000 0x00000100>;
85 status = "okay"; 85 status = "okay";
86 86
87 nor@0,0 { 87 nor@0 {
88 compatible = "cfi-flash"; 88 compatible = "cfi-flash";
89 reg = <0x0 0x0 0x8000000>; 89 reg = <0x0 0x0 0x8000000>;
90 bank-width = <2>; 90 bank-width = <2>;
91 device-width = <1>; 91 device-width = <1>;
92 }; 92 };
93 93
94 nand@1,0 { 94 nand@100000000 {
95 compatible = "fsl,ifc-nand"; 95 compatible = "fsl,ifc-nand";
96 reg = <0x1 0x0 0x10000>; 96 reg = <0x1 0x0 0x10000>;
97 }; 97 };
98 98
99 fpga: board-control@2,0 { 99 fpga: board-control@200000000 {
100 compatible = "fsl,ls1043aqds-fpga", "fsl,fpga-qixis"; 100 compatible = "fsl,ls1043aqds-fpga", "fsl,fpga-qixis";
101 reg = <0x2 0x0 0x0000100>; 101 reg = <0x2 0x0 0x0000100>;
102 }; 102 };
diff --git a/arch/arm64/boot/dts/freescale/fsl-ls1043a-rdb.dts b/arch/arm64/boot/dts/freescale/fsl-ls1043a-rdb.dts
index 3dc0c8e9663d..0a82bf941e11 100644
--- a/arch/arm64/boot/dts/freescale/fsl-ls1043a-rdb.dts
+++ b/arch/arm64/boot/dts/freescale/fsl-ls1043a-rdb.dts
@@ -97,7 +97,7 @@
97 0x1 0x0 0x0 0x7e800000 0x00010000 97 0x1 0x0 0x0 0x7e800000 0x00010000
98 0x2 0x0 0x0 0x7fb00000 0x00000100>; 98 0x2 0x0 0x0 0x7fb00000 0x00000100>;
99 99
100 nor@0,0 { 100 nor@0 {
101 compatible = "cfi-flash"; 101 compatible = "cfi-flash";
102 #address-cells = <1>; 102 #address-cells = <1>;
103 #size-cells = <1>; 103 #size-cells = <1>;
@@ -106,14 +106,14 @@
106 device-width = <1>; 106 device-width = <1>;
107 }; 107 };
108 108
109 nand@1,0 { 109 nand@100000000 {
110 compatible = "fsl,ifc-nand"; 110 compatible = "fsl,ifc-nand";
111 #address-cells = <1>; 111 #address-cells = <1>;
112 #size-cells = <1>; 112 #size-cells = <1>;
113 reg = <0x1 0x0 0x10000>; 113 reg = <0x1 0x0 0x10000>;
114 }; 114 };
115 115
116 cpld: board-control@2,0 { 116 cpld: board-control@200000000 {
117 compatible = "fsl,ls1043ardb-cpld"; 117 compatible = "fsl,ls1043ardb-cpld";
118 reg = <0x2 0x0 0x0000100>; 118 reg = <0x2 0x0 0x0000100>;
119 }; 119 };
diff --git a/arch/arm64/boot/dts/freescale/fsl-ls1043a.dtsi b/arch/arm64/boot/dts/freescale/fsl-ls1043a.dtsi
index 380e7c713395..1109f22bda5e 100644
--- a/arch/arm64/boot/dts/freescale/fsl-ls1043a.dtsi
+++ b/arch/arm64/boot/dts/freescale/fsl-ls1043a.dtsi
@@ -81,6 +81,7 @@
81 clocks = <&clockgen 1 0>; 81 clocks = <&clockgen 1 0>;
82 next-level-cache = <&l2>; 82 next-level-cache = <&l2>;
83 #cooling-cells = <2>; 83 #cooling-cells = <2>;
84 cpu-idle-states = <&CPU_PH20>;
84 }; 85 };
85 86
86 cpu1: cpu@1 { 87 cpu1: cpu@1 {
@@ -89,6 +90,7 @@
89 reg = <0x1>; 90 reg = <0x1>;
90 clocks = <&clockgen 1 0>; 91 clocks = <&clockgen 1 0>;
91 next-level-cache = <&l2>; 92 next-level-cache = <&l2>;
93 cpu-idle-states = <&CPU_PH20>;
92 }; 94 };
93 95
94 cpu2: cpu@2 { 96 cpu2: cpu@2 {
@@ -97,6 +99,7 @@
97 reg = <0x2>; 99 reg = <0x2>;
98 clocks = <&clockgen 1 0>; 100 clocks = <&clockgen 1 0>;
99 next-level-cache = <&l2>; 101 next-level-cache = <&l2>;
102 cpu-idle-states = <&CPU_PH20>;
100 }; 103 };
101 104
102 cpu3: cpu@3 { 105 cpu3: cpu@3 {
@@ -105,6 +108,7 @@
105 reg = <0x3>; 108 reg = <0x3>;
106 clocks = <&clockgen 1 0>; 109 clocks = <&clockgen 1 0>;
107 next-level-cache = <&l2>; 110 next-level-cache = <&l2>;
111 cpu-idle-states = <&CPU_PH20>;
108 }; 112 };
109 113
110 l2: l2-cache { 114 l2: l2-cache {
@@ -112,6 +116,23 @@
112 }; 116 };
113 }; 117 };
114 118
119 idle-states {
120 /*
121 * PSCI node is not added default, U-boot will add missing
122 * parts if it determines to use PSCI.
123 */
124 entry-method = "arm,psci";
125
126 CPU_PH20: cpu-ph20 {
127 compatible = "arm,idle-state";
128 idle-state-name = "PH20";
129 arm,psci-suspend-param = <0x0>;
130 entry-latency-us = <1000>;
131 exit-latency-us = <1000>;
132 min-residency-us = <3000>;
133 };
134 };
135
115 memory@80000000 { 136 memory@80000000 {
116 device_type = "memory"; 137 device_type = "memory";
117 reg = <0x0 0x80000000 0 0x80000000>; 138 reg = <0x0 0x80000000 0 0x80000000>;
@@ -159,6 +180,37 @@
159 mask = <0x02>; 180 mask = <0x02>;
160 }; 181 };
161 182
183 thermal-zones {
184 cpu_thermal: cpu-thermal {
185 polling-delay-passive = <1000>;
186 polling-delay = <5000>;
187
188 thermal-sensors = <&tmu 3>;
189
190 trips {
191 cpu_alert: cpu-alert {
192 temperature = <85000>;
193 hysteresis = <2000>;
194 type = "passive";
195 };
196 cpu_crit: cpu-crit {
197 temperature = <95000>;
198 hysteresis = <2000>;
199 type = "critical";
200 };
201 };
202
203 cooling-maps {
204 map0 {
205 trip = <&cpu_alert>;
206 cooling-device =
207 <&cpu0 THERMAL_NO_LIMIT
208 THERMAL_NO_LIMIT>;
209 };
210 };
211 };
212 };
213
162 timer { 214 timer {
163 compatible = "arm,armv8-timer"; 215 compatible = "arm,armv8-timer";
164 interrupts = <1 13 0xf08>, /* Physical Secure PPI */ 216 interrupts = <1 13 0xf08>, /* Physical Secure PPI */
@@ -342,37 +394,6 @@
342 #thermal-sensor-cells = <1>; 394 #thermal-sensor-cells = <1>;
343 }; 395 };
344 396
345 thermal-zones {
346 cpu_thermal: cpu-thermal {
347 polling-delay-passive = <1000>;
348 polling-delay = <5000>;
349
350 thermal-sensors = <&tmu 3>;
351
352 trips {
353 cpu_alert: cpu-alert {
354 temperature = <85000>;
355 hysteresis = <2000>;
356 type = "passive";
357 };
358 cpu_crit: cpu-crit {
359 temperature = <95000>;
360 hysteresis = <2000>;
361 type = "critical";
362 };
363 };
364
365 cooling-maps {
366 map0 {
367 trip = <&cpu_alert>;
368 cooling-device =
369 <&cpu0 THERMAL_NO_LIMIT
370 THERMAL_NO_LIMIT>;
371 };
372 };
373 };
374 };
375
376 qman: qman@1880000 { 397 qman: qman@1880000 {
377 compatible = "fsl,qman"; 398 compatible = "fsl,qman";
378 reg = <0x0 0x1880000 0x0 0x10000>; 399 reg = <0x0 0x1880000 0x0 0x10000>;
diff --git a/arch/arm64/boot/dts/freescale/fsl-ls1046a-qds.dts b/arch/arm64/boot/dts/freescale/fsl-ls1046a-qds.dts
index 434383bade0e..410dc61fe10a 100644
--- a/arch/arm64/boot/dts/freescale/fsl-ls1046a-qds.dts
+++ b/arch/arm64/boot/dts/freescale/fsl-ls1046a-qds.dts
@@ -175,19 +175,19 @@
175 0x2 0x0 0x0 0x7fb00000 0x00000100>; 175 0x2 0x0 0x0 0x7fb00000 0x00000100>;
176 status = "okay"; 176 status = "okay";
177 177
178 nor@0,0 { 178 nor@0 {
179 compatible = "cfi-flash"; 179 compatible = "cfi-flash";
180 reg = <0x0 0x0 0x8000000>; 180 reg = <0x0 0x0 0x8000000>;
181 bank-width = <2>; 181 bank-width = <2>;
182 device-width = <1>; 182 device-width = <1>;
183 }; 183 };
184 184
185 nand@1,0 { 185 nand@100000000 {
186 compatible = "fsl,ifc-nand"; 186 compatible = "fsl,ifc-nand";
187 reg = <0x1 0x0 0x10000>; 187 reg = <0x1 0x0 0x10000>;
188 }; 188 };
189 189
190 fpga: board-control@2,0 { 190 fpga: board-control@200000000 {
191 compatible = "fsl,ls1046aqds-fpga", "fsl,fpga-qixis"; 191 compatible = "fsl,ls1046aqds-fpga", "fsl,fpga-qixis";
192 reg = <0x2 0x0 0x0000100>; 192 reg = <0x2 0x0 0x0000100>;
193 }; 193 };
diff --git a/arch/arm64/boot/dts/freescale/fsl-ls1046a-rdb.dts b/arch/arm64/boot/dts/freescale/fsl-ls1046a-rdb.dts
index 5dc2782e2a58..18d3c5bccfd1 100644
--- a/arch/arm64/boot/dts/freescale/fsl-ls1046a-rdb.dts
+++ b/arch/arm64/boot/dts/freescale/fsl-ls1046a-rdb.dts
@@ -122,14 +122,14 @@
122 0x2 0x0 0x0 0x7fb00000 0x00000100>; 122 0x2 0x0 0x0 0x7fb00000 0x00000100>;
123 status = "okay"; 123 status = "okay";
124 124
125 nand@0,0 { 125 nand@0 {
126 compatible = "fsl,ifc-nand"; 126 compatible = "fsl,ifc-nand";
127 #address-cells = <1>; 127 #address-cells = <1>;
128 #size-cells = <1>; 128 #size-cells = <1>;
129 reg = <0x0 0x0 0x10000>; 129 reg = <0x0 0x0 0x10000>;
130 }; 130 };
131 131
132 cpld: board-control@2,0 { 132 cpld: board-control@200000000 {
133 compatible = "fsl,ls1046ardb-cpld"; 133 compatible = "fsl,ls1046ardb-cpld";
134 reg = <0x2 0x0 0x0000100>; 134 reg = <0x2 0x0 0x0000100>;
135 }; 135 };
diff --git a/arch/arm64/boot/dts/freescale/fsl-ls1046a.dtsi b/arch/arm64/boot/dts/freescale/fsl-ls1046a.dtsi
index 06b5e12d04d8..136ebfa9b333 100644
--- a/arch/arm64/boot/dts/freescale/fsl-ls1046a.dtsi
+++ b/arch/arm64/boot/dts/freescale/fsl-ls1046a.dtsi
@@ -122,7 +122,7 @@
122 CPU_PH20: cpu-ph20 { 122 CPU_PH20: cpu-ph20 {
123 compatible = "arm,idle-state"; 123 compatible = "arm,idle-state";
124 idle-state-name = "PH20"; 124 idle-state-name = "PH20";
125 arm,psci-suspend-param = <0x00010000>; 125 arm,psci-suspend-param = <0x0>;
126 entry-latency-us = <1000>; 126 entry-latency-us = <1000>;
127 exit-latency-us = <1000>; 127 exit-latency-us = <1000>;
128 min-residency-us = <3000>; 128 min-residency-us = <3000>;
@@ -131,6 +131,8 @@
131 131
132 memory@80000000 { 132 memory@80000000 {
133 device_type = "memory"; 133 device_type = "memory";
134 /* Real size will be filled by bootloader */
135 reg = <0x0 0x80000000 0x0 0x0>;
134 }; 136 };
135 137
136 sysclk: sysclk { 138 sysclk: sysclk {
@@ -147,6 +149,37 @@
147 mask = <0x02>; 149 mask = <0x02>;
148 }; 150 };
149 151
152 thermal-zones {
153 cpu_thermal: cpu-thermal {
154 polling-delay-passive = <1000>;
155 polling-delay = <5000>;
156 thermal-sensors = <&tmu 3>;
157
158 trips {
159 cpu_alert: cpu-alert {
160 temperature = <85000>;
161 hysteresis = <2000>;
162 type = "passive";
163 };
164
165 cpu_crit: cpu-crit {
166 temperature = <95000>;
167 hysteresis = <2000>;
168 type = "critical";
169 };
170 };
171
172 cooling-maps {
173 map0 {
174 trip = <&cpu_alert>;
175 cooling-device =
176 <&cpu0 THERMAL_NO_LIMIT
177 THERMAL_NO_LIMIT>;
178 };
179 };
180 };
181 };
182
150 timer { 183 timer {
151 compatible = "arm,armv8-timer"; 184 compatible = "arm,armv8-timer";
152 interrupts = <GIC_PPI 13 (GIC_CPU_MASK_RAW(0xf) | 185 interrupts = <GIC_PPI 13 (GIC_CPU_MASK_RAW(0xf) |
@@ -362,37 +395,6 @@
362 #thermal-sensor-cells = <1>; 395 #thermal-sensor-cells = <1>;
363 }; 396 };
364 397
365 thermal-zones {
366 cpu_thermal: cpu-thermal {
367 polling-delay-passive = <1000>;
368 polling-delay = <5000>;
369 thermal-sensors = <&tmu 3>;
370
371 trips {
372 cpu_alert: cpu-alert {
373 temperature = <85000>;
374 hysteresis = <2000>;
375 type = "passive";
376 };
377
378 cpu_crit: cpu-crit {
379 temperature = <95000>;
380 hysteresis = <2000>;
381 type = "critical";
382 };
383 };
384
385 cooling-maps {
386 map0 {
387 trip = <&cpu_alert>;
388 cooling-device =
389 <&cpu0 THERMAL_NO_LIMIT
390 THERMAL_NO_LIMIT>;
391 };
392 };
393 };
394 };
395
396 dspi: dspi@2100000 { 398 dspi: dspi@2100000 {
397 compatible = "fsl,ls1021a-v1.0-dspi"; 399 compatible = "fsl,ls1021a-v1.0-dspi";
398 #address-cells = <1>; 400 #address-cells = <1>;
diff --git a/arch/arm64/boot/dts/freescale/fsl-ls1088a-qds.dts b/arch/arm64/boot/dts/freescale/fsl-ls1088a-qds.dts
index 30128051d0c0..0b96d6d4fe71 100644
--- a/arch/arm64/boot/dts/freescale/fsl-ls1088a-qds.dts
+++ b/arch/arm64/boot/dts/freescale/fsl-ls1088a-qds.dts
@@ -116,19 +116,19 @@
116 3 0 0x5 0x20000000 0x00010000>; 116 3 0 0x5 0x20000000 0x00010000>;
117 status = "okay"; 117 status = "okay";
118 118
119 nor@0,0 { 119 nor@0 {
120 compatible = "cfi-flash"; 120 compatible = "cfi-flash";
121 reg = <0x0 0x0 0x8000000>; 121 reg = <0x0 0x0 0x8000000>;
122 bank-width = <2>; 122 bank-width = <2>;
123 device-width = <1>; 123 device-width = <1>;
124 }; 124 };
125 125
126 nand@2,0 { 126 nand@200000000 {
127 compatible = "fsl,ifc-nand"; 127 compatible = "fsl,ifc-nand";
128 reg = <0x2 0x0 0x10000>; 128 reg = <0x2 0x0 0x10000>;
129 }; 129 };
130 130
131 fpga: board-control@3,0 { 131 fpga: board-control@300000000 {
132 compatible = "fsl,ls1088aqds-fpga", "fsl,fpga-qixis"; 132 compatible = "fsl,ls1088aqds-fpga", "fsl,fpga-qixis";
133 reg = <0x3 0x0 0x0000100>; 133 reg = <0x3 0x0 0x0000100>;
134 }; 134 };
diff --git a/arch/arm64/boot/dts/freescale/fsl-ls1088a-rdb.dts b/arch/arm64/boot/dts/freescale/fsl-ls1088a-rdb.dts
index 4f17601b919c..3d57008e70e8 100644
--- a/arch/arm64/boot/dts/freescale/fsl-ls1088a-rdb.dts
+++ b/arch/arm64/boot/dts/freescale/fsl-ls1088a-rdb.dts
@@ -99,12 +99,12 @@
99 2 0 0x5 0x20000000 0x00010000>; 99 2 0 0x5 0x20000000 0x00010000>;
100 status = "okay"; 100 status = "okay";
101 101
102 nand@0,0 { 102 nand@0 {
103 compatible = "fsl,ifc-nand"; 103 compatible = "fsl,ifc-nand";
104 reg = <0x0 0x0 0x10000>; 104 reg = <0x0 0x0 0x10000>;
105 }; 105 };
106 106
107 fpga: board-control@2,0 { 107 fpga: board-control@200000000 {
108 compatible = "fsl,ls1088ardb-fpga", "fsl,fpga-qixis"; 108 compatible = "fsl,ls1088ardb-fpga", "fsl,fpga-qixis";
109 reg = <0x2 0x0 0x0000100>; 109 reg = <0x2 0x0 0x0000100>;
110 }; 110 };
diff --git a/arch/arm64/boot/dts/freescale/fsl-ls1088a.dtsi b/arch/arm64/boot/dts/freescale/fsl-ls1088a.dtsi
index 4fc150cd4ca5..1c6556bcfddf 100644
--- a/arch/arm64/boot/dts/freescale/fsl-ls1088a.dtsi
+++ b/arch/arm64/boot/dts/freescale/fsl-ls1088a.dtsi
@@ -130,7 +130,7 @@
130 CPU_PH20: cpu-ph20 { 130 CPU_PH20: cpu-ph20 {
131 compatible = "arm,idle-state"; 131 compatible = "arm,idle-state";
132 idle-state-name = "PH20"; 132 idle-state-name = "PH20";
133 arm,psci-suspend-param = <0x00010000>; 133 arm,psci-suspend-param = <0x0>;
134 entry-latency-us = <1000>; 134 entry-latency-us = <1000>;
135 exit-latency-us = <1000>; 135 exit-latency-us = <1000>;
136 min-residency-us = <3000>; 136 min-residency-us = <3000>;
@@ -158,6 +158,44 @@
158 }; 158 };
159 }; 159 };
160 160
161 thermal-zones {
162 cpu_thermal: cpu-thermal {
163 polling-delay-passive = <1000>;
164 polling-delay = <5000>;
165 thermal-sensors = <&tmu 0>;
166
167 trips {
168 cpu_alert: cpu-alert {
169 temperature = <85000>;
170 hysteresis = <2000>;
171 type = "passive";
172 };
173
174 cpu_crit: cpu-crit {
175 temperature = <95000>;
176 hysteresis = <2000>;
177 type = "critical";
178 };
179 };
180
181 cooling-maps {
182 map0 {
183 trip = <&cpu_alert>;
184 cooling-device =
185 <&cpu0 THERMAL_NO_LIMIT
186 THERMAL_NO_LIMIT>;
187 };
188
189 map1 {
190 trip = <&cpu_alert>;
191 cooling-device =
192 <&cpu4 THERMAL_NO_LIMIT
193 THERMAL_NO_LIMIT>;
194 };
195 };
196 };
197 };
198
161 timer { 199 timer {
162 compatible = "arm,armv8-timer"; 200 compatible = "arm,armv8-timer";
163 interrupts = <1 13 IRQ_TYPE_LEVEL_LOW>,/* Physical Secure PPI */ 201 interrupts = <1 13 IRQ_TYPE_LEVEL_LOW>,/* Physical Secure PPI */
@@ -315,44 +353,6 @@
315 #thermal-sensor-cells = <1>; 353 #thermal-sensor-cells = <1>;
316 }; 354 };
317 355
318 thermal-zones {
319 cpu_thermal: cpu-thermal {
320 polling-delay-passive = <1000>;
321 polling-delay = <5000>;
322 thermal-sensors = <&tmu 0>;
323
324 trips {
325 cpu_alert: cpu-alert {
326 temperature = <85000>;
327 hysteresis = <2000>;
328 type = "passive";
329 };
330
331 cpu_crit: cpu-crit {
332 temperature = <95000>;
333 hysteresis = <2000>;
334 type = "critical";
335 };
336 };
337
338 cooling-maps {
339 map0 {
340 trip = <&cpu_alert>;
341 cooling-device =
342 <&cpu0 THERMAL_NO_LIMIT
343 THERMAL_NO_LIMIT>;
344 };
345
346 map1 {
347 trip = <&cpu_alert>;
348 cooling-device =
349 <&cpu4 THERMAL_NO_LIMIT
350 THERMAL_NO_LIMIT>;
351 };
352 };
353 };
354 };
355
356 duart0: serial@21c0500 { 356 duart0: serial@21c0500 {
357 compatible = "fsl,ns16550", "ns16550a"; 357 compatible = "fsl,ns16550", "ns16550a";
358 reg = <0x0 0x21c0500 0x0 0x100>; 358 reg = <0x0 0x21c0500 0x0 0x100>;
@@ -612,6 +612,62 @@
612 <0000 0 0 3 &gic 0 0 0 121 IRQ_TYPE_LEVEL_HIGH>, 612 <0000 0 0 3 &gic 0 0 0 121 IRQ_TYPE_LEVEL_HIGH>,
613 <0000 0 0 4 &gic 0 0 0 122 IRQ_TYPE_LEVEL_HIGH>; 613 <0000 0 0 4 &gic 0 0 0 122 IRQ_TYPE_LEVEL_HIGH>;
614 }; 614 };
615
616 cluster1_core0_watchdog: wdt@c000000 {
617 compatible = "arm,sp805-wdt", "arm,primecell";
618 reg = <0x0 0xc000000 0x0 0x1000>;
619 clocks = <&clockgen 4 3>, <&clockgen 4 3>;
620 clock-names = "apb_pclk", "wdog_clk";
621 };
622
623 cluster1_core1_watchdog: wdt@c010000 {
624 compatible = "arm,sp805-wdt", "arm,primecell";
625 reg = <0x0 0xc010000 0x0 0x1000>;
626 clocks = <&clockgen 4 3>, <&clockgen 4 3>;
627 clock-names = "apb_pclk", "wdog_clk";
628 };
629
630 cluster1_core2_watchdog: wdt@c020000 {
631 compatible = "arm,sp805-wdt", "arm,primecell";
632 reg = <0x0 0xc020000 0x0 0x1000>;
633 clocks = <&clockgen 4 3>, <&clockgen 4 3>;
634 clock-names = "apb_pclk", "wdog_clk";
635 };
636
637 cluster1_core3_watchdog: wdt@c030000 {
638 compatible = "arm,sp805-wdt", "arm,primecell";
639 reg = <0x0 0xc030000 0x0 0x1000>;
640 clocks = <&clockgen 4 3>, <&clockgen 4 3>;
641 clock-names = "apb_pclk", "wdog_clk";
642 };
643
644 cluster2_core0_watchdog: wdt@c100000 {
645 compatible = "arm,sp805-wdt", "arm,primecell";
646 reg = <0x0 0xc100000 0x0 0x1000>;
647 clocks = <&clockgen 4 3>, <&clockgen 4 3>;
648 clock-names = "apb_pclk", "wdog_clk";
649 };
650
651 cluster2_core1_watchdog: wdt@c110000 {
652 compatible = "arm,sp805-wdt", "arm,primecell";
653 reg = <0x0 0xc110000 0x0 0x1000>;
654 clocks = <&clockgen 4 3>, <&clockgen 4 3>;
655 clock-names = "apb_pclk", "wdog_clk";
656 };
657
658 cluster2_core2_watchdog: wdt@c120000 {
659 compatible = "arm,sp805-wdt", "arm,primecell";
660 reg = <0x0 0xc120000 0x0 0x1000>;
661 clocks = <&clockgen 4 3>, <&clockgen 4 3>;
662 clock-names = "apb_pclk", "wdog_clk";
663 };
664
665 cluster2_core3_watchdog: wdt@c130000 {
666 compatible = "arm,sp805-wdt", "arm,primecell";
667 reg = <0x0 0xc130000 0x0 0x1000>;
668 clocks = <&clockgen 4 3>, <&clockgen 4 3>;
669 clock-names = "apb_pclk", "wdog_clk";
670 };
615 }; 671 };
616 672
617 firmware { 673 firmware {
diff --git a/arch/arm64/boot/dts/freescale/fsl-ls2088a.dtsi b/arch/arm64/boot/dts/freescale/fsl-ls2088a.dtsi
index aeaef01d375f..0884e1a77901 100644
--- a/arch/arm64/boot/dts/freescale/fsl-ls2088a.dtsi
+++ b/arch/arm64/boot/dts/freescale/fsl-ls2088a.dtsi
@@ -143,7 +143,7 @@
143 CPU_PW20: cpu-pw20 { 143 CPU_PW20: cpu-pw20 {
144 compatible = "arm,idle-state"; 144 compatible = "arm,idle-state";
145 idle-state-name = "PW20"; 145 idle-state-name = "PW20";
146 arm,psci-suspend-param = <0x00010000>; 146 arm,psci-suspend-param = <0x0>;
147 entry-latency-us = <2000>; 147 entry-latency-us = <2000>;
148 exit-latency-us = <2000>; 148 exit-latency-us = <2000>;
149 min-residency-us = <6000>; 149 min-residency-us = <6000>;
diff --git a/arch/arm64/boot/dts/freescale/fsl-ls208xa-qds.dtsi b/arch/arm64/boot/dts/freescale/fsl-ls208xa-qds.dtsi
index b2374469a830..5ac34126bfe1 100644
--- a/arch/arm64/boot/dts/freescale/fsl-ls208xa-qds.dtsi
+++ b/arch/arm64/boot/dts/freescale/fsl-ls208xa-qds.dtsi
@@ -58,7 +58,7 @@
58 0x2 0x0 0x5 0x30000000 0x00010000 58 0x2 0x0 0x5 0x30000000 0x00010000
59 0x3 0x0 0x5 0x20000000 0x00010000>; 59 0x3 0x0 0x5 0x20000000 0x00010000>;
60 60
61 nor@0,0 { 61 nor@0 {
62 #address-cells = <1>; 62 #address-cells = <1>;
63 #size-cells = <1>; 63 #size-cells = <1>;
64 compatible = "cfi-flash"; 64 compatible = "cfi-flash";
@@ -67,12 +67,12 @@
67 device-width = <1>; 67 device-width = <1>;
68 }; 68 };
69 69
70 nand@2,0 { 70 nand@200000000 {
71 compatible = "fsl,ifc-nand"; 71 compatible = "fsl,ifc-nand";
72 reg = <0x2 0x0 0x10000>; 72 reg = <0x2 0x0 0x10000>;
73 }; 73 };
74 74
75 cpld@3,0 { 75 cpld@300000000 {
76 reg = <0x3 0x0 0x10000>; 76 reg = <0x3 0x0 0x10000>;
77 compatible = "fsl,ls2080aqds-fpga", "fsl,fpga-qixis"; 77 compatible = "fsl,ls2080aqds-fpga", "fsl,fpga-qixis";
78 }; 78 };
@@ -140,21 +140,21 @@
140 140
141&dspi { 141&dspi {
142 status = "okay"; 142 status = "okay";
143 dflash0: n25q128a { 143 dflash0: n25q128a@0 {
144 #address-cells = <1>; 144 #address-cells = <1>;
145 #size-cells = <1>; 145 #size-cells = <1>;
146 compatible = "st,m25p80"; 146 compatible = "st,m25p80";
147 spi-max-frequency = <3000000>; 147 spi-max-frequency = <3000000>;
148 reg = <0>; 148 reg = <0>;
149 }; 149 };
150 dflash1: sst25wf040b { 150 dflash1: sst25wf040b@1 {
151 #address-cells = <1>; 151 #address-cells = <1>;
152 #size-cells = <1>; 152 #size-cells = <1>;
153 compatible = "st,m25p80"; 153 compatible = "st,m25p80";
154 spi-max-frequency = <3000000>; 154 spi-max-frequency = <3000000>;
155 reg = <1>; 155 reg = <1>;
156 }; 156 };
157 dflash2: en25s64 { 157 dflash2: en25s64@2 {
158 #address-cells = <1>; 158 #address-cells = <1>;
159 #size-cells = <1>; 159 #size-cells = <1>;
160 compatible = "st,m25p80"; 160 compatible = "st,m25p80";
@@ -177,7 +177,7 @@
177 #size-cells = <1>; 177 #size-cells = <1>;
178 compatible = "st,m25p80"; 178 compatible = "st,m25p80";
179 spi-max-frequency = <20000000>; 179 spi-max-frequency = <20000000>;
180 reg = <0>; 180 reg = <2>;
181 }; 181 };
182}; 182};
183 183
diff --git a/arch/arm64/boot/dts/freescale/fsl-ls208xa.dtsi b/arch/arm64/boot/dts/freescale/fsl-ls208xa.dtsi
index f3a40af33af8..137ef4dfc3e9 100644
--- a/arch/arm64/boot/dts/freescale/fsl-ls208xa.dtsi
+++ b/arch/arm64/boot/dts/freescale/fsl-ls208xa.dtsi
@@ -111,6 +111,55 @@
111 mask = <0x2>; 111 mask = <0x2>;
112 }; 112 };
113 113
114 thermal-zones {
115 cpu_thermal: cpu-thermal {
116 polling-delay-passive = <1000>;
117 polling-delay = <5000>;
118
119 thermal-sensors = <&tmu 4>;
120
121 trips {
122 cpu_alert: cpu-alert {
123 temperature = <75000>;
124 hysteresis = <2000>;
125 type = "passive";
126 };
127 cpu_crit: cpu-crit {
128 temperature = <85000>;
129 hysteresis = <2000>;
130 type = "critical";
131 };
132 };
133
134 cooling-maps {
135 map0 {
136 trip = <&cpu_alert>;
137 cooling-device =
138 <&cpu0 THERMAL_NO_LIMIT
139 THERMAL_NO_LIMIT>;
140 };
141 map1 {
142 trip = <&cpu_alert>;
143 cooling-device =
144 <&cpu2 THERMAL_NO_LIMIT
145 THERMAL_NO_LIMIT>;
146 };
147 map2 {
148 trip = <&cpu_alert>;
149 cooling-device =
150 <&cpu4 THERMAL_NO_LIMIT
151 THERMAL_NO_LIMIT>;
152 };
153 map3 {
154 trip = <&cpu_alert>;
155 cooling-device =
156 <&cpu6 THERMAL_NO_LIMIT
157 THERMAL_NO_LIMIT>;
158 };
159 };
160 };
161 };
162
114 timer { 163 timer {
115 compatible = "arm,armv8-timer"; 164 compatible = "arm,armv8-timer";
116 interrupts = <1 13 4>, /* Physical Secure PPI, active-low */ 165 interrupts = <1 13 4>, /* Physical Secure PPI, active-low */
@@ -194,55 +243,6 @@
194 #thermal-sensor-cells = <1>; 243 #thermal-sensor-cells = <1>;
195 }; 244 };
196 245
197 thermal-zones {
198 cpu_thermal: cpu-thermal {
199 polling-delay-passive = <1000>;
200 polling-delay = <5000>;
201
202 thermal-sensors = <&tmu 4>;
203
204 trips {
205 cpu_alert: cpu-alert {
206 temperature = <75000>;
207 hysteresis = <2000>;
208 type = "passive";
209 };
210 cpu_crit: cpu-crit {
211 temperature = <85000>;
212 hysteresis = <2000>;
213 type = "critical";
214 };
215 };
216
217 cooling-maps {
218 map0 {
219 trip = <&cpu_alert>;
220 cooling-device =
221 <&cpu0 THERMAL_NO_LIMIT
222 THERMAL_NO_LIMIT>;
223 };
224 map1 {
225 trip = <&cpu_alert>;
226 cooling-device =
227 <&cpu2 THERMAL_NO_LIMIT
228 THERMAL_NO_LIMIT>;
229 };
230 map2 {
231 trip = <&cpu_alert>;
232 cooling-device =
233 <&cpu4 THERMAL_NO_LIMIT
234 THERMAL_NO_LIMIT>;
235 };
236 map3 {
237 trip = <&cpu_alert>;
238 cooling-device =
239 <&cpu6 THERMAL_NO_LIMIT
240 THERMAL_NO_LIMIT>;
241 };
242 };
243 };
244 };
245
246 serial0: serial@21c0500 { 246 serial0: serial@21c0500 {
247 compatible = "fsl,ns16550", "ns16550a"; 247 compatible = "fsl,ns16550", "ns16550a";
248 reg = <0x0 0x21c0500 0x0 0x100>; 248 reg = <0x0 0x21c0500 0x0 0x100>;
diff --git a/arch/arm64/boot/dts/freescale/qoriq-bman-portals.dtsi b/arch/arm64/boot/dts/freescale/qoriq-bman-portals.dtsi
index c3c2be4f5072..ae15307f6e8b 100644
--- a/arch/arm64/boot/dts/freescale/qoriq-bman-portals.dtsi
+++ b/arch/arm64/boot/dts/freescale/qoriq-bman-portals.dtsi
@@ -68,4 +68,10 @@
68 reg = <0x80000 0x4000>, <0x4080000 0x4000>; 68 reg = <0x80000 0x4000>, <0x4080000 0x4000>;
69 interrupts = <GIC_SPI 189 IRQ_TYPE_LEVEL_HIGH>; 69 interrupts = <GIC_SPI 189 IRQ_TYPE_LEVEL_HIGH>;
70 }; 70 };
71
72 bman-portal@90000 {
73 compatible = "fsl,bman-portal";
74 reg = <0x90000 0x4000>, <0x4090000 0x4000>;
75 interrupts = <GIC_SPI 191 IRQ_TYPE_LEVEL_HIGH>;
76 };
71}; 77};
diff --git a/arch/arm64/boot/dts/freescale/qoriq-qman-portals.dtsi b/arch/arm64/boot/dts/freescale/qoriq-qman-portals.dtsi
index 2a9aa060efda..6a93a4a9be0e 100644
--- a/arch/arm64/boot/dts/freescale/qoriq-qman-portals.dtsi
+++ b/arch/arm64/boot/dts/freescale/qoriq-qman-portals.dtsi
@@ -77,4 +77,11 @@
77 interrupts = <GIC_SPI 188 IRQ_TYPE_LEVEL_HIGH>; 77 interrupts = <GIC_SPI 188 IRQ_TYPE_LEVEL_HIGH>;
78 cell-index = <8>; 78 cell-index = <8>;
79 }; 79 };
80
81 qportal9: qman-portal@90000 {
82 compatible = "fsl,qman-portal";
83 reg = <0x90000 0x4000>, <0x4090000 0x4000>;
84 interrupts = <GIC_SPI 190 IRQ_TYPE_LEVEL_HIGH>;
85 cell-index = <9>;
86 };
80}; 87};
generated by cgit v1.2.2 (git 2.25.0) at 2025-08-23 15:36:25 -0400