Skip to content

Commit 08384e8

Browse files
pcercueitsbogend
authored andcommitted
MIPS: DTS: CI20: Fix ACT8600 regulator node names
The Device Tree was using invalid node names for the ACT8600 regulators. To be fair, it is not the original committer's fault, as the documentation did gives invalid names as well. In theory, the fix should have been to modify the driver to accept the alternative names. However, even though the act8865 driver spits warnings, the kernel seemed to work fine with what is currently supported upstream. For that reason, I think it is okay to just update the DTS. I removed the "regulator-name" too, since they really didn't bring any information. The node names are enough. Fixes: 73f2b94 ("MIPS: CI20: DTS: Add I2C nodes") Signed-off-by: Paul Cercueil <paul@crapouillou.net> Signed-off-by: Thomas Bogendoerfer <tsbogend@alpha.franken.de>
1 parent ea1ccdc commit 08384e8

1 file changed

Lines changed: 8 additions & 19 deletions

File tree

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

Lines changed: 8 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -237,59 +237,49 @@
237237
act8600: act8600@5a {
238238
compatible = "active-semi,act8600";
239239
reg = <0x5a>;
240-
status = "okay";
241240

242241
regulators {
243-
vddcore: SUDCDC1 {
244-
regulator-name = "DCDC_REG1";
242+
vddcore: DCDC1 {
245243
regulator-min-microvolt = <1100000>;
246244
regulator-max-microvolt = <1100000>;
247245
regulator-always-on;
248246
};
249-
vddmem: SUDCDC2 {
250-
regulator-name = "DCDC_REG2";
247+
vddmem: DCDC2 {
251248
regulator-min-microvolt = <1500000>;
252249
regulator-max-microvolt = <1500000>;
253250
regulator-always-on;
254251
};
255-
vcc_33: SUDCDC3 {
256-
regulator-name = "DCDC_REG3";
252+
vcc_33: DCDC3 {
257253
regulator-min-microvolt = <3300000>;
258254
regulator-max-microvolt = <3300000>;
259255
regulator-always-on;
260256
};
261-
vcc_50: SUDCDC4 {
262-
regulator-name = "SUDCDC_REG4";
257+
vcc_50: SUDCDC_REG4 {
263258
regulator-min-microvolt = <5000000>;
264259
regulator-max-microvolt = <5000000>;
265260
regulator-always-on;
266261
};
267-
vcc_25: LDO_REG5 {
268-
regulator-name = "LDO_REG5";
262+
vcc_25: LDO5 {
269263
regulator-min-microvolt = <2500000>;
270264
regulator-max-microvolt = <2500000>;
271265
regulator-always-on;
272266
};
273-
wifi_io: LDO_REG6 {
274-
regulator-name = "LDO_REG6";
267+
wifi_io: LDO6 {
275268
regulator-min-microvolt = <2500000>;
276269
regulator-max-microvolt = <2500000>;
277270
regulator-always-on;
278271
};
279-
vcc_28: LDO_REG7 {
280-
regulator-name = "LDO_REG7";
272+
cim_io_28: LDO7 {
281273
regulator-min-microvolt = <2800000>;
282274
regulator-max-microvolt = <2800000>;
283275
regulator-always-on;
284276
};
285-
vcc_15: LDO_REG8 {
286-
regulator-name = "LDO_REG8";
277+
cim_io_15: LDO8 {
287278
regulator-min-microvolt = <1500000>;
288279
regulator-max-microvolt = <1500000>;
289280
regulator-always-on;
290281
};
291282
vrtc_18: LDO_REG9 {
292-
regulator-name = "LDO_REG9";
293283
/* Despite the datasheet stating 3.3V
294284
* for REG9 and the driver expecting that,
295285
* REG9 outputs 1.8V.
@@ -303,7 +293,6 @@
303293
regulator-always-on;
304294
};
305295
vcc_11: LDO_REG10 {
306-
regulator-name = "LDO_REG10";
307296
regulator-min-microvolt = <1200000>;
308297
regulator-max-microvolt = <1200000>;
309298
regulator-always-on;

0 commit comments

Comments
 (0)