arm64: dts: qcom: align OPP table node name with DT schema

Bindings expect OPP tables to start with "opp-table".

Signed-off-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
Reviewed-by: Konrad Dybcio <konrad.dybcio@linaro.org>
Signed-off-by: Bjorn Andersson <andersson@kernel.org>
Link: https://lore.kernel.org/r/20230109112221.102473-2-krzysztof.kozlowski@linaro.org

diff --git a/arch/arm64/boot/dts/qcom/msm8996-v3.0.dtsi b/arch/arm64/boot/dts/qcom/msm8996-v3.0.dtsi
index 5728583..929bdcd 100644 (file)
--- a/arch/arm64/boot/dts/qcom/msm8996-v3.0.dtsi
+++ b/arch/arm64/boot/dts/qcom/msm8996-v3.0.dtsi
@@ -19,7 +19,7 @@
   * features get enabled upstream.
   */
 
-gpu_opp_table_3_0: gpu-opp-table-30 {
+gpu_opp_table_3_0: opp-table-gpu30 {
        compatible = "operating-points-v2";
 
        opp-624000000 {

diff --git a/arch/arm64/boot/dts/qcom/sa8540p.dtsi b/arch/arm64/boot/dts/qcom/sa8540p.dtsi
index a88452c..4a990fd 100644 (file)
--- a/arch/arm64/boot/dts/qcom/sa8540p.dtsi
+++ b/arch/arm64/boot/dts/qcom/sa8540p.dtsi
@@ -10,7 +10,7 @@
 /delete-node/ &cpu4_opp_table;
 
 / {
-       cpu0_opp_table: cpu0-opp-table {
+       cpu0_opp_table: opp-table-cpu0 {
                compatible = "operating-points-v2";
                opp-shared;
 
@@ -92,7 +92,7 @@
                };
        };
 
-       cpu4_opp_table: cpu4-opp-table {
+       cpu4_opp_table: opp-table-cpu4 {
                compatible = "operating-points-v2";
                opp-shared;
 

diff --git a/arch/arm64/boot/dts/qcom/sc8280xp.dtsi b/arch/arm64/boot/dts/qcom/sc8280xp.dtsi
index 70d0da0..fa2d0d7 100644 (file)
--- a/arch/arm64/boot/dts/qcom/sc8280xp.dtsi
+++ b/arch/arm64/boot/dts/qcom/sc8280xp.dtsi
@@ -37,186 +37,6 @@
                };
        };
 
-       cpu0_opp_table: cpu0-opp-table {
-               compatible = "operating-points-v2";
-               opp-shared;
-
-               opp-300000000 {
-                       opp-hz = /bits/ 64 <300000000>;
-                       opp-peak-kBps = <(300000 * 32)>;
-               };
-               opp-403200000 {
-                       opp-hz = /bits/ 64 <403200000>;
-                       opp-peak-kBps = <(384000 * 32)>;
-               };
-               opp-499200000 {
-                       opp-hz = /bits/ 64 <499200000>;
-                       opp-peak-kBps = <(480000 * 32)>;
-               };
-               opp-595200000 {
-                       opp-hz = /bits/ 64 <595200000>;
-                       opp-peak-kBps = <(576000 * 32)>;
-               };
-               opp-691200000 {
-                       opp-hz = /bits/ 64 <691200000>;
-                       opp-peak-kBps = <(672000 * 32)>;
-               };
-               opp-806400000 {
-                       opp-hz = /bits/ 64 <806400000>;
-                       opp-peak-kBps = <(768000 * 32)>;
-               };
-               opp-902400000 {
-                       opp-hz = /bits/ 64 <902400000>;
-                       opp-peak-kBps = <(864000 * 32)>;
-               };
-               opp-1017600000 {
-                       opp-hz = /bits/ 64 <1017600000>;
-                       opp-peak-kBps = <(960000 * 32)>;
-               };
-               opp-1113600000 {
-                       opp-hz = /bits/ 64 <1113600000>;
-                       opp-peak-kBps = <(1075200 * 32)>;
-               };
-               opp-1209600000 {
-                       opp-hz = /bits/ 64 <1209600000>;
-                       opp-peak-kBps = <(1171200 * 32)>;
-               };
-               opp-1324800000 {
-                       opp-hz = /bits/ 64 <1324800000>;
-                       opp-peak-kBps = <(1267200 * 32)>;
-               };
-               opp-1440000000 {
-                       opp-hz = /bits/ 64 <1440000000>;
-                       opp-peak-kBps = <(1363200 * 32)>;
-               };
-               opp-1555200000 {
-                       opp-hz = /bits/ 64 <1555200000>;
-                       opp-peak-kBps = <(1536000 * 32)>;
-               };
-               opp-1670400000 {
-                       opp-hz = /bits/ 64 <1670400000>;
-                       opp-peak-kBps = <(1612800 * 32)>;
-               };
-               opp-1785600000 {
-                       opp-hz = /bits/ 64 <1785600000>;
-                       opp-peak-kBps = <(1689600 * 32)>;
-               };
-               opp-1881600000 {
-                       opp-hz = /bits/ 64 <1881600000>;
-                       opp-peak-kBps = <(1689600 * 32)>;
-               };
-               opp-1996800000 {
-                       opp-hz = /bits/ 64 <1996800000>;
-                       opp-peak-kBps = <(1689600 * 32)>;
-               };
-               opp-2112000000 {
-                       opp-hz = /bits/ 64 <2112000000>;
-                       opp-peak-kBps = <(1689600 * 32)>;
-               };
-               opp-2227200000 {
-                       opp-hz = /bits/ 64 <2227200000>;
-                       opp-peak-kBps = <(1689600 * 32)>;
-               };
-               opp-2342400000 {
-                       opp-hz = /bits/ 64 <2342400000>;
-                       opp-peak-kBps = <(1689600 * 32)>;
-               };
-               opp-2438400000 {
-                       opp-hz = /bits/ 64 <2438400000>;
-                       opp-peak-kBps = <(1689600 * 32)>;
-               };
-       };
-
-       cpu4_opp_table: cpu4-opp-table {
-               compatible = "operating-points-v2";
-               opp-shared;
-
-               opp-825600000 {
-                       opp-hz = /bits/ 64 <825600000>;
-                       opp-peak-kBps = <(768000 * 32)>;
-               };
-               opp-940800000 {
-                       opp-hz = /bits/ 64 <940800000>;
-                       opp-peak-kBps = <(864000 * 32)>;
-               };
-               opp-1056000000 {
-                       opp-hz = /bits/ 64 <1056000000>;
-                       opp-peak-kBps = <(960000 * 32)>;
-               };
-               opp-1171200000 {
-                       opp-hz = /bits/ 64 <1171200000>;
-                       opp-peak-kBps = <(1171200 * 32)>;
-               };
-               opp-1286400000 {
-                       opp-hz = /bits/ 64 <1286400000>;
-                       opp-peak-kBps = <(1267200 * 32)>;
-               };
-               opp-1401600000 {
-                       opp-hz = /bits/ 64 <1401600000>;
-                       opp-peak-kBps = <(1363200 * 32)>;
-               };
-               opp-1516800000 {
-                       opp-hz = /bits/ 64 <1516800000>;
-                       opp-peak-kBps = <(1459200 * 32)>;
-               };
-               opp-1632000000 {
-                       opp-hz = /bits/ 64 <1632000000>;
-                       opp-peak-kBps = <(1612800 * 32)>;
-               };
-               opp-1747200000 {
-                       opp-hz = /bits/ 64 <1747200000>;
-                       opp-peak-kBps = <(1689600 * 32)>;
-               };
-               opp-1862400000 {
-                       opp-hz = /bits/ 64 <1862400000>;
-                       opp-peak-kBps = <(1689600 * 32)>;
-               };
-               opp-1977600000 {
-                       opp-hz = /bits/ 64 <1977600000>;
-                       opp-peak-kBps = <(1689600 * 32)>;
-               };
-               opp-2073600000 {
-                       opp-hz = /bits/ 64 <2073600000>;
-                       opp-peak-kBps = <(1689600 * 32)>;
-               };
-               opp-2169600000 {
-                       opp-hz = /bits/ 64 <2169600000>;
-                       opp-peak-kBps = <(1689600 * 32)>;
-               };
-               opp-2284800000 {
-                       opp-hz = /bits/ 64 <2284800000>;
-                       opp-peak-kBps = <(1689600 * 32)>;
-               };
-               opp-2400000000 {
-                       opp-hz = /bits/ 64 <2400000000>;
-                       opp-peak-kBps = <(1689600 * 32)>;
-               };
-               opp-2496000000 {
-                       opp-hz = /bits/ 64 <2496000000>;
-                       opp-peak-kBps = <(1689600 * 32)>;
-               };
-               opp-2592000000 {
-                       opp-hz = /bits/ 64 <2592000000>;
-                       opp-peak-kBps = <(1689600 * 32)>;
-               };
-               opp-2688000000 {
-                       opp-hz = /bits/ 64 <2688000000>;
-                       opp-peak-kBps = <(1689600 * 32)>;
-               };
-               opp-2803200000 {
-                       opp-hz = /bits/ 64 <2803200000>;
-                       opp-peak-kBps = <(1689600 * 32)>;
-               };
-               opp-2899200000 {
-                       opp-hz = /bits/ 64 <2899200000>;
-                       opp-peak-kBps = <(1689600 * 32)>;
-               };
-               opp-2995200000 {
-                       opp-hz = /bits/ 64 <2995200000>;
-                       opp-peak-kBps = <(1689600 * 32)>;
-               };
-       };
-
        cpus {
                #address-cells = <2>;
                #size-cells = <0>;
@@ -541,6 +361,200 @@
                reg = <0x0 0x80000000 0x0 0x0>;
        };
 
+       cpu0_opp_table: opp-table-cpu0 {
+               compatible = "operating-points-v2";
+               opp-shared;
+
+               opp-300000000 {
+                       opp-hz = /bits/ 64 <300000000>;
+                       opp-peak-kBps = <(300000 * 32)>;
+               };
+               opp-403200000 {
+                       opp-hz = /bits/ 64 <403200000>;
+                       opp-peak-kBps = <(384000 * 32)>;
+               };
+               opp-499200000 {
+                       opp-hz = /bits/ 64 <499200000>;
+                       opp-peak-kBps = <(480000 * 32)>;
+               };
+               opp-595200000 {
+                       opp-hz = /bits/ 64 <595200000>;
+                       opp-peak-kBps = <(576000 * 32)>;
+               };
+               opp-691200000 {
+                       opp-hz = /bits/ 64 <691200000>;
+                       opp-peak-kBps = <(672000 * 32)>;
+               };
+               opp-806400000 {
+                       opp-hz = /bits/ 64 <806400000>;
+                       opp-peak-kBps = <(768000 * 32)>;
+               };
+               opp-902400000 {
+                       opp-hz = /bits/ 64 <902400000>;
+                       opp-peak-kBps = <(864000 * 32)>;
+               };
+               opp-1017600000 {
+                       opp-hz = /bits/ 64 <1017600000>;
+                       opp-peak-kBps = <(960000 * 32)>;
+               };
+               opp-1113600000 {
+                       opp-hz = /bits/ 64 <1113600000>;
+                       opp-peak-kBps = <(1075200 * 32)>;
+               };
+               opp-1209600000 {
+                       opp-hz = /bits/ 64 <1209600000>;
+                       opp-peak-kBps = <(1171200 * 32)>;
+               };
+               opp-1324800000 {
+                       opp-hz = /bits/ 64 <1324800000>;
+                       opp-peak-kBps = <(1267200 * 32)>;
+               };
+               opp-1440000000 {
+                       opp-hz = /bits/ 64 <1440000000>;
+                       opp-peak-kBps = <(1363200 * 32)>;
+               };
+               opp-1555200000 {
+                       opp-hz = /bits/ 64 <1555200000>;
+                       opp-peak-kBps = <(1536000 * 32)>;
+               };
+               opp-1670400000 {
+                       opp-hz = /bits/ 64 <1670400000>;
+                       opp-peak-kBps = <(1612800 * 32)>;
+               };
+               opp-1785600000 {
+                       opp-hz = /bits/ 64 <1785600000>;
+                       opp-peak-kBps = <(1689600 * 32)>;
+               };
+               opp-1881600000 {
+                       opp-hz = /bits/ 64 <1881600000>;
+                       opp-peak-kBps = <(1689600 * 32)>;
+               };
+               opp-1996800000 {
+                       opp-hz = /bits/ 64 <1996800000>;
+                       opp-peak-kBps = <(1689600 * 32)>;
+               };
+               opp-2112000000 {
+                       opp-hz = /bits/ 64 <2112000000>;
+                       opp-peak-kBps = <(1689600 * 32)>;
+               };
+               opp-2227200000 {
+                       opp-hz = /bits/ 64 <2227200000>;
+                       opp-peak-kBps = <(1689600 * 32)>;
+               };
+               opp-2342400000 {
+                       opp-hz = /bits/ 64 <2342400000>;
+                       opp-peak-kBps = <(1689600 * 32)>;
+               };
+               opp-2438400000 {
+                       opp-hz = /bits/ 64 <2438400000>;
+                       opp-peak-kBps = <(1689600 * 32)>;
+               };
+       };
+
+       cpu4_opp_table: opp-table-cpu4 {
+               compatible = "operating-points-v2";
+               opp-shared;
+
+               opp-825600000 {
+                       opp-hz = /bits/ 64 <825600000>;
+                       opp-peak-kBps = <(768000 * 32)>;
+               };
+               opp-940800000 {
+                       opp-hz = /bits/ 64 <940800000>;
+                       opp-peak-kBps = <(864000 * 32)>;
+               };
+               opp-1056000000 {
+                       opp-hz = /bits/ 64 <1056000000>;
+                       opp-peak-kBps = <(960000 * 32)>;
+               };
+               opp-1171200000 {
+                       opp-hz = /bits/ 64 <1171200000>;
+                       opp-peak-kBps = <(1171200 * 32)>;
+               };
+               opp-1286400000 {
+                       opp-hz = /bits/ 64 <1286400000>;
+                       opp-peak-kBps = <(1267200 * 32)>;
+               };
+               opp-1401600000 {
+                       opp-hz = /bits/ 64 <1401600000>;
+                       opp-peak-kBps = <(1363200 * 32)>;
+               };
+               opp-1516800000 {
+                       opp-hz = /bits/ 64 <1516800000>;
+                       opp-peak-kBps = <(1459200 * 32)>;
+               };
+               opp-1632000000 {
+                       opp-hz = /bits/ 64 <1632000000>;
+                       opp-peak-kBps = <(1612800 * 32)>;
+               };
+               opp-1747200000 {
+                       opp-hz = /bits/ 64 <1747200000>;
+                       opp-peak-kBps = <(1689600 * 32)>;
+               };
+               opp-1862400000 {
+                       opp-hz = /bits/ 64 <1862400000>;
+                       opp-peak-kBps = <(1689600 * 32)>;
+               };
+               opp-1977600000 {
+                       opp-hz = /bits/ 64 <1977600000>;
+                       opp-peak-kBps = <(1689600 * 32)>;
+               };
+               opp-2073600000 {
+                       opp-hz = /bits/ 64 <2073600000>;
+                       opp-peak-kBps = <(1689600 * 32)>;
+               };
+               opp-2169600000 {
+                       opp-hz = /bits/ 64 <2169600000>;
+                       opp-peak-kBps = <(1689600 * 32)>;
+               };
+               opp-2284800000 {
+                       opp-hz = /bits/ 64 <2284800000>;
+                       opp-peak-kBps = <(1689600 * 32)>;
+               };
+               opp-2400000000 {
+                       opp-hz = /bits/ 64 <2400000000>;
+                       opp-peak-kBps = <(1689600 * 32)>;
+               };
+               opp-2496000000 {
+                       opp-hz = /bits/ 64 <2496000000>;
+                       opp-peak-kBps = <(1689600 * 32)>;
+               };
+               opp-2592000000 {
+                       opp-hz = /bits/ 64 <2592000000>;
+                       opp-peak-kBps = <(1689600 * 32)>;
+               };
+               opp-2688000000 {
+                       opp-hz = /bits/ 64 <2688000000>;
+                       opp-peak-kBps = <(1689600 * 32)>;
+               };
+               opp-2803200000 {
+                       opp-hz = /bits/ 64 <2803200000>;
+                       opp-peak-kBps = <(1689600 * 32)>;
+               };
+               opp-2899200000 {
+                       opp-hz = /bits/ 64 <2899200000>;
+                       opp-peak-kBps = <(1689600 * 32)>;
+               };
+               opp-2995200000 {
+                       opp-hz = /bits/ 64 <2995200000>;
+                       opp-peak-kBps = <(1689600 * 32)>;
+               };
+       };
+
+       qup_opp_table_100mhz: opp-table-qup100mhz {
+               compatible = "operating-points-v2";
+
+               opp-75000000 {
+                       opp-hz = /bits/ 64 <75000000>;
+                       required-opps = <&rpmhpd_opp_low_svs>;
+               };
+
+               opp-100000000 {
+                       opp-hz = /bits/ 64 <100000000>;
+                       required-opps = <&rpmhpd_opp_svs>;
+               };
+       };
+
        pmu {
                compatible = "arm,armv8-pmuv3";
                interrupts = <GIC_PPI 7 IRQ_TYPE_LEVEL_HIGH>;
@@ -604,20 +618,6 @@
                };
        };
 
-       qup_opp_table_100mhz: qup-100mhz-opp-table {
-               compatible = "operating-points-v2";
-
-               opp-75000000 {
-                       opp-hz = /bits/ 64 <75000000>;
-                       required-opps = <&rpmhpd_opp_low_svs>;
-               };
-
-               opp-100000000 {
-                       opp-hz = /bits/ 64 <100000000>;
-                       required-opps = <&rpmhpd_opp_svs>;
-               };
-       };
-
        reserved-memory {
                #address-cells = <2>;
                #size-cells = <2>;

diff --git a/arch/arm64/boot/dts/qcom/sdm845.dtsi b/arch/arm64/boot/dts/qcom/sdm845.dtsi
index 9459354..742c175 100644 (file)
--- a/arch/arm64/boot/dts/qcom/sdm845.dtsi
+++ b/arch/arm64/boot/dts/qcom/sdm845.dtsi
@@ -4559,7 +4559,7 @@
                                        };
                                };
 
-                               dp_opp_table: dp-opp-table {
+                               dp_opp_table: opp-table {
                                        compatible = "operating-points-v2";
 
                                        opp-162000000 {