diff options
| author |   Jagan Teki <jagan@amarulasolutions.com> | 2020-07-15 14:04:14 +0530 |
|---|---|---|
| committer |   Heiko Stuebner <heiko@sntech.de> | 2020-07-18 17:06:13 +0200 |
| commit | 4a3ca113c0f3a2ce33e51fc6a48a121b2d707d4f (patch) | |
| tree | 0c6194796faee437ba3e797cb5280ce00e7b9681 | |
| parent | arm64: dts: rk3399pro: vmarc-som: Fix sorting nodes, properties (diff) | |
| download | linux-dev-4a3ca113c0f3a2ce33e51fc6a48a121b2d707d4f.tar.xz linux-dev-4a3ca113c0f3a2ce33e51fc6a48a121b2d707d4f.zip | |
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 <jagan@amarulasolutions.com>
Link: https://lore.kernel.org/r/20200715083418.112003-4-jagan@amarulasolutions.com
Signed-off-by: Heiko Stuebner <heiko@sntech.de>
| -rw-r--r-- | arch/arm/boot/dts/rockchip-radxa-dalang-carrier.dtsi | 19 | ||||
| -rw-r--r-- | arch/arm64/boot/dts/rockchip/rk3399pro-vmarc-som.dtsi | 19 |
2 files changed, 19 insertions, 19 deletions
diff --git a/arch/arm/boot/dts/rockchip-radxa-dalang-carrier.dtsi b/arch/arm/boot/dts/rockchip-radxa-dalang-carrier.dtsi index 176b53b8e41a..00b200a62263 100644 --- a/arch/arm/boot/dts/rockchip-radxa-dalang-carrier.dtsi +++ b/arch/arm/boot/dts/rockchip-radxa-dalang-carrier.dtsi @@ -11,6 +11,25 @@ chosen { stdout-path = "serial2:1500000n8"; }; + + vcc12v_dcin: vcc12v-dcin-regulator { + compatible = "regulator-fixed"; + regulator-name = "vcc12v_dcin"; + regulator-always-on; + regulator-boot-on; + regulator-min-microvolt = <12000000>; + regulator-max-microvolt = <12000000>; + }; + + vcc5v0_sys: vcc5v0-sys-regulator { + compatible = "regulator-fixed"; + regulator-name = "vcc5v0_sys"; + regulator-always-on; + regulator-boot-on; + regulator-min-microvolt = <5000000>; + regulator-max-microvolt = <5000000>; + vin-supply = <&vcc12v_dcin>; + }; }; &gmac { diff --git a/arch/arm64/boot/dts/rockchip/rk3399pro-vmarc-som.dtsi b/arch/arm64/boot/dts/rockchip/rk3399pro-vmarc-som.dtsi index 121a430d6a70..d8fa8127d9dc 100644 --- a/arch/arm64/boot/dts/rockchip/rk3399pro-vmarc-som.dtsi +++ b/arch/arm64/boot/dts/rockchip/rk3399pro-vmarc-som.dtsi @@ -18,25 +18,6 @@ clock-output-names = "clkin_gmac"; #clock-cells = <0>; }; - - vcc12v_dcin: vcc12v-dcin-regulator { - compatible = "regulator-fixed"; - regulator-name = "vcc12v_dcin"; - regulator-always-on; - regulator-boot-on; - regulator-min-microvolt = <12000000>; - regulator-max-microvolt = <12000000>; - }; - - vcc5v0_sys: vcc5v0-sys-regulator { - compatible = "regulator-fixed"; - regulator-name = "vcc5v0_sys"; - regulator-always-on; - regulator-boot-on; - regulator-min-microvolt = <5000000>; - regulator-max-microvolt = <5000000>; - vin-supply = <&vcc12v_dcin>; - }; }; &cpu_l0 { |