Skip to content

Commit 4ed81d9

Browse files
hal-fenggregkh
authored andcommitted
riscv: dts: starfive: jh7110: Add the core reset and jh7110 compatible for uarts
Add the core reset for uarts, which is necessary for uarts to work. Signed-off-by: Hal Feng <[email protected]> Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Greg Kroah-Hartman <[email protected]>
1 parent 41424f5 commit 4ed81d9

File tree

1 file changed

+18
-12
lines changed

1 file changed

+18
-12
lines changed

arch/riscv/boot/dts/starfive/jh7110.dtsi

Lines changed: 18 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -387,38 +387,41 @@
387387
};
388388

389389
uart0: serial@10000000 {
390-
compatible = "snps,dw-apb-uart";
390+
compatible = "starfive,jh7110-uart", "snps,dw-apb-uart";
391391
reg = <0x0 0x10000000 0x0 0x10000>;
392392
clocks = <&syscrg JH7110_SYSCLK_UART0_CORE>,
393393
<&syscrg JH7110_SYSCLK_UART0_APB>;
394394
clock-names = "baudclk", "apb_pclk";
395-
resets = <&syscrg JH7110_SYSRST_UART0_APB>;
395+
resets = <&syscrg JH7110_SYSRST_UART0_APB>,
396+
<&syscrg JH7110_SYSRST_UART0_CORE>;
396397
interrupts = <32>;
397398
reg-io-width = <4>;
398399
reg-shift = <2>;
399400
status = "disabled";
400401
};
401402

402403
uart1: serial@10010000 {
403-
compatible = "snps,dw-apb-uart";
404+
compatible = "starfive,jh7110-uart", "snps,dw-apb-uart";
404405
reg = <0x0 0x10010000 0x0 0x10000>;
405406
clocks = <&syscrg JH7110_SYSCLK_UART1_CORE>,
406407
<&syscrg JH7110_SYSCLK_UART1_APB>;
407408
clock-names = "baudclk", "apb_pclk";
408-
resets = <&syscrg JH7110_SYSRST_UART1_APB>;
409+
resets = <&syscrg JH7110_SYSRST_UART1_APB>,
410+
<&syscrg JH7110_SYSRST_UART1_CORE>;
409411
interrupts = <33>;
410412
reg-io-width = <4>;
411413
reg-shift = <2>;
412414
status = "disabled";
413415
};
414416

415417
uart2: serial@10020000 {
416-
compatible = "snps,dw-apb-uart";
418+
compatible = "starfive,jh7110-uart", "snps,dw-apb-uart";
417419
reg = <0x0 0x10020000 0x0 0x10000>;
418420
clocks = <&syscrg JH7110_SYSCLK_UART2_CORE>,
419421
<&syscrg JH7110_SYSCLK_UART2_APB>;
420422
clock-names = "baudclk", "apb_pclk";
421-
resets = <&syscrg JH7110_SYSRST_UART2_APB>;
423+
resets = <&syscrg JH7110_SYSRST_UART2_APB>,
424+
<&syscrg JH7110_SYSRST_UART2_CORE>;
422425
interrupts = <34>;
423426
reg-io-width = <4>;
424427
reg-shift = <2>;
@@ -642,38 +645,41 @@
642645
};
643646

644647
uart3: serial@12000000 {
645-
compatible = "snps,dw-apb-uart";
648+
compatible = "starfive,jh7110-uart", "snps,dw-apb-uart";
646649
reg = <0x0 0x12000000 0x0 0x10000>;
647650
clocks = <&syscrg JH7110_SYSCLK_UART3_CORE>,
648651
<&syscrg JH7110_SYSCLK_UART3_APB>;
649652
clock-names = "baudclk", "apb_pclk";
650-
resets = <&syscrg JH7110_SYSRST_UART3_APB>;
653+
resets = <&syscrg JH7110_SYSRST_UART3_APB>,
654+
<&syscrg JH7110_SYSRST_UART3_CORE>;
651655
interrupts = <45>;
652656
reg-io-width = <4>;
653657
reg-shift = <2>;
654658
status = "disabled";
655659
};
656660

657661
uart4: serial@12010000 {
658-
compatible = "snps,dw-apb-uart";
662+
compatible = "starfive,jh7110-uart", "snps,dw-apb-uart";
659663
reg = <0x0 0x12010000 0x0 0x10000>;
660664
clocks = <&syscrg JH7110_SYSCLK_UART4_CORE>,
661665
<&syscrg JH7110_SYSCLK_UART4_APB>;
662666
clock-names = "baudclk", "apb_pclk";
663-
resets = <&syscrg JH7110_SYSRST_UART4_APB>;
667+
resets = <&syscrg JH7110_SYSRST_UART4_APB>,
668+
<&syscrg JH7110_SYSRST_UART4_CORE>;
664669
interrupts = <46>;
665670
reg-io-width = <4>;
666671
reg-shift = <2>;
667672
status = "disabled";
668673
};
669674

670675
uart5: serial@12020000 {
671-
compatible = "snps,dw-apb-uart";
676+
compatible = "starfive,jh7110-uart", "snps,dw-apb-uart";
672677
reg = <0x0 0x12020000 0x0 0x10000>;
673678
clocks = <&syscrg JH7110_SYSCLK_UART5_CORE>,
674679
<&syscrg JH7110_SYSCLK_UART5_APB>;
675680
clock-names = "baudclk", "apb_pclk";
676-
resets = <&syscrg JH7110_SYSRST_UART5_APB>;
681+
resets = <&syscrg JH7110_SYSRST_UART5_APB>,
682+
<&syscrg JH7110_SYSRST_UART5_CORE>;
677683
interrupts = <47>;
678684
reg-io-width = <4>;
679685
reg-shift = <2>;

0 commit comments

Comments
 (0)