Skip to content

Commit 78099fe

Browse files
paulusmackmaddy-kerneldev
authored andcommitted
powerpc/microwatt: Device-tree updates
Microwatt now implements ISA v3.1 (SFFS compliancy subset), including prefixed instructions, scv/rfscv, and the FSCR, HFSCR, TAR, and CTRL registers. The privileged mode of operation is now hypervisor mode and there is no privileged non-hypervisor mode; the MSR[HV] bit is forced to 1. Besides updating the ibm,powerpc-cpu-features property to reflect the above, this also makes the following changes relating to peripheral devices: - Add gpio controller. - Remove high-speed property from SD controller, for the case where the interface is connected through 200 ohm protection resisters. - Put an alias for the ethernet in /chosen. Signed-off-by: Paul Mackerras <paulus@ozlabs.org> Acked-by: Nicholas Piggin <npiggin@gmail.com> Signed-off-by: Madhavan Srinivasan <maddy@linux.ibm.com> Link: https://patch.msgid.link/Z5xtdGSacrWz7swi@thinks.paulus.ozlabs.org
1 parent 81bb649 commit 78099fe

File tree

1 file changed

+62
-11
lines changed

1 file changed

+62
-11
lines changed

arch/powerpc/boot/dts/microwatt.dts

Lines changed: 62 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
/dts-v1/;
2+
#include <dt-bindings/gpio/gpio.h>
23

34
/ {
45
#size-cells = <0x02>;
@@ -8,6 +9,7 @@
89

910
aliases {
1011
serial0 = &UART0;
12+
ethernet = &enet0;
1113
};
1214

1315
reserved-memory {
@@ -35,40 +37,79 @@
3537

3638
ibm,powerpc-cpu-features {
3739
display-name = "Microwatt";
38-
isa = <3000>;
40+
isa = <3010>;
3941
device_type = "cpu-features";
4042
compatible = "ibm,powerpc-cpu-features";
4143

4244
mmu-radix {
4345
isa = <3000>;
44-
usable-privilege = <2>;
46+
usable-privilege = <6>;
47+
os-support = <0>;
4548
};
4649

4750
little-endian {
48-
isa = <2050>;
49-
usable-privilege = <3>;
51+
isa = <0>;
52+
usable-privilege = <7>;
53+
os-support = <0>;
5054
hwcap-bit-nr = <1>;
5155
};
5256

5357
cache-inhibited-large-page {
54-
isa = <2040>;
55-
usable-privilege = <2>;
58+
isa = <0>;
59+
usable-privilege = <6>;
60+
os-support = <0>;
5661
};
5762

5863
fixed-point-v3 {
5964
isa = <3000>;
60-
usable-privilege = <3>;
65+
usable-privilege = <7>;
6166
};
6267

6368
no-execute {
64-
isa = <2010>;
69+
isa = <0x00>;
6570
usable-privilege = <2>;
71+
os-support = <0>;
6672
};
6773

6874
floating-point {
75+
hfscr-bit-nr = <0>;
6976
hwcap-bit-nr = <27>;
7077
isa = <0>;
71-
usable-privilege = <3>;
78+
usable-privilege = <7>;
79+
hv-support = <1>;
80+
os-support = <0>;
81+
};
82+
83+
prefixed-instructions {
84+
hfscr-bit-nr = <13>;
85+
fscr-bit-nr = <13>;
86+
isa = <3010>;
87+
usable-privilege = <7>;
88+
os-support = <1>;
89+
hv-support = <1>;
90+
};
91+
92+
tar {
93+
hfscr-bit-nr = <8>;
94+
fscr-bit-nr = <8>;
95+
isa = <2070>;
96+
usable-privilege = <7>;
97+
os-support = <1>;
98+
hv-support = <1>;
99+
hwcap-bit-nr = <58>;
100+
};
101+
102+
control-register {
103+
isa = <0>;
104+
usable-privilege = <7>;
105+
};
106+
107+
system-call-vectored {
108+
isa = <3000>;
109+
usable-privilege = <7>;
110+
os-support = <1>;
111+
fscr-bit-nr = <12>;
112+
hwcap-bit-nr = <52>;
72113
};
73114
};
74115

@@ -138,7 +179,18 @@
138179
interrupts = <0x10 0x1>;
139180
};
140181

141-
ethernet@8020000 {
182+
gpio: gpio@7000 {
183+
device_type = "gpio";
184+
compatible = "faraday,ftgpio010";
185+
gpio-controller;
186+
#gpio-cells = <2>;
187+
reg = <0x7000 0x80>;
188+
interrupts = <0x14 1>;
189+
interrupt-controller;
190+
#interrupt-cells = <2>;
191+
};
192+
193+
enet0: ethernet@8020000 {
142194
compatible = "litex,liteeth";
143195
reg = <0x8021000 0x100
144196
0x8020800 0x100
@@ -160,7 +212,6 @@
160212
reg-names = "phy", "core", "reader", "writer", "irq";
161213
bus-width = <4>;
162214
interrupts = <0x13 1>;
163-
cap-sd-highspeed;
164215
clocks = <&sys_clk>;
165216
};
166217
};

0 commit comments

Comments
 (0)