Skip to content

Commit d7b70eb

Browse files
xdarklightsuperna9999
xdarklight
authored and
superna9999
committed
arm64: dts: amlogic: move CPU OPP table and clock assignment to SoC.dtsi
Move the assignment of the CPU clocks and the CPU OPP table(s) from board.dts to SoC.dtsi to reduce the code duplication. Signed-off-by: Martin Blumenstingl <martin.blumenstingl@googlemail.com> Reviewed-by: Neil Armstrong <neil.armstrong@linaro.org> Link: https://patch.msgid.link/20260109210217.828961-1-martin.blumenstingl@googlemail.com Signed-off-by: Neil Armstrong <neil.armstrong@linaro.org>
1 parent 7bcbedd commit d7b70eb

24 files changed

Lines changed: 71 additions & 186 deletions

‎arch/arm64/boot/dts/amlogic/meson-g12a-fbx8am.dts‎

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -265,26 +265,18 @@
265265

266266
&cpu0 {
267267
cpu-supply = <&vddcpu>;
268-
operating-points-v2 = <&cpu_opp_table>;
269-
clocks = <&clkc CLKID_CPU_CLK>;
270268
};
271269

272270
&cpu1 {
273271
cpu-supply = <&vddcpu>;
274-
operating-points-v2 = <&cpu_opp_table>;
275-
clocks = <&clkc CLKID_CPU_CLK>;
276272
};
277273

278274
&cpu2 {
279275
cpu-supply = <&vddcpu>;
280-
operating-points-v2 = <&cpu_opp_table>;
281-
clocks = <&clkc CLKID_CPU_CLK>;
282276
};
283277

284278
&cpu3 {
285279
cpu-supply = <&vddcpu>;
286-
operating-points-v2 = <&cpu_opp_table>;
287-
clocks = <&clkc CLKID_CPU_CLK>;
288280
};
289281

290282
&ethmac {

‎arch/arm64/boot/dts/amlogic/meson-g12a-radxa-zero.dts‎

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -218,26 +218,18 @@
218218

219219
&cpu0 {
220220
cpu-supply = <&vddcpu>;
221-
operating-points-v2 = <&cpu_opp_table>;
222-
clocks = <&clkc CLKID_CPU_CLK>;
223221
};
224222

225223
&cpu1 {
226224
cpu-supply = <&vddcpu>;
227-
operating-points-v2 = <&cpu_opp_table>;
228-
clocks = <&clkc CLKID_CPU_CLK>;
229225
};
230226

231227
&cpu2 {
232228
cpu-supply = <&vddcpu>;
233-
operating-points-v2 = <&cpu_opp_table>;
234-
clocks = <&clkc CLKID_CPU_CLK>;
235229
};
236230

237231
&cpu3 {
238232
cpu-supply = <&vddcpu>;
239-
operating-points-v2 = <&cpu_opp_table>;
240-
clocks = <&clkc CLKID_CPU_CLK>;
241233
};
242234

243235
&cvbs_vdac_port {

‎arch/arm64/boot/dts/amlogic/meson-g12a-sei510.dts‎

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -312,26 +312,18 @@
312312

313313
&cpu0 {
314314
cpu-supply = <&vddcpu>;
315-
operating-points-v2 = <&cpu_opp_table>;
316-
clocks = <&clkc CLKID_CPU_CLK>;
317315
};
318316

319317
&cpu1 {
320318
cpu-supply = <&vddcpu>;
321-
operating-points-v2 = <&cpu_opp_table>;
322-
clocks = <&clkc CLKID_CPU_CLK>;
323319
};
324320

325321
&cpu2 {
326322
cpu-supply = <&vddcpu>;
327-
operating-points-v2 = <&cpu_opp_table>;
328-
clocks = <&clkc CLKID_CPU_CLK>;
329323
};
330324

331325
&cpu3 {
332326
cpu-supply = <&vddcpu>;
333-
operating-points-v2 = <&cpu_opp_table>;
334-
clocks = <&clkc CLKID_CPU_CLK>;
335327
};
336328

337329
&cvbs_vdac_port {

‎arch/arm64/boot/dts/amlogic/meson-g12a-u200.dts‎

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -405,26 +405,18 @@
405405

406406
&cpu0 {
407407
cpu-supply = <&vddcpu>;
408-
operating-points-v2 = <&cpu_opp_table>;
409-
clocks = <&clkc CLKID_CPU_CLK>;
410408
};
411409

412410
&cpu1 {
413411
cpu-supply = <&vddcpu>;
414-
operating-points-v2 = <&cpu_opp_table>;
415-
clocks = <&clkc CLKID_CPU_CLK>;
416412
};
417413

418414
&cpu2 {
419415
cpu-supply = <&vddcpu>;
420-
operating-points-v2 = <&cpu_opp_table>;
421-
clocks = <&clkc CLKID_CPU_CLK>;
422416
};
423417

424418
&cpu3 {
425419
cpu-supply = <&vddcpu>;
426-
operating-points-v2 = <&cpu_opp_table>;
427-
clocks = <&clkc CLKID_CPU_CLK>;
428420
};
429421

430422
&clkc_audio {

‎arch/arm64/boot/dts/amlogic/meson-g12a-x96-max.dts‎

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -261,26 +261,18 @@
261261

262262
&cpu0 {
263263
cpu-supply = <&vddcpu>;
264-
operating-points-v2 = <&cpu_opp_table>;
265-
clocks = <&clkc CLKID_CPU_CLK>;
266264
};
267265

268266
&cpu1 {
269267
cpu-supply = <&vddcpu>;
270-
operating-points-v2 = <&cpu_opp_table>;
271-
clocks = <&clkc CLKID_CPU_CLK>;
272268
};
273269

274270
&cpu2 {
275271
cpu-supply = <&vddcpu>;
276-
operating-points-v2 = <&cpu_opp_table>;
277-
clocks = <&clkc CLKID_CPU_CLK>;
278272
};
279273

280274
&cpu3 {
281275
cpu-supply = <&vddcpu>;
282-
operating-points-v2 = <&cpu_opp_table>;
283-
clocks = <&clkc CLKID_CPU_CLK>;
284276
};
285277

286278
&cvbs_vdac_port {

‎arch/arm64/boot/dts/amlogic/meson-g12a.dtsi‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,8 @@
2525
i-cache-sets = <32>;
2626
next-level-cache = <&l2>;
2727
#cooling-cells = <2>;
28+
operating-points-v2 = <&cpu_opp_table>;
29+
clocks = <&clkc CLKID_CPU_CLK>;
2830
};
2931

3032
cpu1: cpu@1 {
@@ -40,6 +42,8 @@
4042
i-cache-sets = <32>;
4143
next-level-cache = <&l2>;
4244
#cooling-cells = <2>;
45+
operating-points-v2 = <&cpu_opp_table>;
46+
clocks = <&clkc CLKID_CPU_CLK>;
4347
};
4448

4549
cpu2: cpu@2 {
@@ -55,6 +59,8 @@
5559
i-cache-sets = <32>;
5660
next-level-cache = <&l2>;
5761
#cooling-cells = <2>;
62+
operating-points-v2 = <&cpu_opp_table>;
63+
clocks = <&clkc CLKID_CPU_CLK>;
5864
};
5965

6066
cpu3: cpu@3 {
@@ -70,6 +76,8 @@
7076
i-cache-sets = <32>;
7177
next-level-cache = <&l2>;
7278
#cooling-cells = <2>;
79+
operating-points-v2 = <&cpu_opp_table>;
80+
clocks = <&clkc CLKID_CPU_CLK>;
7381
};
7482

7583
l2: l2-cache0 {

‎arch/arm64/boot/dts/amlogic/meson-g12b-a311d-libretech-cc.dts‎

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@
66

77
/dts-v1/;
88

9-
#include <dt-bindings/clock/g12a-clkc.h>
109
#include "meson-g12b-a311d.dtsi"
1110
#include "meson-libretech-cottonwood.dtsi"
1211

@@ -74,38 +73,26 @@
7473

7574
&cpu0 {
7675
cpu-supply = <&vddcpu_b>;
77-
operating-points-v2 = <&cpu_opp_table_0>;
78-
clocks = <&clkc CLKID_CPU_CLK>;
7976
};
8077

8178
&cpu1 {
8279
cpu-supply = <&vddcpu_b>;
83-
operating-points-v2 = <&cpu_opp_table_0>;
84-
clocks = <&clkc CLKID_CPU_CLK>;
8580
};
8681

8782
&cpu100 {
8883
cpu-supply = <&vddcpu_a>;
89-
operating-points-v2 = <&cpub_opp_table_1>;
90-
clocks = <&clkc CLKID_CPUB_CLK>;
9184
};
9285

9386
&cpu101 {
9487
cpu-supply = <&vddcpu_a>;
95-
operating-points-v2 = <&cpub_opp_table_1>;
96-
clocks = <&clkc CLKID_CPUB_CLK>;
9788
};
9889

9990
&cpu102 {
10091
cpu-supply = <&vddcpu_a>;
101-
operating-points-v2 = <&cpub_opp_table_1>;
102-
clocks = <&clkc CLKID_CPUB_CLK>;
10392
};
10493

10594
&cpu103 {
10695
cpu-supply = <&vddcpu_a>;
107-
operating-points-v2 = <&cpub_opp_table_1>;
108-
clocks = <&clkc CLKID_CPUB_CLK>;
10996
};
11097

11198
&pwm_ab {

‎arch/arm64/boot/dts/amlogic/meson-g12b-a311d.dtsi‎

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -109,3 +109,27 @@
109109
};
110110
};
111111
};
112+
113+
&cpu0 {
114+
operating-points-v2 = <&cpu_opp_table_0>;
115+
};
116+
117+
&cpu1 {
118+
operating-points-v2 = <&cpu_opp_table_0>;
119+
};
120+
121+
&cpu100 {
122+
operating-points-v2 = <&cpub_opp_table_1>;
123+
};
124+
125+
&cpu101 {
126+
operating-points-v2 = <&cpub_opp_table_1>;
127+
};
128+
129+
&cpu102 {
130+
operating-points-v2 = <&cpub_opp_table_1>;
131+
};
132+
133+
&cpu103 {
134+
operating-points-v2 = <&cpub_opp_table_1>;
135+
};

‎arch/arm64/boot/dts/amlogic/meson-g12b-bananapi-cm4.dtsi‎

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -153,38 +153,26 @@
153153

154154
&cpu0 {
155155
cpu-supply = <&vddcpu_b>;
156-
operating-points-v2 = <&cpu_opp_table_0>;
157-
clocks = <&clkc CLKID_CPU_CLK>;
158156
};
159157

160158
&cpu1 {
161159
cpu-supply = <&vddcpu_b>;
162-
operating-points-v2 = <&cpu_opp_table_0>;
163-
clocks = <&clkc CLKID_CPU_CLK>;
164160
};
165161

166162
&cpu100 {
167163
cpu-supply = <&vddcpu_a>;
168-
operating-points-v2 = <&cpub_opp_table_1>;
169-
clocks = <&clkc CLKID_CPUB_CLK>;
170164
};
171165

172166
&cpu101 {
173167
cpu-supply = <&vddcpu_a>;
174-
operating-points-v2 = <&cpub_opp_table_1>;
175-
clocks = <&clkc CLKID_CPUB_CLK>;
176168
};
177169

178170
&cpu102 {
179171
cpu-supply = <&vddcpu_a>;
180-
operating-points-v2 = <&cpub_opp_table_1>;
181-
clocks = <&clkc CLKID_CPUB_CLK>;
182172
};
183173

184174
&cpu103 {
185175
cpu-supply = <&vddcpu_a>;
186-
operating-points-v2 = <&cpub_opp_table_1>;
187-
clocks = <&clkc CLKID_CPUB_CLK>;
188176
};
189177

190178
&ext_mdio {

‎arch/arm64/boot/dts/amlogic/meson-g12b-bananapi.dtsi‎

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -261,38 +261,26 @@
261261

262262
&cpu0 {
263263
cpu-supply = <&vddcpu_b>;
264-
operating-points-v2 = <&cpu_opp_table_0>;
265-
clocks = <&clkc CLKID_CPU_CLK>;
266264
};
267265

268266
&cpu1 {
269267
cpu-supply = <&vddcpu_b>;
270-
operating-points-v2 = <&cpu_opp_table_0>;
271-
clocks = <&clkc CLKID_CPU_CLK>;
272268
};
273269

274270
&cpu100 {
275271
cpu-supply = <&vddcpu_a>;
276-
operating-points-v2 = <&cpub_opp_table_1>;
277-
clocks = <&clkc CLKID_CPUB_CLK>;
278272
};
279273

280274
&cpu101 {
281275
cpu-supply = <&vddcpu_a>;
282-
operating-points-v2 = <&cpub_opp_table_1>;
283-
clocks = <&clkc CLKID_CPUB_CLK>;
284276
};
285277

286278
&cpu102 {
287279
cpu-supply = <&vddcpu_a>;
288-
operating-points-v2 = <&cpub_opp_table_1>;
289-
clocks = <&clkc CLKID_CPUB_CLK>;
290280
};
291281

292282
&cpu103 {
293283
cpu-supply = <&vddcpu_a>;
294-
operating-points-v2 = <&cpub_opp_table_1>;
295-
clocks = <&clkc CLKID_CPUB_CLK>;
296284
};
297285

298286
&ethmac {

0 commit comments

Comments
 (0)