Skip to content

Commit 81b5948

Browse files
committed
riscv: dts: starfive: convert isa detection to new properties
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>
1 parent a54f427 commit 81b5948

2 files changed

Lines changed: 21 additions & 0 deletions

File tree

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

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,9 @@
3333
i-tlb-size = <32>;
3434
mmu-type = "riscv,sv39";
3535
riscv,isa = "rv64imafdc";
36+
riscv,isa-base = "rv64i";
37+
riscv,isa-extensions = "i", "m", "a", "f", "d", "c", "zicntr", "zicsr",
38+
"zifencei", "zihpm";
3639
tlb-split;
3740

3841
cpu0_intc: interrupt-controller {
@@ -58,6 +61,9 @@
5861
i-tlb-size = <32>;
5962
mmu-type = "riscv,sv39";
6063
riscv,isa = "rv64imafdc";
64+
riscv,isa-base = "rv64i";
65+
riscv,isa-extensions = "i", "m", "a", "f", "d", "c", "zicntr", "zicsr",
66+
"zifencei", "zihpm";
6167
tlb-split;
6268

6369
cpu1_intc: interrupt-controller {

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

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,9 @@
2828
i-cache-size = <16384>;
2929
next-level-cache = <&ccache>;
3030
riscv,isa = "rv64imac_zba_zbb";
31+
riscv,isa-base = "rv64i";
32+
riscv,isa-extensions = "i", "m", "a", "c", "zba", "zbb", "zicntr", "zicsr",
33+
"zifencei", "zihpm";
3134
status = "disabled";
3235

3336
cpu0_intc: interrupt-controller {
@@ -54,6 +57,9 @@
5457
mmu-type = "riscv,sv39";
5558
next-level-cache = <&ccache>;
5659
riscv,isa = "rv64imafdc_zba_zbb";
60+
riscv,isa-base = "rv64i";
61+
riscv,isa-extensions = "i", "m", "a", "f", "d", "c", "zba", "zbb", "zicntr",
62+
"zicsr", "zifencei", "zihpm";
5763
tlb-split;
5864
operating-points-v2 = <&cpu_opp>;
5965
clocks = <&syscrg JH7110_SYSCLK_CPU_CORE>;
@@ -84,6 +90,9 @@
8490
mmu-type = "riscv,sv39";
8591
next-level-cache = <&ccache>;
8692
riscv,isa = "rv64imafdc_zba_zbb";
93+
riscv,isa-base = "rv64i";
94+
riscv,isa-extensions = "i", "m", "a", "f", "d", "c", "zba", "zbb", "zicntr",
95+
"zicsr", "zifencei", "zihpm";
8796
tlb-split;
8897
operating-points-v2 = <&cpu_opp>;
8998
clocks = <&syscrg JH7110_SYSCLK_CPU_CORE>;
@@ -114,6 +123,9 @@
114123
mmu-type = "riscv,sv39";
115124
next-level-cache = <&ccache>;
116125
riscv,isa = "rv64imafdc_zba_zbb";
126+
riscv,isa-base = "rv64i";
127+
riscv,isa-extensions = "i", "m", "a", "f", "d", "c", "zba", "zbb", "zicntr",
128+
"zicsr", "zifencei", "zihpm";
117129
tlb-split;
118130
operating-points-v2 = <&cpu_opp>;
119131
clocks = <&syscrg JH7110_SYSCLK_CPU_CORE>;
@@ -144,6 +156,9 @@
144156
mmu-type = "riscv,sv39";
145157
next-level-cache = <&ccache>;
146158
riscv,isa = "rv64imafdc_zba_zbb";
159+
riscv,isa-base = "rv64i";
160+
riscv,isa-extensions = "i", "m", "a", "f", "d", "c", "zba", "zbb", "zicntr",
161+
"zicsr", "zifencei", "zihpm";
147162
tlb-split;
148163
operating-points-v2 = <&cpu_opp>;
149164
clocks = <&syscrg JH7110_SYSCLK_CPU_CORE>;

0 commit comments

Comments
 (0)