Skip to content

Commit ad931d9

Browse files
vpelletierpalmer-dabbelt
authored andcommitted
riscv: dts: sifive unmatched: Fix regulator for board rev3
The existing values are rejected by the da9063 regulator driver, as they are unachievable with the declared chip setup (non-merged vcore and bmem are unable to provide the declared curent). Fix voltages to match rev3 schematics, which also matches their boot-up configuration within the chip's available precision. Declare bcore1/bcore2 and bmem/bio as merged. Set ldo09 and ldo10 as always-on as their consumers are not declared but exist. Drop ldo current limits as there is no current limit feature for these regulators in the DA9063. Fixes warnings like: DA9063_LDO3: Operation of current configuration missing Signed-off-by: Vincent Pelletier <[email protected]> Signed-off-by: Palmer Dabbelt <[email protected]>
1 parent cd29cc8 commit ad931d9

File tree

1 file changed

+24
-60
lines changed

1 file changed

+24
-60
lines changed

arch/riscv/boot/dts/sifive/hifive-unmatched-a00.dts

Lines changed: 24 additions & 60 deletions
Original file line numberDiff line numberDiff line change
@@ -89,47 +89,31 @@
8989
};
9090

9191
regulators {
92-
vdd_bcore1: bcore1 {
93-
regulator-min-microvolt = <900000>;
94-
regulator-max-microvolt = <900000>;
95-
regulator-min-microamp = <5000000>;
96-
regulator-max-microamp = <5000000>;
97-
regulator-always-on;
98-
};
99-
100-
vdd_bcore2: bcore2 {
101-
regulator-min-microvolt = <900000>;
102-
regulator-max-microvolt = <900000>;
103-
regulator-min-microamp = <5000000>;
104-
regulator-max-microamp = <5000000>;
92+
vdd_bcore: bcores-merged {
93+
regulator-min-microvolt = <1050000>;
94+
regulator-max-microvolt = <1050000>;
95+
regulator-min-microamp = <4800000>;
96+
regulator-max-microamp = <4800000>;
10597
regulator-always-on;
10698
};
10799

108100
vdd_bpro: bpro {
109101
regulator-min-microvolt = <1800000>;
110102
regulator-max-microvolt = <1800000>;
111-
regulator-min-microamp = <2500000>;
112-
regulator-max-microamp = <2500000>;
103+
regulator-min-microamp = <2400000>;
104+
regulator-max-microamp = <2400000>;
113105
regulator-always-on;
114106
};
115107

116108
vdd_bperi: bperi {
117-
regulator-min-microvolt = <1050000>;
118-
regulator-max-microvolt = <1050000>;
109+
regulator-min-microvolt = <1060000>;
110+
regulator-max-microvolt = <1060000>;
119111
regulator-min-microamp = <1500000>;
120112
regulator-max-microamp = <1500000>;
121113
regulator-always-on;
122114
};
123115

124-
vdd_bmem: bmem {
125-
regulator-min-microvolt = <1200000>;
126-
regulator-max-microvolt = <1200000>;
127-
regulator-min-microamp = <3000000>;
128-
regulator-max-microamp = <3000000>;
129-
regulator-always-on;
130-
};
131-
132-
vdd_bio: bio {
116+
vdd_bmem_bio: bmem-bio-merged {
133117
regulator-min-microvolt = <1200000>;
134118
regulator-max-microvolt = <1200000>;
135119
regulator-min-microamp = <3000000>;
@@ -140,86 +124,66 @@
140124
vdd_ldo1: ldo1 {
141125
regulator-min-microvolt = <1800000>;
142126
regulator-max-microvolt = <1800000>;
143-
regulator-min-microamp = <100000>;
144-
regulator-max-microamp = <100000>;
145127
regulator-always-on;
146128
};
147129

148130
vdd_ldo2: ldo2 {
149131
regulator-min-microvolt = <1800000>;
150132
regulator-max-microvolt = <1800000>;
151-
regulator-min-microamp = <200000>;
152-
regulator-max-microamp = <200000>;
153133
regulator-always-on;
154134
};
155135

156136
vdd_ldo3: ldo3 {
157-
regulator-min-microvolt = <1800000>;
158-
regulator-max-microvolt = <1800000>;
159-
regulator-min-microamp = <200000>;
160-
regulator-max-microamp = <200000>;
137+
regulator-min-microvolt = <3300000>;
138+
regulator-max-microvolt = <3300000>;
161139
regulator-always-on;
162140
};
163141

164142
vdd_ldo4: ldo4 {
165-
regulator-min-microvolt = <1800000>;
166-
regulator-max-microvolt = <1800000>;
167-
regulator-min-microamp = <200000>;
168-
regulator-max-microamp = <200000>;
143+
regulator-min-microvolt = <2500000>;
144+
regulator-max-microvolt = <2500000>;
169145
regulator-always-on;
170146
};
171147

172148
vdd_ldo5: ldo5 {
173-
regulator-min-microvolt = <1800000>;
174-
regulator-max-microvolt = <1800000>;
175-
regulator-min-microamp = <100000>;
176-
regulator-max-microamp = <100000>;
149+
regulator-min-microvolt = <3300000>;
150+
regulator-max-microvolt = <3300000>;
177151
regulator-always-on;
178152
};
179153

180154
vdd_ldo6: ldo6 {
181-
regulator-min-microvolt = <3300000>;
182-
regulator-max-microvolt = <3300000>;
183-
regulator-min-microamp = <200000>;
184-
regulator-max-microamp = <200000>;
155+
regulator-min-microvolt = <1800000>;
156+
regulator-max-microvolt = <1800000>;
185157
regulator-always-on;
186158
};
187159

188160
vdd_ldo7: ldo7 {
189-
regulator-min-microvolt = <1800000>;
190-
regulator-max-microvolt = <1800000>;
191-
regulator-min-microamp = <200000>;
192-
regulator-max-microamp = <200000>;
161+
regulator-min-microvolt = <3300000>;
162+
regulator-max-microvolt = <3300000>;
193163
regulator-always-on;
194164
};
195165

196166
vdd_ldo8: ldo8 {
197-
regulator-min-microvolt = <1800000>;
198-
regulator-max-microvolt = <1800000>;
199-
regulator-min-microamp = <200000>;
200-
regulator-max-microamp = <200000>;
167+
regulator-min-microvolt = <3300000>;
168+
regulator-max-microvolt = <3300000>;
201169
regulator-always-on;
202170
};
203171

204172
vdd_ld09: ldo9 {
205173
regulator-min-microvolt = <1050000>;
206174
regulator-max-microvolt = <1050000>;
207-
regulator-min-microamp = <200000>;
208-
regulator-max-microamp = <200000>;
175+
regulator-always-on;
209176
};
210177

211178
vdd_ldo10: ldo10 {
212179
regulator-min-microvolt = <1000000>;
213180
regulator-max-microvolt = <1000000>;
214-
regulator-min-microamp = <300000>;
215-
regulator-max-microamp = <300000>;
181+
regulator-always-on;
216182
};
217183

218184
vdd_ldo11: ldo11 {
219185
regulator-min-microvolt = <2500000>;
220186
regulator-max-microvolt = <2500000>;
221-
regulator-min-microamp = <300000>;
222-
regulator-max-microamp = <300000>;
223187
regulator-always-on;
224188
};
225189
};

0 commit comments

Comments
 (0)