Skip to content

Commit 561add0

Browse files
committed
riscv: dts: microchip: convert isa detection to new properties
Convert the PolarFire SoC 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 1ce3a95 commit 561add0

1 file changed

Lines changed: 15 additions & 0 deletions

File tree

arch/riscv/boot/dts/microchip/mpfs.dtsi

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,9 @@
2222
i-cache-size = <16384>;
2323
reg = <0>;
2424
riscv,isa = "rv64imac";
25+
riscv,isa-base = "rv64i";
26+
riscv,isa-extensions = "i", "m", "a", "c", "zicntr", "zicsr", "zifencei",
27+
"zihpm";
2528
clocks = <&clkcfg CLK_CPU>;
2629
status = "disabled";
2730

@@ -48,6 +51,9 @@
4851
mmu-type = "riscv,sv39";
4952
reg = <1>;
5053
riscv,isa = "rv64imafdc";
54+
riscv,isa-base = "rv64i";
55+
riscv,isa-extensions = "i", "m", "a", "f", "d", "c", "zicntr", "zicsr",
56+
"zifencei", "zihpm";
5157
clocks = <&clkcfg CLK_CPU>;
5258
tlb-split;
5359
next-level-cache = <&cctrllr>;
@@ -76,6 +82,9 @@
7682
mmu-type = "riscv,sv39";
7783
reg = <2>;
7884
riscv,isa = "rv64imafdc";
85+
riscv,isa-base = "rv64i";
86+
riscv,isa-extensions = "i", "m", "a", "f", "d", "c", "zicntr", "zicsr",
87+
"zifencei", "zihpm";
7988
clocks = <&clkcfg CLK_CPU>;
8089
tlb-split;
8190
next-level-cache = <&cctrllr>;
@@ -104,6 +113,9 @@
104113
mmu-type = "riscv,sv39";
105114
reg = <3>;
106115
riscv,isa = "rv64imafdc";
116+
riscv,isa-base = "rv64i";
117+
riscv,isa-extensions = "i", "m", "a", "f", "d", "c", "zicntr", "zicsr",
118+
"zifencei", "zihpm";
107119
clocks = <&clkcfg CLK_CPU>;
108120
tlb-split;
109121
next-level-cache = <&cctrllr>;
@@ -132,6 +144,9 @@
132144
mmu-type = "riscv,sv39";
133145
reg = <4>;
134146
riscv,isa = "rv64imafdc";
147+
riscv,isa-base = "rv64i";
148+
riscv,isa-extensions = "i", "m", "a", "f", "d", "c", "zicntr", "zicsr",
149+
"zifencei", "zihpm";
135150
clocks = <&clkcfg CLK_CPU>;
136151
tlb-split;
137152
next-level-cache = <&cctrllr>;

0 commit comments

Comments
 (0)