Skip to content

Commit 4a3ca11

Browse files
openedevmmind
authored andcommitted
arm64: dts: rk3399pro: vmarc-som: Move supply regulators into Carrier
Supply regulators are common across different variants of vmarc SOM's since the Type C power controller IC is part of the carrier board. So, move the supply regulators into carrier board dtsi. Signed-off-by: Jagan Teki <[email protected]> Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Heiko Stuebner <[email protected]>
1 parent 3047b38 commit 4a3ca11

File tree

2 files changed

+19
-19
lines changed

2 files changed

+19
-19
lines changed

arch/arm/boot/dts/rockchip-radxa-dalang-carrier.dtsi

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,25 @@
1111
chosen {
1212
stdout-path = "serial2:1500000n8";
1313
};
14+
15+
vcc12v_dcin: vcc12v-dcin-regulator {
16+
compatible = "regulator-fixed";
17+
regulator-name = "vcc12v_dcin";
18+
regulator-always-on;
19+
regulator-boot-on;
20+
regulator-min-microvolt = <12000000>;
21+
regulator-max-microvolt = <12000000>;
22+
};
23+
24+
vcc5v0_sys: vcc5v0-sys-regulator {
25+
compatible = "regulator-fixed";
26+
regulator-name = "vcc5v0_sys";
27+
regulator-always-on;
28+
regulator-boot-on;
29+
regulator-min-microvolt = <5000000>;
30+
regulator-max-microvolt = <5000000>;
31+
vin-supply = <&vcc12v_dcin>;
32+
};
1433
};
1534

1635
&gmac {

arch/arm64/boot/dts/rockchip/rk3399pro-vmarc-som.dtsi

Lines changed: 0 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -18,25 +18,6 @@
1818
clock-output-names = "clkin_gmac";
1919
#clock-cells = <0>;
2020
};
21-
22-
vcc12v_dcin: vcc12v-dcin-regulator {
23-
compatible = "regulator-fixed";
24-
regulator-name = "vcc12v_dcin";
25-
regulator-always-on;
26-
regulator-boot-on;
27-
regulator-min-microvolt = <12000000>;
28-
regulator-max-microvolt = <12000000>;
29-
};
30-
31-
vcc5v0_sys: vcc5v0-sys-regulator {
32-
compatible = "regulator-fixed";
33-
regulator-name = "vcc5v0_sys";
34-
regulator-always-on;
35-
regulator-boot-on;
36-
regulator-min-microvolt = <5000000>;
37-
regulator-max-microvolt = <5000000>;
38-
vin-supply = <&vcc12v_dcin>;
39-
};
4021
};
4122

4223
&cpu_l0 {

0 commit comments

Comments
 (0)