Skip to content

Commit 10bee7e

Browse files
dominiknh90gregkh
authored andcommitted
ARM: dts: am335x-pcm-953: Define fixed regulators in root node
[ Upstream commit 8950f34 ] Remove the regulators node and define fixed regulators in the root node. Prevents the sdhci-omap driver from waiting in probe deferral forever because of the missing vmmc-supply and keeps am335x-pcm-953 consistent with the other Phytec AM335 boards. Fixes: bb07a82 ("ARM: dts: Add support for phyCORE-AM335x PCM-953 carrier board") Signed-off-by: Dominik Haller <[email protected]> Message-Id: <[email protected]> Signed-off-by: Tony Lindgren <[email protected]> Signed-off-by: Sasha Levin <[email protected]>
1 parent 8fe533c commit 10bee7e

File tree

1 file changed

+13
-15
lines changed

1 file changed

+13
-15
lines changed

arch/arm/boot/dts/am335x-pcm-953.dtsi

Lines changed: 13 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -12,22 +12,20 @@
1212
compatible = "phytec,am335x-pcm-953", "phytec,am335x-phycore-som", "ti,am33xx";
1313

1414
/* Power */
15-
regulators {
16-
vcc3v3: fixedregulator@1 {
17-
compatible = "regulator-fixed";
18-
regulator-name = "vcc3v3";
19-
regulator-min-microvolt = <3300000>;
20-
regulator-max-microvolt = <3300000>;
21-
regulator-boot-on;
22-
};
15+
vcc3v3: fixedregulator1 {
16+
compatible = "regulator-fixed";
17+
regulator-name = "vcc3v3";
18+
regulator-min-microvolt = <3300000>;
19+
regulator-max-microvolt = <3300000>;
20+
regulator-boot-on;
21+
};
2322

24-
vcc1v8: fixedregulator@2 {
25-
compatible = "regulator-fixed";
26-
regulator-name = "vcc1v8";
27-
regulator-min-microvolt = <1800000>;
28-
regulator-max-microvolt = <1800000>;
29-
regulator-boot-on;
30-
};
23+
vcc1v8: fixedregulator2 {
24+
compatible = "regulator-fixed";
25+
regulator-name = "vcc1v8";
26+
regulator-min-microvolt = <1800000>;
27+
regulator-max-microvolt = <1800000>;
28+
regulator-boot-on;
3129
};
3230

3331
/* User IO */

0 commit comments

Comments
 (0)