Skip to content

Commit 3f64510

Browse files
ConchuODpalmer-dabbelt
authored andcommitted
riscv: dts: canaan: fix the k210's timer nodes
The timers on the k210 have non standard interrupt configurations, which leads to dtbs_check warnings: k210_generic.dtb: timer@502d0000: interrupts: [[14], [15]] is too long From schema: Documentation/devicetree/bindings/timer/snps,dw-apb-timer.yaml Split the timer nodes in two, so that the second timer in the IP block can actually be accessed & in the process solve the dtbs_check warning. Reviewed-by: Serge Semin <[email protected]> Signed-off-by: Conor Dooley <[email protected]> Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Palmer Dabbelt <[email protected]>
1 parent 465c127 commit 3f64510

File tree

1 file changed

+38
-8
lines changed

1 file changed

+38
-8
lines changed

arch/riscv/boot/dts/canaan/k210.dtsi

Lines changed: 38 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -319,28 +319,58 @@
319319

320320
timer0: timer@502d0000 {
321321
compatible = "snps,dw-apb-timer";
322-
reg = <0x502D0000 0x100>;
323-
interrupts = <14>, <15>;
322+
reg = <0x502D0000 0x14>;
323+
interrupts = <14>;
324324
clocks = <&sysclk K210_CLK_TIMER0>,
325325
<&sysclk K210_CLK_APB0>;
326326
clock-names = "timer", "pclk";
327327
resets = <&sysrst K210_RST_TIMER0>;
328328
};
329329

330-
timer1: timer@502e0000 {
330+
timer1: timer@502d0014 {
331331
compatible = "snps,dw-apb-timer";
332-
reg = <0x502E0000 0x100>;
333-
interrupts = <16>, <17>;
332+
reg = <0x502D0014 0x14>;
333+
interrupts = <15>;
334+
clocks = <&sysclk K210_CLK_TIMER0>,
335+
<&sysclk K210_CLK_APB0>;
336+
clock-names = "timer", "pclk";
337+
resets = <&sysrst K210_RST_TIMER0>;
338+
};
339+
340+
timer2: timer@502e0000 {
341+
compatible = "snps,dw-apb-timer";
342+
reg = <0x502E0000 0x14>;
343+
interrupts = <16>;
334344
clocks = <&sysclk K210_CLK_TIMER1>,
335345
<&sysclk K210_CLK_APB0>;
336346
clock-names = "timer", "pclk";
337347
resets = <&sysrst K210_RST_TIMER1>;
338348
};
339349

340-
timer2: timer@502f0000 {
350+
timer3: timer@502e0014 {
351+
compatible = "snps,dw-apb-timer";
352+
reg = <0x502E0014 0x114>;
353+
interrupts = <17>;
354+
clocks = <&sysclk K210_CLK_TIMER1>,
355+
<&sysclk K210_CLK_APB0>;
356+
clock-names = "timer", "pclk";
357+
resets = <&sysrst K210_RST_TIMER1>;
358+
};
359+
360+
timer4: timer@502f0000 {
361+
compatible = "snps,dw-apb-timer";
362+
reg = <0x502F0000 0x14>;
363+
interrupts = <18>;
364+
clocks = <&sysclk K210_CLK_TIMER2>,
365+
<&sysclk K210_CLK_APB0>;
366+
clock-names = "timer", "pclk";
367+
resets = <&sysrst K210_RST_TIMER2>;
368+
};
369+
370+
timer5: timer@502f0014 {
341371
compatible = "snps,dw-apb-timer";
342-
reg = <0x502F0000 0x100>;
343-
interrupts = <18>, <19>;
372+
reg = <0x502F0014 0x14>;
373+
interrupts = <19>;
344374
clocks = <&sysclk K210_CLK_TIMER2>,
345375
<&sysclk K210_CLK_APB0>;
346376
clock-names = "timer", "pclk";

0 commit comments

Comments
 (0)