From 335ee47416c9c08233307ce2df93ce0b74262a94 Mon Sep 17 00:00:00 2001 From: shengfei Xu Date: Wed, 6 Apr 2022 08:14:04 +0000 Subject: [PATCH] arm64: dts: rockchip: rk3588-rk806-single: initialize the configuration of NLDO5 The single-pmic configuration is based on the EVB7 Signed-off-by: shengfei Xu Change-Id: If3e9136ce9e0ebbd50780bc7d06481e6c69bcf12 --- arch/arm64/boot/dts/rockchip/rk3588-nvr-demo.dtsi | 13 +------------ .../boot/dts/rockchip/rk3588-rk806-single.dtsi | 8 ++++++-- .../arm64/boot/dts/rockchip/rk3588-toybrick-x0.dtsi | 11 ----------- 3 files changed, 7 insertions(+), 25 deletions(-) diff --git a/arch/arm64/boot/dts/rockchip/rk3588-nvr-demo.dtsi b/arch/arm64/boot/dts/rockchip/rk3588-nvr-demo.dtsi index 433708c31e09..baf8655f54f4 100644 --- a/arch/arm64/boot/dts/rockchip/rk3588-nvr-demo.dtsi +++ b/arch/arm64/boot/dts/rockchip/rk3588-nvr-demo.dtsi @@ -49,7 +49,7 @@ regulator-always-on; regulator-min-microvolt = <750000>; regulator-max-microvolt = <750000>; - vin-supply = <&nldo5_s0>; + vin-supply = <&vdd_0v75_s0>; }; pcie30_avdd1v8: pcie30-avdd1v8 { @@ -415,17 +415,6 @@ }; }; -&nldo5_s0 { - regulator-always-on; - regulator-boot-on; - regulator-min-microvolt = <750000>; - regulator-max-microvolt = <750000>; - rregulator-name = "nldo5_s0"; - regulator-state-mem { - regulator-off-in-suspend; - }; -}; - &pcie30phy { status = "okay"; }; diff --git a/arch/arm64/boot/dts/rockchip/rk3588-rk806-single.dtsi b/arch/arm64/boot/dts/rockchip/rk3588-rk806-single.dtsi index ebfbe7445860..87b05fc56951 100644 --- a/arch/arm64/boot/dts/rockchip/rk3588-rk806-single.dtsi +++ b/arch/arm64/boot/dts/rockchip/rk3588-rk806-single.dtsi @@ -381,8 +381,12 @@ }; }; - nldo5_s0: NLDO_REG5 { - regulator-name = "nldo5_s0"; + vdd_0v75_s0: NLDO_REG5 { + regulator-always-on; + regulator-boot-on; + regulator-min-microvolt = <750000>; + regulator-max-microvolt = <750000>; + regulator-name = "vdd_0v75_s0"; regulator-state-mem { regulator-off-in-suspend; }; diff --git a/arch/arm64/boot/dts/rockchip/rk3588-toybrick-x0.dtsi b/arch/arm64/boot/dts/rockchip/rk3588-toybrick-x0.dtsi index 5e429e69ec44..2562aa4e9563 100644 --- a/arch/arm64/boot/dts/rockchip/rk3588-toybrick-x0.dtsi +++ b/arch/arm64/boot/dts/rockchip/rk3588-toybrick-x0.dtsi @@ -726,14 +726,3 @@ &usbhost_dwc3_0 { status = "disabled"; }; - -&nldo5_s0 { - regulator-always-on; - regulator-boot-on; - regulator-min-microvolt = <750000>; - regulator-max-microvolt = <750000>; - rregulator-name = "nldo5_s0"; - regulator-state-mem { - regulator-off-in-suspend; - }; -};