Skip to content

Commit c68ef4a

Browse files
goldelicotmlind
authored andcommitted
omap5-board-common: remove not physically existing vdds_1v8_main fixed-regulator
This device tree include file describes a fixed-regulator connecting smps7_reg output (1.8V) to some 1.8V rail and consumers (vdds_1v8_main). This regulator does not physically exist. I assume it was introduced as a wrapper around smps7_reg to provide a speaking signal name "vdds_1v8_main" as label. This fixed-regulator without real function was not an issue in driver code until Commit 98e48cd ("regulator: core: resolve supply for boot-on/always-on regulators") introduced a new check for regulator initialization which makes Palmas regulator registration fail: [ 5.407712] ldo1: supplied by vsys_cobra [ 5.412748] ldo2: supplied by vsys_cobra [ 5.417603] palmas-pmic 48070000.i2c:palmas@48:palmas_pmic: failed to register 48070000.i2c:palmas@48:palmas_pmic regulator The reason is that the supply-chain of regulators is too long and goes from ldo3 through the virtual vdds_1v8_main regulator and then back to smps7. This adds a cross-dependency of probing Palmas regulators and the fixed-regulator which leads to probe deferral by the new check and is no longer resolved. Since we do not control what device tree files including this one reference (either &vdds_1v8_main or &smps7_reg or both) we keep both labels for smps7 for compatibility. Fixes: 98e48cd ("regulator: core: resolve supply for boot-on/always-on regulators") Signed-off-by: H. Nikolaus Schaller <[email protected]> Signed-off-by: Tony Lindgren <[email protected]>
1 parent 0162a99 commit c68ef4a

File tree

1 file changed

+1
-8
lines changed

1 file changed

+1
-8
lines changed

arch/arm/boot/dts/omap5-board-common.dtsi

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -30,14 +30,6 @@
3030
regulator-max-microvolt = <5000000>;
3131
};
3232

33-
vdds_1v8_main: fixedregulator-vdds_1v8_main {
34-
compatible = "regulator-fixed";
35-
regulator-name = "vdds_1v8_main";
36-
vin-supply = <&smps7_reg>;
37-
regulator-min-microvolt = <1800000>;
38-
regulator-max-microvolt = <1800000>;
39-
};
40-
4133
vmmcsd_fixed: fixedregulator-mmcsd {
4234
compatible = "regulator-fixed";
4335
regulator-name = "vmmcsd_fixed";
@@ -487,6 +479,7 @@
487479
regulator-boot-on;
488480
};
489481

482+
vdds_1v8_main:
490483
smps7_reg: smps7 {
491484
/* VDDS_1v8_OMAP over VDDS_1v8_MAIN */
492485
regulator-name = "smps7";

0 commit comments

Comments
 (0)