@@ -594,9 +594,15 @@
regulator-max-microvolt = <1200000>;
};
+ /**
+ * Set vdd-mx in turbo mode since we do not perform vdd-mx scaling.
+ * vdd-mx (vdd-mem) is limited to 1.2875 max by the RPM.
+ * cf APQ8016(E) device specification - Table 3-3 - Operating condition
+ */
l3 {
- regulator-min-microvolt = <375000>;
- regulator-max-microvolt = <1525000>;
+ regulator-min-microvolt = <1287500>;
+ regulator-max-microvolt = <1287500>;
+ regulator-always-on;
};
l4 {
@@ -103,6 +103,7 @@
next-level-cache = <&L2_0>;
enable-method = "psci";
clocks = <&apcs>;
+ cpu-supply = <&pm8916_spmi_s2>;
operating-points-v2 = <&cpu_opp_table>;
#cooling-cells = <2>;
power-domains = <&CPU_PD0>;
@@ -116,6 +117,7 @@
next-level-cache = <&L2_0>;
enable-method = "psci";
clocks = <&apcs>;
+ cpu-supply = <&pm8916_spmi_s2>;
operating-points-v2 = <&cpu_opp_table>;
#cooling-cells = <2>;
power-domains = <&CPU_PD1>;
@@ -129,6 +131,7 @@
next-level-cache = <&L2_0>;
enable-method = "psci";
clocks = <&apcs>;
+ cpu-supply = <&pm8916_spmi_s2>;
operating-points-v2 = <&cpu_opp_table>;
#cooling-cells = <2>;
power-domains = <&CPU_PD2>;
@@ -142,6 +145,7 @@
next-level-cache = <&L2_0>;
enable-method = "psci";
clocks = <&apcs>;
+ cpu-supply = <&pm8916_spmi_s2>;
operating-points-v2 = <&cpu_opp_table>;
#cooling-cells = <2>;
power-domains = <&CPU_PD3>;
@@ -342,15 +346,35 @@
opp-200000000 {
opp-hz = /bits/ 64 <200000000>;
+ opp-microvolt = <1050000>;
};
opp-400000000 {
opp-hz = /bits/ 64 <400000000>;
+ opp-microvolt = <1050000>;
+ };
+ opp-533330000 {
+ opp-hz = /bits/ 64 <533330000>;
+ opp-microvolt = <1150000>;
};
opp-800000000 {
opp-hz = /bits/ 64 <800000000>;
+ opp-microvolt = <1150000>;
};
opp-998400000 {
opp-hz = /bits/ 64 <998400000>;
+ opp-microvolt = <1350000>;
+ };
+ opp-1094400000 {
+ opp-hz = /bits/ 64 <1094400000>;
+ opp-microvolt = <1350000>;
+ };
+ opp-1152000000 {
+ opp-hz = /bits/ 64 <1152000000>;
+ opp-microvolt = <1350000>;
+ };
+ opp-1209600000 {
+ opp-hz = /bits/ 64 <1209600000>;
+ opp-microvolt = <1350000>;
};
};
@@ -1605,6 +1629,7 @@
compatible = "qcom,rpm-pm8916-regulators";
pm8916_s1: s1 {};
+ /* s2 is directly controlled via spmi */
pm8916_s3: s3 {};
pm8916_s4: s4 {};
@@ -157,5 +157,18 @@
vdd-micbias-supply = <&pm8916_l13>;
#sound-dai-cells = <1>;
};
+
+ spmi_regulators: spmi_regulators {
+ compatible = "qcom,pm8916-regulators";
+ #address-cells = <1>;
+ #size-cells = <1>;
+
+ pm8916_spmi_s2: s2 {
+ regulator-always-on;
+ regulator-min-microvolt = <900000>;
+ regulator-max-microvolt = <1562000>;
+ };
+ /* other regulators can be controlled via rpm */
+ };
};
};
The highest cpu frequency opps have been dropped because CPR is not supported. However, we can simply specify operating voltage so that they match the max corner voltages for each freq. With that, we can support up to 1.2Ghz. Ideally, msm8916 CPR should be implemented to fine tune operating voltages and optimize power consumption. The SPMI interface is directly used for AP regulator control since it offers a minimal transition latency (maximum transition latency with spmi is 250us, with rpm is 970us as reported by cpufreq-info). According to some CPR downstream drivers, VDD_MX (VDD_MEM) needs to be scaled along VDD_APC, this can be done in different ways, including setting VDD_MX to its maximum value (turbo). This patch: - Adds missing opps and corresponding target voltages to msm8916.dtsi. - Adds pm8916 spmi regulator node to pm8916.dtsi. - Force VDD_MX to its turbo voltage, to allow safe VDD_APC scaling. Tested with a dragonboard-410c. Signed-off-by: Loic Poulain <loic.poulain@linaro.org> --- v2: - move cpu-supply to msm8916 since pm8916 s2 is tighly coupled to AP core (cf pm8916 specification) + other pm8916 supplies are already defined in msm8916. - s2 min/max are specified in pm8916 spec - Removed 1.36GHz op since freq seems capped to 1.21 anyway v3: - Set VDD_MX (l3) to its maximum value (turbo) arch/arm64/boot/dts/qcom/apq8016-sbc.dtsi | 10 ++++++++-- arch/arm64/boot/dts/qcom/msm8916.dtsi | 25 +++++++++++++++++++++++++ arch/arm64/boot/dts/qcom/pm8916.dtsi | 13 +++++++++++++ 3 files changed, 46 insertions(+), 2 deletions(-)