arm64: dts: qcom: msm8996: Add MSM8996 Pro support

Qualcomm MSM8996 Pro is a variant of MSM8996 with higher frequencies
supported both on CPU and GPU. There are other minor hardware
differencies in the CPU and GPU regulators and bus fabrics.

However this results in significant differences between 8996 and 8996
Pro CPU OPP tables. Judging from msm-3.18 there are only few common
frequencies supported by both msm8996 and msm8996pro. Rather than
hacking the tables for msm8996, split msm8996pro support into a separate
file. Later this would allow having additional customizations for the
CBF, CPR, retulators, etc.

[DB: dropped all non-CPU-OPP changes]

Fixes: 90173a954a22 ("arm64: dts: qcom: msm8996: Add CPU opps")
Signed-off-by: Yassine Oudjana <y.oudjana@protonmail.com>
[DB: Realigned supported-hw to keep compat with current cpufreq driver]
Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org>
Acked-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
Signed-off-by: Bjorn Andersson <andersson@kernel.org>
Link: https://lore.kernel.org/r/20220724140421.1933004-3-dmitry.baryshkov@linaro.org

diff --git a/arch/arm64/boot/dts/qcom/msm8996.dtsi b/arch/arm64/boot/dts/qcom/msm8996.dtsi
index ffa5177..c6c074a 100644 (file)
--- a/arch/arm64/boot/dts/qcom/msm8996.dtsi
+++ b/arch/arm64/boot/dts/qcom/msm8996.dtsi
@@ -144,82 +144,82 @@
                /* Nominal fmax for now */
                opp-307200000 {
                        opp-hz = /bits/ 64 <307200000>;
-                       opp-supported-hw = <0x77>;
+                       opp-supported-hw = <0x7>;
                        clock-latency-ns = <200000>;
                };
                opp-422400000 {
                        opp-hz = /bits/ 64 <422400000>;
-                       opp-supported-hw = <0x77>;
+                       opp-supported-hw = <0x7>;
                        clock-latency-ns = <200000>;
                };
                opp-480000000 {
                        opp-hz = /bits/ 64 <480000000>;
-                       opp-supported-hw = <0x77>;
+                       opp-supported-hw = <0x7>;
                        clock-latency-ns = <200000>;
                };
                opp-556800000 {
                        opp-hz = /bits/ 64 <556800000>;
-                       opp-supported-hw = <0x77>;
+                       opp-supported-hw = <0x7>;
                        clock-latency-ns = <200000>;
                };
                opp-652800000 {
                        opp-hz = /bits/ 64 <652800000>;
-                       opp-supported-hw = <0x77>;
+                       opp-supported-hw = <0x7>;
                        clock-latency-ns = <200000>;
                };
                opp-729600000 {
                        opp-hz = /bits/ 64 <729600000>;
-                       opp-supported-hw = <0x77>;
+                       opp-supported-hw = <0x7>;
                        clock-latency-ns = <200000>;
                };
                opp-844800000 {
                        opp-hz = /bits/ 64 <844800000>;
-                       opp-supported-hw = <0x77>;
+                       opp-supported-hw = <0x7>;
                        clock-latency-ns = <200000>;
                };
                opp-960000000 {
                        opp-hz = /bits/ 64 <960000000>;
-                       opp-supported-hw = <0x77>;
+                       opp-supported-hw = <0x7>;
                        clock-latency-ns = <200000>;
                };
                opp-1036800000 {
                        opp-hz = /bits/ 64 <1036800000>;
-                       opp-supported-hw = <0x77>;
+                       opp-supported-hw = <0x7>;
                        clock-latency-ns = <200000>;
                };
                opp-1113600000 {
                        opp-hz = /bits/ 64 <1113600000>;
-                       opp-supported-hw = <0x77>;
+                       opp-supported-hw = <0x7>;
                        clock-latency-ns = <200000>;
                };
                opp-1190400000 {
                        opp-hz = /bits/ 64 <1190400000>;
-                       opp-supported-hw = <0x77>;
+                       opp-supported-hw = <0x7>;
                        clock-latency-ns = <200000>;
                };
                opp-1228800000 {
                        opp-hz = /bits/ 64 <1228800000>;
-                       opp-supported-hw = <0x77>;
+                       opp-supported-hw = <0x7>;
                        clock-latency-ns = <200000>;
                };
                opp-1324800000 {
                        opp-hz = /bits/ 64 <1324800000>;
-                       opp-supported-hw = <0x77>;
+                       opp-supported-hw = <0x7>;
                        clock-latency-ns = <200000>;
                };
                opp-1401600000 {
                        opp-hz = /bits/ 64 <1401600000>;
-                       opp-supported-hw = <0x77>;
+                       opp-supported-hw = <0x7>;
                        clock-latency-ns = <200000>;
                };
                opp-1478400000 {
                        opp-hz = /bits/ 64 <1478400000>;
-                       opp-supported-hw = <0x77>;
+                       opp-supported-hw = <0x7>;
                        clock-latency-ns = <200000>;
                };
                opp-1593600000 {
                        opp-hz = /bits/ 64 <1593600000>;
-                       opp-supported-hw = <0x77>;
+                       opp-supported-hw = <0x7>;
                        clock-latency-ns = <200000>;
                };
        };
@@ -232,127 +232,127 @@
                /* Nominal fmax for now */
                opp-307200000 {
                        opp-hz = /bits/ 64 <307200000>;
-                       opp-supported-hw = <0x77>;
+                       opp-supported-hw = <0x7>;
                        clock-latency-ns = <200000>;
                };
                opp-403200000 {
                        opp-hz = /bits/ 64 <403200000>;
-                       opp-supported-hw = <0x77>;
+                       opp-supported-hw = <0x7>;
                        clock-latency-ns = <200000>;
                };
                opp-480000000 {
                        opp-hz = /bits/ 64 <480000000>;
-                       opp-supported-hw = <0x77>;
+                       opp-supported-hw = <0x7>;
                        clock-latency-ns = <200000>;
                };
                opp-556800000 {
                        opp-hz = /bits/ 64 <556800000>;
-                       opp-supported-hw = <0x77>;
+                       opp-supported-hw = <0x7>;
                        clock-latency-ns = <200000>;
                };
                opp-652800000 {
                        opp-hz = /bits/ 64 <652800000>;
-                       opp-supported-hw = <0x77>;
+                       opp-supported-hw = <0x7>;
                        clock-latency-ns = <200000>;
                };
                opp-729600000 {
                        opp-hz = /bits/ 64 <729600000>;
-                       opp-supported-hw = <0x77>;
+                       opp-supported-hw = <0x7>;
                        clock-latency-ns = <200000>;
                };
                opp-806400000 {
                        opp-hz = /bits/ 64 <806400000>;
-                       opp-supported-hw = <0x77>;
+                       opp-supported-hw = <0x7>;
                        clock-latency-ns = <200000>;
                };
                opp-883200000 {
                        opp-hz = /bits/ 64 <883200000>;
-                       opp-supported-hw = <0x77>;
+                       opp-supported-hw = <0x7>;
                        clock-latency-ns = <200000>;
                };
                opp-940800000 {
                        opp-hz = /bits/ 64 <940800000>;
-                       opp-supported-hw = <0x77>;
+                       opp-supported-hw = <0x7>;
                        clock-latency-ns = <200000>;
                };
                opp-1036800000 {
                        opp-hz = /bits/ 64 <1036800000>;
-                       opp-supported-hw = <0x77>;
+                       opp-supported-hw = <0x7>;
                        clock-latency-ns = <200000>;
                };
                opp-1113600000 {
                        opp-hz = /bits/ 64 <1113600000>;
-                       opp-supported-hw = <0x77>;
+                       opp-supported-hw = <0x7>;
                        clock-latency-ns = <200000>;
                };
                opp-1190400000 {
                        opp-hz = /bits/ 64 <1190400000>;
-                       opp-supported-hw = <0x77>;
+                       opp-supported-hw = <0x7>;
                        clock-latency-ns = <200000>;
                };
                opp-1248000000 {
                        opp-hz = /bits/ 64 <1248000000>;
-                       opp-supported-hw = <0x77>;
+                       opp-supported-hw = <0x7>;
                        clock-latency-ns = <200000>;
                };
                opp-1324800000 {
                        opp-hz = /bits/ 64 <1324800000>;
-                       opp-supported-hw = <0x77>;
+                       opp-supported-hw = <0x7>;
                        clock-latency-ns = <200000>;
                };
                opp-1401600000 {
                        opp-hz = /bits/ 64 <1401600000>;
-                       opp-supported-hw = <0x77>;
+                       opp-supported-hw = <0x7>;
                        clock-latency-ns = <200000>;
                };
                opp-1478400000 {
                        opp-hz = /bits/ 64 <1478400000>;
-                       opp-supported-hw = <0x77>;
+                       opp-supported-hw = <0x7>;
                        clock-latency-ns = <200000>;
                };
                opp-1555200000 {
                        opp-hz = /bits/ 64 <1555200000>;
-                       opp-supported-hw = <0x77>;
+                       opp-supported-hw = <0x7>;
                        clock-latency-ns = <200000>;
                };
                opp-1632000000 {
                        opp-hz = /bits/ 64 <1632000000>;
-                       opp-supported-hw = <0x77>;
+                       opp-supported-hw = <0x7>;
                        clock-latency-ns = <200000>;
                };
                opp-1708800000 {
                        opp-hz = /bits/ 64 <1708800000>;
-                       opp-supported-hw = <0x77>;
+                       opp-supported-hw = <0x7>;
                        clock-latency-ns = <200000>;
                };
                opp-1785600000 {
                        opp-hz = /bits/ 64 <1785600000>;
-                       opp-supported-hw = <0x77>;
+                       opp-supported-hw = <0x7>;
                        clock-latency-ns = <200000>;
                };
                opp-1824000000 {
                        opp-hz = /bits/ 64 <1824000000>;
-                       opp-supported-hw = <0x77>;
+                       opp-supported-hw = <0x7>;
                        clock-latency-ns = <200000>;
                };
                opp-1920000000 {
                        opp-hz = /bits/ 64 <1920000000>;
-                       opp-supported-hw = <0x77>;
+                       opp-supported-hw = <0x7>;
                        clock-latency-ns = <200000>;
                };
                opp-1996800000 {
                        opp-hz = /bits/ 64 <1996800000>;
-                       opp-supported-hw = <0x77>;
+                       opp-supported-hw = <0x7>;
                        clock-latency-ns = <200000>;
                };
                opp-2073600000 {
                        opp-hz = /bits/ 64 <2073600000>;
-                       opp-supported-hw = <0x77>;
+                       opp-supported-hw = <0x7>;
                        clock-latency-ns = <200000>;
                };
                opp-2150400000 {
                        opp-hz = /bits/ 64 <2150400000>;
-                       opp-supported-hw = <0x77>;
+                       opp-supported-hw = <0x7>;
                        clock-latency-ns = <200000>;
                };
        };

diff --git a/arch/arm64/boot/dts/qcom/msm8996pro.dtsi b/arch/arm64/boot/dts/qcom/msm8996pro.dtsi
new file mode 100644 (file)
index 0000000..63e1b4e
--- /dev/null
+++ b/arch/arm64/boot/dts/qcom/msm8996pro.dtsi
@@ -0,0 +1,266 @@
+// SPDX-License-Identifier: BSD-3-Clause
+/*
+ * Copyright (c) 2022, Linaro Limited
+ */
+
+#include "msm8996.dtsi"
+
+/ {
+       /delete-node/ opp-table-cluster0;
+       /delete-node/ opp-table-cluster1;
+
+       /*
+        * On MSM8996 Pro the cpufreq driver shifts speed bins into the high
+        * nibble of supported hw, so speed bin 0 becomes 0x10, speed bin 1
+        * becomes 0x20, speed 2 becomes 0x40.
+        */
+
+       cluster0_opp: opp-table-cluster0 {
+               compatible = "operating-points-v2-kryo-cpu";
+               nvmem-cells = <&speedbin_efuse>;
+               opp-shared;
+
+               opp-307200000 {
+                       opp-hz = /bits/ 64 <307200000>;
+                       opp-supported-hw = <0x70>;
+                       clock-latency-ns = <200000>;
+               };
+               opp-384000000 {
+                       opp-hz = /bits/ 64 <384000000>;
+                       opp-supported-hw = <0x70>;
+                       clock-latency-ns = <200000>;
+               };
+               opp-460800000 {
+                       opp-hz = /bits/ 64 <460800000>;
+                       opp-supported-hw = <0x70>;
+                       clock-latency-ns = <200000>;
+               };
+               opp-537600000 {
+                       opp-hz = /bits/ 64 <537600000>;
+                       opp-supported-hw = <0x70>;
+                       clock-latency-ns = <200000>;
+               };
+               opp-614400000 {
+                       opp-hz = /bits/ 64 <614400000>;
+                       opp-supported-hw = <0x70>;
+                       clock-latency-ns = <200000>;
+               };
+               opp-691200000 {
+                       opp-hz = /bits/ 64 <691200000>;
+                       opp-supported-hw = <0x70>;
+                       clock-latency-ns = <200000>;
+               };
+               opp-768000000 {
+                       opp-hz = /bits/ 64 <768000000>;
+                       opp-supported-hw = <0x70>;
+                       clock-latency-ns = <200000>;
+               };
+               opp-844800000 {
+                       opp-hz = /bits/ 64 <844800000>;
+                       opp-supported-hw = <0x70>;
+                       clock-latency-ns = <200000>;
+               };
+               opp-902400000 {
+                       opp-hz = /bits/ 64 <902400000>;
+                       opp-supported-hw = <0x70>;
+                       clock-latency-ns = <200000>;
+               };
+               opp-979200000 {
+                       opp-hz = /bits/ 64 <979200000>;
+                       opp-supported-hw = <0x70>;
+                       clock-latency-ns = <200000>;
+               };
+               opp-1056000000 {
+                       opp-hz = /bits/ 64 <1056000000>;
+                       opp-supported-hw = <0x70>;
+                       clock-latency-ns = <200000>;
+               };
+               opp-1132800000 {
+                       opp-hz = /bits/ 64 <1132800000>;
+                       opp-supported-hw = <0x70>;
+                       clock-latency-ns = <200000>;
+               };
+               opp-1209600000 {
+                       opp-hz = /bits/ 64 <1209600000>;
+                       opp-supported-hw = <0x70>;
+                       clock-latency-ns = <200000>;
+               };
+               opp-1286400000 {
+                       opp-hz = /bits/ 64 <1286400000>;
+                       opp-supported-hw = <0x70>;
+                       clock-latency-ns = <200000>;
+               };
+               opp-1363200000 {
+                       opp-hz = /bits/ 64 <1363200000>;
+                       opp-supported-hw = <0x70>;
+                       clock-latency-ns = <200000>;
+               };
+               opp-1440000000 {
+                       opp-hz = /bits/ 64 <1440000000>;
+                       opp-supported-hw = <0x70>;
+                       clock-latency-ns = <200000>;
+               };
+               opp-1516800000 {
+                       opp-hz = /bits/ 64 <1516800000>;
+                       opp-supported-hw = <0x70>;
+                       clock-latency-ns = <200000>;
+               };
+               opp-1593600000 {
+                       opp-hz = /bits/ 64 <1593600000>;
+                       opp-supported-hw = <0x70>;
+                       clock-latency-ns = <200000>;
+               };
+               opp-1996800000 {
+                       opp-hz = /bits/ 64 <1996800000>;
+                       opp-supported-hw = <0x20>;
+                       clock-latency-ns = <200000>;
+               };
+               opp-2188800000 {
+                       opp-hz = /bits/ 64 <2188800000>;
+                       opp-supported-hw = <0x10>;
+                       clock-latency-ns = <200000>;
+               };
+       };
+
+       cluster1_opp: opp-table-cluster1 {
+               compatible = "operating-points-v2-kryo-cpu";
+               nvmem-cells = <&speedbin_efuse>;
+               opp-shared;
+
+               opp-307200000 {
+                       opp-hz = /bits/ 64 <307200000>;
+                       opp-supported-hw = <0x70>;
+                       clock-latency-ns = <200000>;
+               };
+               opp-384000000 {
+                       opp-hz = /bits/ 64 <384000000>;
+                       opp-supported-hw = <0x70>;
+                       clock-latency-ns = <200000>;
+               };
+               opp-460800000 {
+                       opp-hz = /bits/ 64 <460800000>;
+                       opp-supported-hw = <0x70>;
+                       clock-latency-ns = <200000>;
+               };
+               opp-537600000 {
+                       opp-hz = /bits/ 64 <537600000>;
+                       opp-supported-hw = <0x70>;
+                       clock-latency-ns = <200000>;
+               };
+               opp-614400000 {
+                       opp-hz = /bits/ 64 <614400000>;
+                       opp-supported-hw = <0x70>;
+                       clock-latency-ns = <200000>;
+               };
+               opp-691200000 {
+                       opp-hz = /bits/ 64 <691200000>;
+                       opp-supported-hw = <0x70>;
+                       clock-latency-ns = <200000>;
+               };
+               opp-748800000 {
+                       opp-hz = /bits/ 64 <748800000>;
+                       opp-supported-hw = <0x70>;
+                       clock-latency-ns = <200000>;
+               };
+               opp-825600000 {
+                       opp-hz = /bits/ 64 <825600000>;
+                       opp-supported-hw = <0x70>;
+                       clock-latency-ns = <200000>;
+               };
+               opp-902400000 {
+                       opp-hz = /bits/ 64 <902400000>;
+                       opp-supported-hw = <0x70>;
+                       clock-latency-ns = <200000>;
+               };
+               opp-979200000 {
+                       opp-hz = /bits/ 64 <979200000>;
+                       opp-supported-hw = <0x70>;
+                       clock-latency-ns = <200000>;
+               };
+               opp-1056000000 {
+                       opp-hz = /bits/ 64 <1056000000>;
+                       opp-supported-hw = <0x70>;
+                       clock-latency-ns = <200000>;
+               };
+               opp-1132800000 {
+                       opp-hz = /bits/ 64 <1132800000>;
+                       opp-supported-hw = <0x70>;
+                       clock-latency-ns = <200000>;
+               };
+               opp-1209600000 {
+                       opp-hz = /bits/ 64 <1209600000>;
+                       opp-supported-hw = <0x70>;
+                       clock-latency-ns = <200000>;
+               };
+               opp-1286400000 {
+                       opp-hz = /bits/ 64 <1286400000>;
+                       opp-supported-hw = <0x70>;
+                       clock-latency-ns = <200000>;
+               };
+               opp-1363200000 {
+                       opp-hz = /bits/ 64 <1363200000>;
+                       opp-supported-hw = <0x70>;
+                       clock-latency-ns = <200000>;
+               };
+               opp-1440000000 {
+                       opp-hz = /bits/ 64 <1440000000>;
+                       opp-supported-hw = <0x70>;
+                       clock-latency-ns = <200000>;
+               };
+               opp-1516800000 {
+                       opp-hz = /bits/ 64 <1516800000>;
+                       opp-supported-hw = <0x70>;
+                       clock-latency-ns = <200000>;
+               };
+               opp-1593600000 {
+                       opp-hz = /bits/ 64 <1593600000>;
+                       opp-supported-hw = <0x70>;
+                       clock-latency-ns = <200000>;
+               };
+               opp-1670400000 {
+                       opp-hz = /bits/ 64 <1670400000>;
+                       opp-supported-hw = <0x70>;
+                       clock-latency-ns = <200000>;
+               };
+               opp-1747200000 {
+                       opp-hz = /bits/ 64 <1747200000>;
+                       opp-supported-hw = <0x70>;
+                       clock-latency-ns = <200000>;
+               };
+               opp-1824000000 {
+                       opp-hz = /bits/ 64 <1824000000>;
+                       opp-supported-hw = <0x70>;
+                       clock-latency-ns = <200000>;
+               };
+               opp-1900800000 {
+                       opp-hz = /bits/ 64 <1900800000>;
+                       opp-supported-hw = <0x70>;
+                       clock-latency-ns = <200000>;
+               };
+               opp-1977600000 {
+                       opp-hz = /bits/ 64 <1977600000>;
+                       opp-supported-hw = <0x30>;
+                       clock-latency-ns = <200000>;
+               };
+               opp-2054400000 {
+                       opp-hz = /bits/ 64 <2054400000>;
+                       opp-supported-hw = <0x30>;
+                       clock-latency-ns = <200000>;
+               };
+               opp-2150400000 {
+                       opp-hz = /bits/ 64 <2150400000>;
+                       opp-supported-hw = <0x30>;
+                       clock-latency-ns = <200000>;
+               };
+               opp-2246400000 {
+                       opp-hz = /bits/ 64 <2246400000>;
+                       opp-supported-hw = <0x10>;
+                       clock-latency-ns = <200000>;
+               };
+               opp-2342400000 {
+                       opp-hz = /bits/ 64 <2342400000>;
+                       opp-supported-hw = <0x10>;
+                       clock-latency-ns = <200000>;
+               };
+       };
+};