1. Add syscon node for the SAW CPU registers 2. Add SAW regulators gang definition for s8-s11 3. Add voltages to the OPP tables 4. Add the s11 SAW regulator as CPU regulator Signed-off-by: Ilia Lin <ilialin@xxxxxxxxxxxxxx> Acked-by: Viresh Kumar <viresh.kumar@xxxxxxxxxx> --- arch/arm64/boot/dts/qcom/msm8996.dtsi | 119 ++++++++++++++++++++++++++++++++++ 1 file changed, 119 insertions(+) diff --git a/arch/arm64/boot/dts/qcom/msm8996.dtsi b/arch/arm64/boot/dts/qcom/msm8996.dtsi index d96a112..871bfac 100644 --- a/arch/arm64/boot/dts/qcom/msm8996.dtsi +++ b/arch/arm64/boot/dts/qcom/msm8996.dtsi @@ -8,6 +8,7 @@ #include <dt-bindings/clock/qcom,mmcc-msm8996.h> #include <dt-bindings/clock/qcom,rpmcc.h> #include <dt-bindings/thermal/thermal.h> +#include <dt-bindings/spmi/spmi.h> / { model = "Qualcomm Technologies, Inc. MSM8996"; @@ -92,6 +93,7 @@ reg = <0x0 0x0>; enable-method = "psci"; clocks = <&kryocc 0>; + cpu-supply = <&pm8994_s11_saw>; operating-points-v2 = <&cluster0_opp>; #cooling-cells = <2>; next-level-cache = <&L2_0>; @@ -107,6 +109,7 @@ reg = <0x0 0x1>; enable-method = "psci"; clocks = <&kryocc 0>; + cpu-supply = <&pm8994_s11_saw>; operating-points-v2 = <&cluster0_opp>; #cooling-cells = <2>; next-level-cache = <&L2_0>; @@ -118,6 +121,7 @@ reg = <0x0 0x100>; enable-method = "psci"; clocks = <&kryocc 1>; + cpu-supply = <&pm8994_s11_saw>; operating-points-v2 = <&cluster1_opp>; #cooling-cells = <2>; next-level-cache = <&L2_1>; @@ -133,6 +137,7 @@ reg = <0x0 0x101>; enable-method = "psci"; clocks = <&kryocc 1>; + cpu-supply = <&pm8994_s11_saw>; operating-points-v2 = <&cluster1_opp>; #cooling-cells = <2>; next-level-cache = <&L2_1>; @@ -169,171 +174,205 @@ opp-307200000 { opp-hz = /bits/ 64 <307200000>; + opp-microvolt = <905000 905000 1140000>; opp-supported-hw = <0x77>; clock-latency-ns = <200000>; }; opp-384000000 { opp-hz = /bits/ 64 <384000000>; + opp-microvolt = <905000 905000 1140000>; opp-supported-hw = <0x70>; clock-latency-ns = <200000>; }; opp-422400000 { opp-hz = /bits/ 64 <422400000>; + opp-microvolt = <905000 905000 1140000>; opp-supported-hw = <0x7>; clock-latency-ns = <200000>; }; opp-460800000 { opp-hz = /bits/ 64 <460800000>; + opp-microvolt = <905000 905000 1140000>; opp-supported-hw = <0x70>; clock-latency-ns = <200000>; }; opp-480000000 { opp-hz = /bits/ 64 <480000000>; + opp-microvolt = <905000 905000 1140000>; opp-supported-hw = <0x7>; clock-latency-ns = <200000>; }; opp-537600000 { opp-hz = /bits/ 64 <537600000>; + opp-microvolt = <905000 905000 1140000>; opp-supported-hw = <0x70>; clock-latency-ns = <200000>; }; opp-556800000 { opp-hz = /bits/ 64 <556800000>; + opp-microvolt = <905000 905000 1140000>; opp-supported-hw = <0x7>; clock-latency-ns = <200000>; }; opp-614400000 { opp-hz = /bits/ 64 <614400000>; + opp-microvolt = <905000 905000 1140000>; opp-supported-hw = <0x70>; clock-latency-ns = <200000>; }; opp-652800000 { opp-hz = /bits/ 64 <652800000>; + opp-microvolt = <905000 905000 1140000>; opp-supported-hw = <0x7>; clock-latency-ns = <200000>; }; opp-691200000 { opp-hz = /bits/ 64 <691200000>; + opp-microvolt = <905000 905000 1140000>; opp-supported-hw = <0x70>; clock-latency-ns = <200000>; }; opp-729600000 { opp-hz = /bits/ 64 <729600000>; + opp-microvolt = <905000 905000 1140000>; opp-supported-hw = <0x7>; clock-latency-ns = <200000>; }; opp-768000000 { opp-hz = /bits/ 64 <768000000>; + opp-microvolt = <905000 905000 1140000>; opp-supported-hw = <0x70>; clock-latency-ns = <200000>; }; opp-844800000 { opp-hz = /bits/ 64 <844800000>; + opp-microvolt = <905000 905000 1140000>; opp-supported-hw = <0x77>; clock-latency-ns = <200000>; }; opp-902400000 { opp-hz = /bits/ 64 <902400000>; + opp-microvolt = <905000 905000 1140000>; opp-supported-hw = <0x70>; clock-latency-ns = <200000>; }; opp-960000000 { opp-hz = /bits/ 64 <960000000>; + opp-microvolt = <905000 905000 1140000>; opp-supported-hw = <0x7>; clock-latency-ns = <200000>; }; opp-979200000 { opp-hz = /bits/ 64 <979200000>; + opp-microvolt = <905000 905000 1140000>; opp-supported-hw = <0x70>; clock-latency-ns = <200000>; }; opp-1036800000 { opp-hz = /bits/ 64 <1036800000>; + opp-microvolt = <905000 905000 1140000>; opp-supported-hw = <0x7>; clock-latency-ns = <200000>; }; opp-1056000000 { opp-hz = /bits/ 64 <1056000000>; + opp-microvolt = <905000 905000 1140000>; opp-supported-hw = <0x70>; clock-latency-ns = <200000>; }; opp-1113600000 { opp-hz = /bits/ 64 <1113600000>; + opp-microvolt = <905000 905000 1140000>; opp-supported-hw = <0x7>; clock-latency-ns = <200000>; }; opp-1132800000 { opp-hz = /bits/ 64 <1132800000>; + opp-microvolt = <905000 905000 1140000>; opp-supported-hw = <0x70>; clock-latency-ns = <200000>; }; opp-1190400000 { opp-hz = /bits/ 64 <1190400000>; + opp-microvolt = <905000 905000 1140000>; opp-supported-hw = <0x7>; clock-latency-ns = <200000>; }; opp-1209600000 { opp-hz = /bits/ 64 <1209600000>; + opp-microvolt = <905000 905000 1140000>; opp-supported-hw = <0x70>; clock-latency-ns = <200000>; }; opp-1228800000 { opp-hz = /bits/ 64 <1228800000>; + opp-microvolt = <905000 905000 1140000>; opp-supported-hw = <0x7>; clock-latency-ns = <200000>; }; opp-1286400000 { opp-hz = /bits/ 64 <1286400000>; + opp-microvolt = <1140000 905000 1140000>; opp-supported-hw = <0x70>; clock-latency-ns = <200000>; }; opp-1324800000 { opp-hz = /bits/ 64 <1324800000>; + opp-microvolt = <1140000 905000 1140000>; opp-supported-hw = <0x5>; clock-latency-ns = <200000>; }; opp-1363200000 { opp-hz = /bits/ 64 <1363200000>; + opp-microvolt = <1140000 905000 1140000>; opp-supported-hw = <0x72>; clock-latency-ns = <200000>; }; opp-1401600000 { opp-hz = /bits/ 64 <1401600000>; + opp-microvolt = <1140000 905000 1140000>; opp-supported-hw = <0x5>; clock-latency-ns = <200000>; }; opp-1440000000 { opp-hz = /bits/ 64 <1440000000>; + opp-microvolt = <1140000 905000 1140000>; opp-supported-hw = <0x70>; clock-latency-ns = <200000>; }; opp-1478400000 { opp-hz = /bits/ 64 <1478400000>; + opp-microvolt = <1140000 905000 1140000>; opp-supported-hw = <0x1>; clock-latency-ns = <200000>; }; opp-1497600000 { opp-hz = /bits/ 64 <1497600000>; + opp-microvolt = <1140000 905000 1140000>; opp-supported-hw = <0x4>; clock-latency-ns = <200000>; }; opp-1516800000 { opp-hz = /bits/ 64 <1516800000>; + opp-microvolt = <1140000 905000 1140000>; opp-supported-hw = <0x70>; clock-latency-ns = <200000>; }; opp-1593600000 { opp-hz = /bits/ 64 <1593600000>; + opp-microvolt = <1140000 905000 1140000>; opp-supported-hw = <0x71>; clock-latency-ns = <200000>; }; opp-1996800000 { opp-hz = /bits/ 64 <1996800000>; + opp-microvolt = <1140000 905000 1140000>; opp-supported-hw = <0x20>; clock-latency-ns = <200000>; }; opp-2188800000 { opp-hz = /bits/ 64 <2188800000>; + opp-microvolt = <1140000 905000 1140000>; opp-supported-hw = <0x10>; clock-latency-ns = <200000>; }; @@ -346,251 +385,301 @@ opp-307200000 { opp-hz = /bits/ 64 <307200000>; + opp-microvolt = <905000 905000 1140000>; opp-supported-hw = <0x77>; clock-latency-ns = <200000>; }; opp-384000000 { opp-hz = /bits/ 64 <384000000>; + opp-microvolt = <905000 905000 1140000>; opp-supported-hw = <0x70>; clock-latency-ns = <200000>; }; opp-403200000 { opp-hz = /bits/ 64 <403200000>; + opp-microvolt = <905000 905000 1140000>; opp-supported-hw = <0x7>; clock-latency-ns = <200000>; }; opp-460800000 { opp-hz = /bits/ 64 <460800000>; + opp-microvolt = <905000 905000 1140000>; opp-supported-hw = <0x70>; clock-latency-ns = <200000>; }; opp-480000000 { opp-hz = /bits/ 64 <480000000>; + opp-microvolt = <905000 905000 1140000>; opp-supported-hw = <0x7>; clock-latency-ns = <200000>; }; opp-537600000 { opp-hz = /bits/ 64 <537600000>; + opp-microvolt = <905000 905000 1140000>; opp-supported-hw = <0x70>; clock-latency-ns = <200000>; }; opp-556800000 { opp-hz = /bits/ 64 <556800000>; + opp-microvolt = <905000 905000 1140000>; opp-supported-hw = <0x7>; clock-latency-ns = <200000>; }; opp-614400000 { opp-hz = /bits/ 64 <614400000>; + opp-microvolt = <905000 905000 1140000>; opp-supported-hw = <0x70>; clock-latency-ns = <200000>; }; opp-652800000 { opp-hz = /bits/ 64 <652800000>; + opp-microvolt = <905000 905000 1140000>; opp-supported-hw = <0x7>; clock-latency-ns = <200000>; }; opp-691200000 { opp-hz = /bits/ 64 <691200000>; + opp-microvolt = <905000 905000 1140000>; opp-supported-hw = <0x70>; clock-latency-ns = <200000>; }; opp-729600000 { opp-hz = /bits/ 64 <729600000>; + opp-microvolt = <905000 905000 1140000>; opp-supported-hw = <0x7>; clock-latency-ns = <200000>; }; opp-748800000 { opp-hz = /bits/ 64 <748800000>; + opp-microvolt = <905000 905000 1140000>; opp-supported-hw = <0x70>; clock-latency-ns = <200000>; }; opp-806400000 { opp-hz = /bits/ 64 <806400000>; + opp-microvolt = <905000 905000 1140000>; opp-supported-hw = <0x7>; clock-latency-ns = <200000>; }; opp-825600000 { opp-hz = /bits/ 64 <825600000>; + opp-microvolt = <905000 905000 1140000>; opp-supported-hw = <0x70>; clock-latency-ns = <200000>; }; opp-883200000 { opp-hz = /bits/ 64 <883200000>; + opp-microvolt = <905000 905000 1140000>; opp-supported-hw = <0x7>; clock-latency-ns = <200000>; }; opp-902400000 { opp-hz = /bits/ 64 <902400000>; + opp-microvolt = <905000 905000 1140000>; opp-supported-hw = <0x70>; clock-latency-ns = <200000>; }; opp-940800000 { opp-hz = /bits/ 64 <940800000>; + opp-microvolt = <905000 905000 1140000>; opp-supported-hw = <0x7>; clock-latency-ns = <200000>; }; opp-979200000 { opp-hz = /bits/ 64 <979200000>; + opp-microvolt = <905000 905000 1140000>; opp-supported-hw = <0x70>; clock-latency-ns = <200000>; }; opp-1036800000 { opp-hz = /bits/ 64 <1036800000>; + opp-microvolt = <905000 905000 1140000>; opp-supported-hw = <0x7>; clock-latency-ns = <200000>; }; opp-1056000000 { opp-hz = /bits/ 64 <1056000000>; + opp-microvolt = <905000 905000 1140000>; opp-supported-hw = <0x70>; clock-latency-ns = <200000>; }; opp-1113600000 { opp-hz = /bits/ 64 <1113600000>; + opp-microvolt = <905000 905000 1140000>; opp-supported-hw = <0x7>; clock-latency-ns = <200000>; }; opp-1132800000 { opp-hz = /bits/ 64 <1132800000>; + opp-microvolt = <905000 905000 1140000>; opp-supported-hw = <0x70>; clock-latency-ns = <200000>; }; opp-1190400000 { opp-hz = /bits/ 64 <1190400000>; + opp-microvolt = <905000 905000 1140000>; opp-supported-hw = <0x7>; clock-latency-ns = <200000>; }; opp-1209600000 { opp-hz = /bits/ 64 <1209600000>; + opp-microvolt = <905000 905000 1140000>; opp-supported-hw = <0x70>; clock-latency-ns = <200000>; }; opp-1248000000 { opp-hz = /bits/ 64 <1248000000>; + opp-microvolt = <905000 905000 1140000>; opp-supported-hw = <0x7>; clock-latency-ns = <200000>; }; opp-1286400000 { opp-hz = /bits/ 64 <1286400000>; + opp-microvolt = <905000 905000 1140000>; opp-supported-hw = <0x70>; clock-latency-ns = <200000>; }; opp-1324800000 { opp-hz = /bits/ 64 <1324800000>; + opp-microvolt = <1140000 905000 1140000>; opp-supported-hw = <0x7>; clock-latency-ns = <200000>; }; opp-1363200000 { opp-hz = /bits/ 64 <1363200000>; + opp-microvolt = <1140000 905000 1140000>; opp-supported-hw = <0x70>; clock-latency-ns = <200000>; }; opp-1401600000 { opp-hz = /bits/ 64 <1401600000>; + opp-microvolt = <1140000 905000 1140000>; opp-supported-hw = <0x7>; clock-latency-ns = <200000>; }; opp-1440000000 { opp-hz = /bits/ 64 <1440000000>; + opp-microvolt = <1140000 905000 1140000>; opp-supported-hw = <0x70>; clock-latency-ns = <200000>; }; opp-1478400000 { opp-hz = /bits/ 64 <1478400000>; + opp-microvolt = <1140000 905000 1140000>; opp-supported-hw = <0x7>; clock-latency-ns = <200000>; }; opp-1516800000 { opp-hz = /bits/ 64 <1516800000>; + opp-microvolt = <1140000 905000 1140000>; opp-supported-hw = <0x70>; clock-latency-ns = <200000>; }; opp-1555200000 { opp-hz = /bits/ 64 <1555200000>; + opp-microvolt = <1140000 905000 1140000>; opp-supported-hw = <0x7>; clock-latency-ns = <200000>; }; opp-1593600000 { opp-hz = /bits/ 64 <1593600000>; + opp-microvolt = <1140000 905000 1140000>; opp-supported-hw = <0x70>; clock-latency-ns = <200000>; }; opp-1632000000 { opp-hz = /bits/ 64 <1632000000>; + opp-microvolt = <1140000 905000 1140000>; opp-supported-hw = <0x7>; clock-latency-ns = <200000>; }; opp-1670400000 { opp-hz = /bits/ 64 <1670400000>; + opp-microvolt = <1140000 905000 1140000>; opp-supported-hw = <0x70>; clock-latency-ns = <200000>; }; opp-1708800000 { opp-hz = /bits/ 64 <1708800000>; + opp-microvolt = <1140000 905000 1140000>; opp-supported-hw = <0x7>; clock-latency-ns = <200000>; }; opp-1747200000 { opp-hz = /bits/ 64 <1747200000>; + opp-microvolt = <1140000 905000 1140000>; opp-supported-hw = <0x70>; clock-latency-ns = <200000>; }; opp-1785600000 { opp-hz = /bits/ 64 <1785600000>; + opp-microvolt = <1140000 905000 1140000>; opp-supported-hw = <0x7>; clock-latency-ns = <200000>; }; opp-1804800000 { opp-hz = /bits/ 64 <1804800000>; + opp-microvolt = <1140000 905000 1140000>; opp-supported-hw = <0x6>; clock-latency-ns = <200000>; }; opp-1824000000 { opp-hz = /bits/ 64 <1824000000>; + opp-microvolt = <1140000 905000 1140000>; opp-supported-hw = <0x71>; clock-latency-ns = <200000>; }; opp-1900800000 { opp-hz = /bits/ 64 <1900800000>; + opp-microvolt = <1140000 905000 1140000>; opp-supported-hw = <0x74>; clock-latency-ns = <200000>; }; opp-1920000000 { opp-hz = /bits/ 64 <1920000000>; + opp-microvolt = <1140000 905000 1140000>; opp-supported-hw = <0x1>; clock-latency-ns = <200000>; }; opp-1977600000 { opp-hz = /bits/ 64 <1977600000>; + opp-microvolt = <1140000 905000 1140000>; opp-supported-hw = <0x30>; clock-latency-ns = <200000>; }; opp-1996800000 { opp-hz = /bits/ 64 <1996800000>; + opp-microvolt = <1140000 905000 1140000>; opp-supported-hw = <0x1>; clock-latency-ns = <200000>; }; opp-2054400000 { opp-hz = /bits/ 64 <2054400000>; + opp-microvolt = <1140000 905000 1140000>; opp-supported-hw = <0x30>; clock-latency-ns = <200000>; }; opp-2073600000 { opp-hz = /bits/ 64 <2073600000>; + opp-microvolt = <1140000 905000 1140000>; opp-supported-hw = <0x1>; clock-latency-ns = <200000>; }; opp-2150400000 { opp-hz = /bits/ 64 <2150400000>; + opp-microvolt = <1140000 905000 1140000>; opp-supported-hw = <0x31>; clock-latency-ns = <200000>; }; opp-2246400000 { opp-hz = /bits/ 64 <2246400000>; + opp-microvolt = <1140000 905000 1140000>; opp-supported-hw = <0x10>; clock-latency-ns = <200000>; }; opp-2342400000 { opp-hz = /bits/ 64 <2342400000>; + opp-microvolt = <1140000 905000 1140000>; opp-supported-hw = <0x10>; clock-latency-ns = <200000>; }; @@ -908,6 +997,11 @@ #mbox-cells = <1>; }; + saw3: syscon@9A10000 { + compatible = "syscon"; + reg = <0x9A10000 0x1000>; + }; + gcc: clock-controller@300000 { compatible = "qcom,gcc-msm8996"; #clock-cells = <1>; @@ -1134,6 +1228,31 @@ #size-cells = <0>; interrupt-controller; #interrupt-cells = <4>; + pmic@1 { + compatible = "qcom,pm8994", "qcom,spmi-pmic"; + reg = <0x1 SPMI_USID>; + #address-cells = <1>; + #size-cells = <0>; + spm-regulators { + compatible = "qcom,pm8994-regulators"; + qcom,saw-reg = <&saw3>; + s8 { + qcom,saw-slave; + }; + s9 { + qcom,saw-slave; + }; + s10 { + qcom,saw-slave; + }; + pm8994_s11_saw: s11 { + qcom,saw-leader; + regulator-always-on; + regulator-min-microvolt = <905000>; + regulator-max-microvolt = <1140000>; + }; + }; + }; }; mmcc: clock-controller@8c0000 { -- 1.9.1 -- To unsubscribe from this list: send the line "unsubscribe linux-arm-msm" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html