korg/linux
0
0
Fork 0
mirror of https://mirrors.bfsu.edu.cn/git/linux.git synced 2024-11-25 13:14:07 +08:00
Code Issues Packages Projects Releases Wiki Activity

riscv: dts: starfive: convert isa detection to new properties

Browse Source 
Convert the jh7100 and jh7110 devicetrees to use the new properties
"riscv,isa-base" & "riscv,isa-extensions".
For compatibility with other projects, "riscv,isa" remains.

Signed-off-by: Conor Dooley <conor.dooley@microchip.com>
This commit is contained in:
Conor Dooley 2023-10-09 10:37:47 +01:00
parent a54f42722e
commit 81b5948cf1
2 changed files with 21 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
arch/riscv/boot/dts/starfive/jh7100.dtsi
View File

@ -33,6 +33,9 @@
i-tlb-size = <32>; i-tlb-size = <32>;
mmu-type = "riscv,sv39"; mmu-type = "riscv,sv39";
riscv,isa = "rv64imafdc"; riscv,isa = "rv64imafdc";
riscv,isa-base = "rv64i";
riscv,isa-extensions = "i", "m", "a", "f", "d", "c", "zicntr", "zicsr",
"zifencei", "zihpm";
tlb-split; tlb-split;
cpu0_intc: interrupt-controller { cpu0_intc: interrupt-controller {
@ -58,6 +61,9 @@
i-tlb-size = <32>; i-tlb-size = <32>;
mmu-type = "riscv,sv39"; mmu-type = "riscv,sv39";
riscv,isa = "rv64imafdc"; riscv,isa = "rv64imafdc";
riscv,isa-base = "rv64i";
riscv,isa-extensions = "i", "m", "a", "f", "d", "c", "zicntr", "zicsr",
"zifencei", "zihpm";
tlb-split; tlb-split;
cpu1_intc: interrupt-controller { cpu1_intc: interrupt-controller {

15
arch/riscv/boot/dts/starfive/jh7110.dtsi
View File

@ -28,6 +28,9 @@
i-cache-size = <16384>; i-cache-size = <16384>;
next-level-cache = <&ccache>; next-level-cache = <&ccache>;
riscv,isa = "rv64imac_zba_zbb"; riscv,isa = "rv64imac_zba_zbb";
riscv,isa-base = "rv64i";
riscv,isa-extensions = "i", "m", "a", "c", "zba", "zbb", "zicntr", "zicsr",
"zifencei", "zihpm";
status = "disabled"; status = "disabled";
cpu0_intc: interrupt-controller { cpu0_intc: interrupt-controller {
@ -54,6 +57,9 @@
mmu-type = "riscv,sv39"; mmu-type = "riscv,sv39";
next-level-cache = <&ccache>; next-level-cache = <&ccache>;
riscv,isa = "rv64imafdc_zba_zbb"; riscv,isa = "rv64imafdc_zba_zbb";
riscv,isa-base = "rv64i";
riscv,isa-extensions = "i", "m", "a", "f", "d", "c", "zba", "zbb", "zicntr",
"zicsr", "zifencei", "zihpm";
tlb-split; tlb-split;
operating-points-v2 = <&cpu_opp>; operating-points-v2 = <&cpu_opp>;
clocks = <&syscrg JH7110_SYSCLK_CPU_CORE>; clocks = <&syscrg JH7110_SYSCLK_CPU_CORE>;
@ -84,6 +90,9 @@
mmu-type = "riscv,sv39"; mmu-type = "riscv,sv39";
next-level-cache = <&ccache>; next-level-cache = <&ccache>;
riscv,isa = "rv64imafdc_zba_zbb"; riscv,isa = "rv64imafdc_zba_zbb";
riscv,isa-base = "rv64i";
riscv,isa-extensions = "i", "m", "a", "f", "d", "c", "zba", "zbb", "zicntr",
"zicsr", "zifencei", "zihpm";
tlb-split; tlb-split;
operating-points-v2 = <&cpu_opp>; operating-points-v2 = <&cpu_opp>;
clocks = <&syscrg JH7110_SYSCLK_CPU_CORE>; clocks = <&syscrg JH7110_SYSCLK_CPU_CORE>;
@ -114,6 +123,9 @@
mmu-type = "riscv,sv39"; mmu-type = "riscv,sv39";
next-level-cache = <&ccache>; next-level-cache = <&ccache>;
riscv,isa = "rv64imafdc_zba_zbb"; riscv,isa = "rv64imafdc_zba_zbb";
riscv,isa-base = "rv64i";
riscv,isa-extensions = "i", "m", "a", "f", "d", "c", "zba", "zbb", "zicntr",
"zicsr", "zifencei", "zihpm";
tlb-split; tlb-split;
operating-points-v2 = <&cpu_opp>; operating-points-v2 = <&cpu_opp>;
clocks = <&syscrg JH7110_SYSCLK_CPU_CORE>; clocks = <&syscrg JH7110_SYSCLK_CPU_CORE>;
@ -144,6 +156,9 @@
mmu-type = "riscv,sv39"; mmu-type = "riscv,sv39";
next-level-cache = <&ccache>; next-level-cache = <&ccache>;
riscv,isa = "rv64imafdc_zba_zbb"; riscv,isa = "rv64imafdc_zba_zbb";
riscv,isa-base = "rv64i";
riscv,isa-extensions = "i", "m", "a", "f", "d", "c", "zba", "zbb", "zicntr",
"zicsr", "zifencei", "zihpm";
tlb-split; tlb-split;
operating-points-v2 = <&cpu_opp>; operating-points-v2 = <&cpu_opp>;
clocks = <&syscrg JH7110_SYSCLK_CPU_CORE>; clocks = <&syscrg JH7110_SYSCLK_CPU_CORE>;