Skip to content

Commit e8d87a0

Browse files
goldelicotsbogend
authored andcommitted
MIPS: DTS: CI20: fix PMU definitions for ACT8600
There is a ACT8600 on the CI20 board and the bindings of the ACT8865 driver have changed without updating the CI20 device tree. Therefore the PMU can not be probed successfully and is running in power-on reset state. Fix DT to match the latest act8865-regulator bindings. Fixes: 73f2b94 ("MIPS: CI20: DTS: Add I2C nodes") Cc: [email protected] Signed-off-by: H. Nikolaus Schaller <[email protected]> Reviewed-by: Paul Cercueil <[email protected]> Signed-off-by: Thomas Bogendoerfer <[email protected]>
1 parent 8e029eb commit e8d87a0

File tree

1 file changed

+24
-15
lines changed

1 file changed

+24
-15
lines changed

arch/mips/boot/dts/ingenic/ci20.dts

Lines changed: 24 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
#include "jz4780.dtsi"
55
#include <dt-bindings/clock/ingenic,tcu.h>
66
#include <dt-bindings/gpio/gpio.h>
7+
#include <dt-bindings/regulator/active-semi,8865-regulator.h>
78

89
/ {
910
compatible = "img,ci20", "ingenic,jz4780";
@@ -163,63 +164,71 @@
163164

164165
regulators {
165166
vddcore: SUDCDC1 {
166-
regulator-name = "VDDCORE";
167+
regulator-name = "DCDC_REG1";
167168
regulator-min-microvolt = <1100000>;
168169
regulator-max-microvolt = <1100000>;
169170
regulator-always-on;
170171
};
171172
vddmem: SUDCDC2 {
172-
regulator-name = "VDDMEM";
173+
regulator-name = "DCDC_REG2";
173174
regulator-min-microvolt = <1500000>;
174175
regulator-max-microvolt = <1500000>;
175176
regulator-always-on;
176177
};
177178
vcc_33: SUDCDC3 {
178-
regulator-name = "VCC33";
179+
regulator-name = "DCDC_REG3";
179180
regulator-min-microvolt = <3300000>;
180181
regulator-max-microvolt = <3300000>;
181182
regulator-always-on;
182183
};
183184
vcc_50: SUDCDC4 {
184-
regulator-name = "VCC50";
185+
regulator-name = "SUDCDC_REG4";
185186
regulator-min-microvolt = <5000000>;
186187
regulator-max-microvolt = <5000000>;
187188
regulator-always-on;
188189
};
189190
vcc_25: LDO_REG5 {
190-
regulator-name = "VCC25";
191+
regulator-name = "LDO_REG5";
191192
regulator-min-microvolt = <2500000>;
192193
regulator-max-microvolt = <2500000>;
193194
regulator-always-on;
194195
};
195196
wifi_io: LDO_REG6 {
196-
regulator-name = "WIFIIO";
197+
regulator-name = "LDO_REG6";
197198
regulator-min-microvolt = <2500000>;
198199
regulator-max-microvolt = <2500000>;
199200
regulator-always-on;
200201
};
201202
vcc_28: LDO_REG7 {
202-
regulator-name = "VCC28";
203+
regulator-name = "LDO_REG7";
203204
regulator-min-microvolt = <2800000>;
204205
regulator-max-microvolt = <2800000>;
205206
regulator-always-on;
206207
};
207208
vcc_15: LDO_REG8 {
208-
regulator-name = "VCC15";
209+
regulator-name = "LDO_REG8";
209210
regulator-min-microvolt = <1500000>;
210211
regulator-max-microvolt = <1500000>;
211212
regulator-always-on;
212213
};
213-
vcc_18: LDO_REG9 {
214-
regulator-name = "VCC18";
215-
regulator-min-microvolt = <1800000>;
216-
regulator-max-microvolt = <1800000>;
214+
vrtc_18: LDO_REG9 {
215+
regulator-name = "LDO_REG9";
216+
/* Despite the datasheet stating 3.3V
217+
* for REG9 and the driver expecting that,
218+
* REG9 outputs 1.8V.
219+
* Likely the CI20 uses a proprietary
220+
* factory programmed chip variant.
221+
* Since this is a simple on/off LDO the
222+
* exact values do not matter.
223+
*/
224+
regulator-min-microvolt = <3300000>;
225+
regulator-max-microvolt = <3300000>;
217226
regulator-always-on;
218227
};
219228
vcc_11: LDO_REG10 {
220-
regulator-name = "VCC11";
221-
regulator-min-microvolt = <1100000>;
222-
regulator-max-microvolt = <1100000>;
229+
regulator-name = "LDO_REG10";
230+
regulator-min-microvolt = <1200000>;
231+
regulator-max-microvolt = <1200000>;
223232
regulator-always-on;
224233
};
225234
};

0 commit comments

Comments
 (0)