Skip to content

Commit 3b2802c

Browse files
committed
riscv: dts: spacemit: Acquire clocks for UART
The K1 SoC features two clocks for UART controller, Acquire them explicitly in the driver. Also it is required to remove the clock-frequency properties from the uart node, otherwise the new clock properties are ignored by of_platform_serial_setup() in "8250_of.c". Reviewed-by: Alex Elder <[email protected]> Reviewed-by: Haylen Chu <[email protected]> Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Yixun Lan <[email protected]>
1 parent c4f3c45 commit 3b2802c

File tree

1 file changed

+27
-9
lines changed
  • arch/riscv/boot/dts/spacemit

1 file changed

+27
-9
lines changed

arch/riscv/boot/dts/spacemit/k1.dtsi

Lines changed: 27 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -360,8 +360,10 @@
360360
uart0: serial@d4017000 {
361361
compatible = "spacemit,k1-uart", "intel,xscale-uart";
362362
reg = <0x0 0xd4017000 0x0 0x100>;
363+
clocks = <&syscon_apbc CLK_UART0>,
364+
<&syscon_apbc CLK_UART0_BUS>;
365+
clock-names = "core", "bus";
363366
interrupts = <42>;
364-
clock-frequency = <14857000>;
365367
reg-shift = <2>;
366368
reg-io-width = <4>;
367369
status = "disabled";
@@ -370,8 +372,10 @@
370372
uart2: serial@d4017100 {
371373
compatible = "spacemit,k1-uart", "intel,xscale-uart";
372374
reg = <0x0 0xd4017100 0x0 0x100>;
375+
clocks = <&syscon_apbc CLK_UART2>,
376+
<&syscon_apbc CLK_UART2_BUS>;
377+
clock-names = "core", "bus";
373378
interrupts = <44>;
374-
clock-frequency = <14857000>;
375379
reg-shift = <2>;
376380
reg-io-width = <4>;
377381
status = "disabled";
@@ -380,8 +384,10 @@
380384
uart3: serial@d4017200 {
381385
compatible = "spacemit,k1-uart", "intel,xscale-uart";
382386
reg = <0x0 0xd4017200 0x0 0x100>;
387+
clocks = <&syscon_apbc CLK_UART3>,
388+
<&syscon_apbc CLK_UART3_BUS>;
389+
clock-names = "core", "bus";
383390
interrupts = <45>;
384-
clock-frequency = <14857000>;
385391
reg-shift = <2>;
386392
reg-io-width = <4>;
387393
status = "disabled";
@@ -390,8 +396,10 @@
390396
uart4: serial@d4017300 {
391397
compatible = "spacemit,k1-uart", "intel,xscale-uart";
392398
reg = <0x0 0xd4017300 0x0 0x100>;
399+
clocks = <&syscon_apbc CLK_UART4>,
400+
<&syscon_apbc CLK_UART4_BUS>;
401+
clock-names = "core", "bus";
393402
interrupts = <46>;
394-
clock-frequency = <14857000>;
395403
reg-shift = <2>;
396404
reg-io-width = <4>;
397405
status = "disabled";
@@ -400,8 +408,10 @@
400408
uart5: serial@d4017400 {
401409
compatible = "spacemit,k1-uart", "intel,xscale-uart";
402410
reg = <0x0 0xd4017400 0x0 0x100>;
411+
clocks = <&syscon_apbc CLK_UART5>,
412+
<&syscon_apbc CLK_UART5_BUS>;
413+
clock-names = "core", "bus";
403414
interrupts = <47>;
404-
clock-frequency = <14857000>;
405415
reg-shift = <2>;
406416
reg-io-width = <4>;
407417
status = "disabled";
@@ -410,8 +420,10 @@
410420
uart6: serial@d4017500 {
411421
compatible = "spacemit,k1-uart", "intel,xscale-uart";
412422
reg = <0x0 0xd4017500 0x0 0x100>;
423+
clocks = <&syscon_apbc CLK_UART6>,
424+
<&syscon_apbc CLK_UART6_BUS>;
425+
clock-names = "core", "bus";
413426
interrupts = <48>;
414-
clock-frequency = <14857000>;
415427
reg-shift = <2>;
416428
reg-io-width = <4>;
417429
status = "disabled";
@@ -420,8 +432,10 @@
420432
uart7: serial@d4017600 {
421433
compatible = "spacemit,k1-uart", "intel,xscale-uart";
422434
reg = <0x0 0xd4017600 0x0 0x100>;
435+
clocks = <&syscon_apbc CLK_UART7>,
436+
<&syscon_apbc CLK_UART7_BUS>;
437+
clock-names = "core", "bus";
423438
interrupts = <49>;
424-
clock-frequency = <14857000>;
425439
reg-shift = <2>;
426440
reg-io-width = <4>;
427441
status = "disabled";
@@ -430,8 +444,10 @@
430444
uart8: serial@d4017700 {
431445
compatible = "spacemit,k1-uart", "intel,xscale-uart";
432446
reg = <0x0 0xd4017700 0x0 0x100>;
447+
clocks = <&syscon_apbc CLK_UART8>,
448+
<&syscon_apbc CLK_UART8_BUS>;
449+
clock-names = "core", "bus";
433450
interrupts = <50>;
434-
clock-frequency = <14857000>;
435451
reg-shift = <2>;
436452
reg-io-width = <4>;
437453
status = "disabled";
@@ -440,8 +456,10 @@
440456
uart9: serial@d4017800 {
441457
compatible = "spacemit,k1-uart", "intel,xscale-uart";
442458
reg = <0x0 0xd4017800 0x0 0x100>;
459+
clocks = <&syscon_apbc CLK_UART9>,
460+
<&syscon_apbc CLK_UART9_BUS>;
461+
clock-names = "core", "bus";
443462
interrupts = <51>;
444-
clock-frequency = <14857000>;
445463
reg-shift = <2>;
446464
reg-io-width = <4>;
447465
status = "disabled";

0 commit comments

Comments
 (0)