Skip to content

Commit a54f427

Browse files
committed
riscv: dts: sifive: convert isa detection to new properties
Convert the fu540 and fu740 devicetrees to use the new properties "riscv,isa-base" & "riscv,isa-extensions". For compatibility with other projects, "riscv,isa" remains. Reviewed-by: Samuel Holland <samuel.holland@sifive.com> Signed-off-by: Conor Dooley <conor.dooley@microchip.com>
1 parent 561add0 commit a54f427

2 files changed

Lines changed: 30 additions & 0 deletions

File tree

arch/riscv/boot/dts/sifive/fu540-c000.dtsi

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,9 @@
3030
i-cache-size = <16384>;
3131
reg = <0>;
3232
riscv,isa = "rv64imac";
33+
riscv,isa-base = "rv64i";
34+
riscv,isa-extensions = "i", "m", "a", "c", "zicntr", "zicsr", "zifencei",
35+
"zihpm";
3336
status = "disabled";
3437
cpu0_intc: interrupt-controller {
3538
#interrupt-cells = <1>;
@@ -53,6 +56,9 @@
5356
mmu-type = "riscv,sv39";
5457
reg = <1>;
5558
riscv,isa = "rv64imafdc";
59+
riscv,isa-base = "rv64i";
60+
riscv,isa-extensions = "i", "m", "a", "f", "d", "c", "zicntr", "zicsr",
61+
"zifencei", "zihpm";
5662
tlb-split;
5763
next-level-cache = <&l2cache>;
5864
cpu1_intc: interrupt-controller {
@@ -77,6 +83,9 @@
7783
mmu-type = "riscv,sv39";
7884
reg = <2>;
7985
riscv,isa = "rv64imafdc";
86+
riscv,isa-base = "rv64i";
87+
riscv,isa-extensions = "i", "m", "a", "f", "d", "c", "zicntr", "zicsr",
88+
"zifencei", "zihpm";
8089
tlb-split;
8190
next-level-cache = <&l2cache>;
8291
cpu2_intc: interrupt-controller {
@@ -101,6 +110,9 @@
101110
mmu-type = "riscv,sv39";
102111
reg = <3>;
103112
riscv,isa = "rv64imafdc";
113+
riscv,isa-base = "rv64i";
114+
riscv,isa-extensions = "i", "m", "a", "f", "d", "c", "zicntr", "zicsr",
115+
"zifencei", "zihpm";
104116
tlb-split;
105117
next-level-cache = <&l2cache>;
106118
cpu3_intc: interrupt-controller {
@@ -125,6 +137,9 @@
125137
mmu-type = "riscv,sv39";
126138
reg = <4>;
127139
riscv,isa = "rv64imafdc";
140+
riscv,isa-base = "rv64i";
141+
riscv,isa-extensions = "i", "m", "a", "f", "d", "c", "zicntr", "zicsr",
142+
"zifencei", "zihpm";
128143
tlb-split;
129144
next-level-cache = <&l2cache>;
130145
cpu4_intc: interrupt-controller {

arch/riscv/boot/dts/sifive/fu740-c000.dtsi

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,9 @@
3131
next-level-cache = <&ccache>;
3232
reg = <0x0>;
3333
riscv,isa = "rv64imac";
34+
riscv,isa-base = "rv64i";
35+
riscv,isa-extensions = "i", "m", "a", "c", "zicntr", "zicsr", "zifencei",
36+
"zihpm";
3437
status = "disabled";
3538
cpu0_intc: interrupt-controller {
3639
#interrupt-cells = <1>;
@@ -55,6 +58,9 @@
5558
next-level-cache = <&ccache>;
5659
reg = <0x1>;
5760
riscv,isa = "rv64imafdc";
61+
riscv,isa-base = "rv64i";
62+
riscv,isa-extensions = "i", "m", "a", "f", "d", "c", "zicntr", "zicsr",
63+
"zifencei", "zihpm";
5864
tlb-split;
5965
cpu1_intc: interrupt-controller {
6066
#interrupt-cells = <1>;
@@ -79,6 +85,9 @@
7985
next-level-cache = <&ccache>;
8086
reg = <0x2>;
8187
riscv,isa = "rv64imafdc";
88+
riscv,isa-base = "rv64i";
89+
riscv,isa-extensions = "i", "m", "a", "f", "d", "c", "zicntr", "zicsr",
90+
"zifencei", "zihpm";
8291
tlb-split;
8392
cpu2_intc: interrupt-controller {
8493
#interrupt-cells = <1>;
@@ -103,6 +112,9 @@
103112
next-level-cache = <&ccache>;
104113
reg = <0x3>;
105114
riscv,isa = "rv64imafdc";
115+
riscv,isa-base = "rv64i";
116+
riscv,isa-extensions = "i", "m", "a", "f", "d", "c", "zicntr", "zicsr",
117+
"zifencei", "zihpm";
106118
tlb-split;
107119
cpu3_intc: interrupt-controller {
108120
#interrupt-cells = <1>;
@@ -127,6 +139,9 @@
127139
next-level-cache = <&ccache>;
128140
reg = <0x4>;
129141
riscv,isa = "rv64imafdc";
142+
riscv,isa-base = "rv64i";
143+
riscv,isa-extensions = "i", "m", "a", "f", "d", "c", "zicntr", "zicsr",
144+
"zifencei", "zihpm";
130145
tlb-split;
131146
cpu4_intc: interrupt-controller {
132147
#interrupt-cells = <1>;

0 commit comments

Comments
 (0)