Skip to content

Commit d925889

Browse files
Andre-ARMsudeep-holla
authored andcommitted
arm64: dts: vexpress: Move fixed devices out of bus node
The devicetree compiler complains when DT nodes without a reg property live inside a (simple) bus node: Warning (simple_bus_reg): Node /bus@8000000/motherboard-bus/refclk32khz missing or empty reg/ranges property Move the fixed clocks, the fixed regulator, the leds and the config bus subtree to the root node, since they do not depend on any busses. Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Andre Przywara <[email protected]> Signed-off-by: Sudeep Holla <[email protected]>
1 parent 849bfc3 commit d925889

File tree

1 file changed

+154
-154
lines changed

1 file changed

+154
-154
lines changed

arch/arm/boot/dts/vexpress-v2m-rs1.dtsi

Lines changed: 154 additions & 154 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,160 @@
1919
*/
2020

2121
/ {
22+
v2m_fixed_3v3: fixed-regulator-0 {
23+
compatible = "regulator-fixed";
24+
regulator-name = "3V3";
25+
regulator-min-microvolt = <3300000>;
26+
regulator-max-microvolt = <3300000>;
27+
regulator-always-on;
28+
};
29+
30+
v2m_clk24mhz: clk24mhz {
31+
compatible = "fixed-clock";
32+
#clock-cells = <0>;
33+
clock-frequency = <24000000>;
34+
clock-output-names = "v2m:clk24mhz";
35+
};
36+
37+
v2m_refclk1mhz: refclk1mhz {
38+
compatible = "fixed-clock";
39+
#clock-cells = <0>;
40+
clock-frequency = <1000000>;
41+
clock-output-names = "v2m:refclk1mhz";
42+
};
43+
44+
v2m_refclk32khz: refclk32khz {
45+
compatible = "fixed-clock";
46+
#clock-cells = <0>;
47+
clock-frequency = <32768>;
48+
clock-output-names = "v2m:refclk32khz";
49+
};
50+
51+
leds {
52+
compatible = "gpio-leds";
53+
54+
user1 {
55+
label = "v2m:green:user1";
56+
gpios = <&v2m_led_gpios 0 0>;
57+
linux,default-trigger = "heartbeat";
58+
};
59+
60+
user2 {
61+
label = "v2m:green:user2";
62+
gpios = <&v2m_led_gpios 1 0>;
63+
linux,default-trigger = "disk-activity";
64+
};
65+
66+
user3 {
67+
label = "v2m:green:user3";
68+
gpios = <&v2m_led_gpios 2 0>;
69+
linux,default-trigger = "cpu0";
70+
};
71+
72+
user4 {
73+
label = "v2m:green:user4";
74+
gpios = <&v2m_led_gpios 3 0>;
75+
linux,default-trigger = "cpu1";
76+
};
77+
78+
user5 {
79+
label = "v2m:green:user5";
80+
gpios = <&v2m_led_gpios 4 0>;
81+
linux,default-trigger = "cpu2";
82+
};
83+
84+
user6 {
85+
label = "v2m:green:user6";
86+
gpios = <&v2m_led_gpios 5 0>;
87+
linux,default-trigger = "cpu3";
88+
};
89+
90+
user7 {
91+
label = "v2m:green:user7";
92+
gpios = <&v2m_led_gpios 6 0>;
93+
linux,default-trigger = "cpu4";
94+
};
95+
96+
user8 {
97+
label = "v2m:green:user8";
98+
gpios = <&v2m_led_gpios 7 0>;
99+
linux,default-trigger = "cpu5";
100+
};
101+
};
102+
103+
mcc {
104+
compatible = "arm,vexpress,config-bus";
105+
arm,vexpress,config-bridge = <&v2m_sysreg>;
106+
107+
oscclk0 {
108+
/* MCC static memory clock */
109+
compatible = "arm,vexpress-osc";
110+
arm,vexpress-sysreg,func = <1 0>;
111+
freq-range = <25000000 60000000>;
112+
#clock-cells = <0>;
113+
clock-output-names = "v2m:oscclk0";
114+
};
115+
116+
v2m_oscclk1: oscclk1 {
117+
/* CLCD clock */
118+
compatible = "arm,vexpress-osc";
119+
arm,vexpress-sysreg,func = <1 1>;
120+
freq-range = <23750000 65000000>;
121+
#clock-cells = <0>;
122+
clock-output-names = "v2m:oscclk1";
123+
};
124+
125+
v2m_oscclk2: oscclk2 {
126+
/* IO FPGA peripheral clock */
127+
compatible = "arm,vexpress-osc";
128+
arm,vexpress-sysreg,func = <1 2>;
129+
freq-range = <24000000 24000000>;
130+
#clock-cells = <0>;
131+
clock-output-names = "v2m:oscclk2";
132+
};
133+
134+
volt-vio {
135+
/* Logic level voltage */
136+
compatible = "arm,vexpress-volt";
137+
arm,vexpress-sysreg,func = <2 0>;
138+
regulator-name = "VIO";
139+
regulator-always-on;
140+
label = "VIO";
141+
};
142+
143+
temp-mcc {
144+
/* MCC internal operating temperature */
145+
compatible = "arm,vexpress-temp";
146+
arm,vexpress-sysreg,func = <4 0>;
147+
label = "MCC";
148+
};
149+
150+
reset {
151+
compatible = "arm,vexpress-reset";
152+
arm,vexpress-sysreg,func = <5 0>;
153+
};
154+
155+
muxfpga {
156+
compatible = "arm,vexpress-muxfpga";
157+
arm,vexpress-sysreg,func = <7 0>;
158+
};
159+
160+
shutdown {
161+
compatible = "arm,vexpress-shutdown";
162+
arm,vexpress-sysreg,func = <8 0>;
163+
};
164+
165+
reboot {
166+
compatible = "arm,vexpress-reboot";
167+
arm,vexpress-sysreg,func = <9 0>;
168+
};
169+
170+
dvimode {
171+
compatible = "arm,vexpress-dvimode";
172+
arm,vexpress-sysreg,func = <11 0>;
173+
};
174+
};
175+
22176
bus@8000000 {
23177
motherboard {
24178
model = "V2M-P1";
@@ -282,160 +436,6 @@
282436
};
283437
};
284438
};
285-
286-
v2m_fixed_3v3: fixed-regulator-0 {
287-
compatible = "regulator-fixed";
288-
regulator-name = "3V3";
289-
regulator-min-microvolt = <3300000>;
290-
regulator-max-microvolt = <3300000>;
291-
regulator-always-on;
292-
};
293-
294-
v2m_clk24mhz: clk24mhz {
295-
compatible = "fixed-clock";
296-
#clock-cells = <0>;
297-
clock-frequency = <24000000>;
298-
clock-output-names = "v2m:clk24mhz";
299-
};
300-
301-
v2m_refclk1mhz: refclk1mhz {
302-
compatible = "fixed-clock";
303-
#clock-cells = <0>;
304-
clock-frequency = <1000000>;
305-
clock-output-names = "v2m:refclk1mhz";
306-
};
307-
308-
v2m_refclk32khz: refclk32khz {
309-
compatible = "fixed-clock";
310-
#clock-cells = <0>;
311-
clock-frequency = <32768>;
312-
clock-output-names = "v2m:refclk32khz";
313-
};
314-
315-
leds {
316-
compatible = "gpio-leds";
317-
318-
user1 {
319-
label = "v2m:green:user1";
320-
gpios = <&v2m_led_gpios 0 0>;
321-
linux,default-trigger = "heartbeat";
322-
};
323-
324-
user2 {
325-
label = "v2m:green:user2";
326-
gpios = <&v2m_led_gpios 1 0>;
327-
linux,default-trigger = "mmc0";
328-
};
329-
330-
user3 {
331-
label = "v2m:green:user3";
332-
gpios = <&v2m_led_gpios 2 0>;
333-
linux,default-trigger = "cpu0";
334-
};
335-
336-
user4 {
337-
label = "v2m:green:user4";
338-
gpios = <&v2m_led_gpios 3 0>;
339-
linux,default-trigger = "cpu1";
340-
};
341-
342-
user5 {
343-
label = "v2m:green:user5";
344-
gpios = <&v2m_led_gpios 4 0>;
345-
linux,default-trigger = "cpu2";
346-
};
347-
348-
user6 {
349-
label = "v2m:green:user6";
350-
gpios = <&v2m_led_gpios 5 0>;
351-
linux,default-trigger = "cpu3";
352-
};
353-
354-
user7 {
355-
label = "v2m:green:user7";
356-
gpios = <&v2m_led_gpios 6 0>;
357-
linux,default-trigger = "cpu4";
358-
};
359-
360-
user8 {
361-
label = "v2m:green:user8";
362-
gpios = <&v2m_led_gpios 7 0>;
363-
linux,default-trigger = "cpu5";
364-
};
365-
};
366-
367-
mcc {
368-
compatible = "arm,vexpress,config-bus";
369-
arm,vexpress,config-bridge = <&v2m_sysreg>;
370-
371-
oscclk0 {
372-
/* MCC static memory clock */
373-
compatible = "arm,vexpress-osc";
374-
arm,vexpress-sysreg,func = <1 0>;
375-
freq-range = <25000000 60000000>;
376-
#clock-cells = <0>;
377-
clock-output-names = "v2m:oscclk0";
378-
};
379-
380-
v2m_oscclk1: oscclk1 {
381-
/* CLCD clock */
382-
compatible = "arm,vexpress-osc";
383-
arm,vexpress-sysreg,func = <1 1>;
384-
freq-range = <23750000 65000000>;
385-
#clock-cells = <0>;
386-
clock-output-names = "v2m:oscclk1";
387-
};
388-
389-
v2m_oscclk2: oscclk2 {
390-
/* IO FPGA peripheral clock */
391-
compatible = "arm,vexpress-osc";
392-
arm,vexpress-sysreg,func = <1 2>;
393-
freq-range = <24000000 24000000>;
394-
#clock-cells = <0>;
395-
clock-output-names = "v2m:oscclk2";
396-
};
397-
398-
volt-vio {
399-
/* Logic level voltage */
400-
compatible = "arm,vexpress-volt";
401-
arm,vexpress-sysreg,func = <2 0>;
402-
regulator-name = "VIO";
403-
regulator-always-on;
404-
label = "VIO";
405-
};
406-
407-
temp-mcc {
408-
/* MCC internal operating temperature */
409-
compatible = "arm,vexpress-temp";
410-
arm,vexpress-sysreg,func = <4 0>;
411-
label = "MCC";
412-
};
413-
414-
reset {
415-
compatible = "arm,vexpress-reset";
416-
arm,vexpress-sysreg,func = <5 0>;
417-
};
418-
419-
muxfpga {
420-
compatible = "arm,vexpress-muxfpga";
421-
arm,vexpress-sysreg,func = <7 0>;
422-
};
423-
424-
shutdown {
425-
compatible = "arm,vexpress-shutdown";
426-
arm,vexpress-sysreg,func = <8 0>;
427-
};
428-
429-
reboot {
430-
compatible = "arm,vexpress-reboot";
431-
arm,vexpress-sysreg,func = <9 0>;
432-
};
433-
434-
dvimode {
435-
compatible = "arm,vexpress-dvimode";
436-
arm,vexpress-sysreg,func = <11 0>;
437-
};
438-
};
439439
};
440440
};
441441
};

0 commit comments

Comments
 (0)