arm64: dts: qcom: msm8996: fix supported-hw in cpufreq OPP tables

[ Upstream commit 0154caaa2b748e7414a4ec3c6ee60e8f483b2d4f ]

Adjust MSM8996 cpufreq tables according to tables in msm-3.18. Some of
the frequencies are not supported on speed bins other than 0. Also other
speed bins support intermediate topmost frequencies, not supported on
speed bin 0. Implement all these differencies.

Fixes: 90173a954a22 ("arm64: dts: qcom: msm8996: Add CPU opps")
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-5-dmitry.baryshkov@linaro.org
Signed-off-by: Sasha Levin <sashal@kernel.org>

diff --git a/arch/arm64/boot/dts/qcom/msm8996.dtsi b/arch/arm64/boot/dts/qcom/msm8996.dtsi
index 4f472306f10f8750952e2bed07a93c2ff07e71f6..032c6cd635e2323d48a8072b1da1559a67847f5c 100644 (file)
--- a/arch/arm64/boot/dts/qcom/msm8996.dtsi
+++ b/arch/arm64/boot/dts/qcom/msm8996.dtsi
@@ -202,22 +202,32 @@
                };
                opp-1324800000 {
                        opp-hz = /bits/ 64 <1324800000>;
-                       opp-supported-hw = <0x7>;
+                       opp-supported-hw = <0x5>;
+                       clock-latency-ns = <200000>;
+               };
+               opp-1363200000 {
+                       opp-hz = /bits/ 64 <1363200000>;
+                       opp-supported-hw = <0x2>;
                        clock-latency-ns = <200000>;
                };
                opp-1401600000 {
                        opp-hz = /bits/ 64 <1401600000>;
-                       opp-supported-hw = <0x7>;
+                       opp-supported-hw = <0x5>;
                        clock-latency-ns = <200000>;
                };
                opp-1478400000 {
                        opp-hz = /bits/ 64 <1478400000>;
-                       opp-supported-hw = <0x7>;
+                       opp-supported-hw = <0x1>;
+                       clock-latency-ns = <200000>;
+               };
+               opp-1497600000 {
+                       opp-hz = /bits/ 64 <1497600000>;
+                       opp-supported-hw = <0x04>;
                        clock-latency-ns = <200000>;
                };
                opp-1593600000 {
                        opp-hz = /bits/ 64 <1593600000>;
-                       opp-supported-hw = <0x7>;
+                       opp-supported-hw = <0x1>;
                        clock-latency-ns = <200000>;
                };
        };
@@ -328,29 +338,39 @@
                        opp-supported-hw = <0x7>;
                        clock-latency-ns = <200000>;
                };
+               opp-1804800000 {
+                       opp-hz = /bits/ 64 <1804800000>;
+                       opp-supported-hw = <0x6>;
+                       clock-latency-ns = <200000>;
+               };
                opp-1824000000 {
                        opp-hz = /bits/ 64 <1824000000>;
-                       opp-supported-hw = <0x7>;
+                       opp-supported-hw = <0x1>;
+                       clock-latency-ns = <200000>;
+               };
+               opp-1900800000 {
+                       opp-hz = /bits/ 64 <1900800000>;
+                       opp-supported-hw = <0x4>;
                        clock-latency-ns = <200000>;
                };
                opp-1920000000 {
                        opp-hz = /bits/ 64 <1920000000>;
-                       opp-supported-hw = <0x7>;
+                       opp-supported-hw = <0x1>;
                        clock-latency-ns = <200000>;
                };
                opp-1996800000 {
                        opp-hz = /bits/ 64 <1996800000>;
-                       opp-supported-hw = <0x7>;
+                       opp-supported-hw = <0x1>;
                        clock-latency-ns = <200000>;
                };
                opp-2073600000 {
                        opp-hz = /bits/ 64 <2073600000>;
-                       opp-supported-hw = <0x7>;
+                       opp-supported-hw = <0x1>;
                        clock-latency-ns = <200000>;
                };
                opp-2150400000 {
                        opp-hz = /bits/ 64 <2150400000>;
-                       opp-supported-hw = <0x7>;
+                       opp-supported-hw = <0x1>;
                        clock-latency-ns = <200000>;
                };
        };