Merge "ARM: dts: qcom: remove overlay regulator node/phandle creation for sun V8"

This commit is contained in:
qctecmdr
2024-01-04 09:48:34 -08:00
committed by Gerrit - the friendly Code Review server
2 changed files with 27 additions and 35 deletions

View File

@@ -1,6 +1,6 @@
// SPDX-License-Identifier: BSD-3-Clause // SPDX-License-Identifier: BSD-3-Clause
/* /*
* Copyright (c) 2023 Qualcomm Innovation Center, Inc. All rights reserved. * Copyright (c) 2023-2024 Qualcomm Innovation Center, Inc. All rights reserved.
*/ */
&VRM_S4J { &VRM_S4J {
@@ -35,32 +35,22 @@
status = "ok"; status = "ok";
}; };
&apps_rsc_drv2 { &S8F_LEVEL {
rpmh-regulator-mxlvl {
S8F_LEVEL: pm_v8f_s8_level: regulator-vdd-mxa-level {
regulator-name = "pm_v8f_s8_level"; regulator-name = "pm_v8f_s8_level";
}; };
S8F_LEVEL_AO: pm_v8f_s8_level_ao: regulator-vdd-mxa-level-ao { &S8F_LEVEL_AO {
regulator-name = "pm_v8f_s8_level_ao"; regulator-name = "pm_v8f_s8_level_ao";
}; };
};
&L1F {
rpmh-regulator-ldof1 { regulator-name = "pm_v8f_l1";
pm_v8f_l1: regulator-pm-vxf-l1 { };
regulator-name = "pm_v8f_l1";
}; &L2F {
}; regulator-name = "pm_v8f_l2";
};
rpmh-regulator-ldof2 {
pm_v8f_l2: regulator-pm-vxf-l2 { &L3F {
regulator-name = "pm_v8f_l2"; regulator-name = "pm_v8f_l3";
};
};
rpmh-regulator-ldof3 {
pm_v8f_l3: regulator-pm-vxf-l3 {
regulator-name = "pm_v8f_l3";
};
};
}; };

View File

@@ -1,6 +1,6 @@
// SPDX-License-Identifier: BSD-3-Clause // SPDX-License-Identifier: BSD-3-Clause
/* /*
* Copyright (c) 2023 Qualcomm Innovation Center, Inc. All rights reserved. * Copyright (c) 2023-2024 Qualcomm Innovation Center, Inc. All rights reserved.
*/ */
#include <dt-bindings/regulator/qcom,rpmh-regulator-levels.h> #include <dt-bindings/regulator/qcom,rpmh-regulator-levels.h>
@@ -65,7 +65,8 @@
proxy-supply = <&VDD_MXA_LEVEL>; proxy-supply = <&VDD_MXA_LEVEL>;
VDD_MXA_LEVEL: VDD_MX_LEVEL: S6F_LEVEL: VDD_MXA_LEVEL: VDD_MX_LEVEL: S6F_LEVEL:
pm_v6f_s6_level: regulator-vdd-mxa-level { pm_v6f_s6_level: S8F_LEVEL: pm_v8f_s8_level:
regulator-vdd-mxa-level {
regulator-name = "pm_v6f_s6_level"; regulator-name = "pm_v6f_s6_level";
qcom,set = <RPMH_REGULATOR_SET_ALL>; qcom,set = <RPMH_REGULATOR_SET_ALL>;
regulator-min-microvolt = regulator-min-microvolt =
@@ -81,7 +82,8 @@
}; };
VDD_MXA_LEVEL_AO: VDD_MX_LEVEL_AO: S6F_LEVEL_AO: VDD_MXA_LEVEL_AO: VDD_MX_LEVEL_AO: S6F_LEVEL_AO:
pm_v6f_s6_level_ao: regulator-vdd-mxa-level-ao { pm_v6f_s6_level_ao: S8F_LEVEL_AO: pm_v8f_s8_level_ao:
regulator-vdd-mxa-level-ao {
regulator-name = "pm_v6f_s6_level_ao"; regulator-name = "pm_v6f_s6_level_ao";
qcom,set = <RPMH_REGULATOR_SET_ACTIVE>; qcom,set = <RPMH_REGULATOR_SET_ACTIVE>;
regulator-min-microvolt = regulator-min-microvolt =
@@ -785,7 +787,7 @@
RPMH_REGULATOR_MODE_HPM>; RPMH_REGULATOR_MODE_HPM>;
qcom,mode-threshold-currents = <0 30000>; qcom,mode-threshold-currents = <0 30000>;
L1F: pm_v6f_l1: regulator-pm-vxf-l1 { L1F: pm_v6f_l1: pm_v8f_l1: regulator-pm-vxf-l1 {
regulator-name = "pm_v6f_l1"; regulator-name = "pm_v6f_l1";
qcom,set = <RPMH_REGULATOR_SET_ALL>; qcom,set = <RPMH_REGULATOR_SET_ALL>;
regulator-min-microvolt = <880000>; regulator-min-microvolt = <880000>;
@@ -804,7 +806,7 @@
RPMH_REGULATOR_MODE_HPM>; RPMH_REGULATOR_MODE_HPM>;
qcom,mode-threshold-currents = <0 30000>; qcom,mode-threshold-currents = <0 30000>;
L2F: pm_v6f_l2: regulator-pm-vxf-l2 { L2F: pm_v6f_l2: pm_v8f_l2: regulator-pm-vxf-l2 {
regulator-name = "pm_v6f_l2"; regulator-name = "pm_v6f_l2";
qcom,set = <RPMH_REGULATOR_SET_ALL>; qcom,set = <RPMH_REGULATOR_SET_ALL>;
regulator-min-microvolt = <1200000>; regulator-min-microvolt = <1200000>;
@@ -823,7 +825,7 @@
RPMH_REGULATOR_MODE_HPM>; RPMH_REGULATOR_MODE_HPM>;
qcom,mode-threshold-currents = <0 30000>; qcom,mode-threshold-currents = <0 30000>;
L3F: pm_v6f_l3: regulator-pm-vxf-l3 { L3F: pm_v6f_l3: pm_v8f_l3: regulator-pm-vxf-l3 {
regulator-name = "pm_v6f_l3"; regulator-name = "pm_v6f_l3";
qcom,set = <RPMH_REGULATOR_SET_ALL>; qcom,set = <RPMH_REGULATOR_SET_ALL>;
regulator-min-microvolt = <1800000>; regulator-min-microvolt = <1800000>;