ARM: dts: qcom: extend scm compatible to match dt-schema

First device specific compatible, then general one.

Reviewed-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
Signed-off-by: David Heidelberg <david@ixit.cz>
Signed-off-by: Bjorn Andersson <bjorn.andersson@linaro.org>
Link: https://lore.kernel.org/r/20220626183247.142776-1-david@ixit.cz

diff --git a/arch/arm/boot/dts/qcom-apq8064.dtsi b/arch/arm/boot/dts/qcom-apq8064.dtsi
index 91adcbd54b17313ae0fa056ebec366c0baa5f4b1..38f6077d4c66adeef4cbd6f7eb550918755d50e7 100644 (file)
--- a/arch/arm/boot/dts/qcom-apq8064.dtsi
+++ b/arch/arm/boot/dts/qcom-apq8064.dtsi
@@ -315,7 +315,7 @@
 
        firmware {
                scm {
-                       compatible = "qcom,scm-apq8064";
+                       compatible = "qcom,scm-apq8064", "qcom,scm";
 
                        clocks = <&rpmcc RPM_DAYTONA_FABRIC_CLK>;
                        clock-names = "core";

diff --git a/arch/arm/boot/dts/qcom-apq8084.dtsi b/arch/arm/boot/dts/qcom-apq8084.dtsi
index 3e8bded2b5c8e8c7ee0e5526c8d75e302828d469..72f9255855a1dff4bfc7a34f0e953eec03b327a7 100644 (file)
--- a/arch/arm/boot/dts/qcom-apq8084.dtsi
+++ b/arch/arm/boot/dts/qcom-apq8084.dtsi
@@ -95,7 +95,7 @@
 
        firmware {
                scm {
-                       compatible = "qcom,scm";
+                       compatible = "qcom,scm-apq8084", "qcom,scm";
                        clocks = <&gcc GCC_CE1_CLK> , <&gcc GCC_CE1_AXI_CLK>, <&gcc GCC_CE1_AHB_CLK>;
                        clock-names = "core", "bus", "iface";
                };

diff --git a/arch/arm/boot/dts/qcom-ipq4019.dtsi b/arch/arm/boot/dts/qcom-ipq4019.dtsi
index a2632349cec49ee6d9e9b2018baeee9ae91006a1..bb307b8f678c2dfc0e9b7e5ccb3012578f1ad8c8 100644 (file)
--- a/arch/arm/boot/dts/qcom-ipq4019.dtsi
+++ b/arch/arm/boot/dts/qcom-ipq4019.dtsi
@@ -156,7 +156,7 @@
 
        firmware {
                scm {
-                       compatible = "qcom,scm-ipq4019";
+                       compatible = "qcom,scm-ipq4019", "qcom,scm";
                };
        };
 

diff --git a/arch/arm/boot/dts/qcom-msm8974.dtsi b/arch/arm/boot/dts/qcom-msm8974.dtsi
index 8131d3e222cb9084755902523aba32480da17606..af318c104cdd2c81576c5c92ae411aa797aaf95e 100644 (file)
--- a/arch/arm/boot/dts/qcom-msm8974.dtsi
+++ b/arch/arm/boot/dts/qcom-msm8974.dtsi
@@ -96,7 +96,7 @@
 
        firmware {
                scm {
-                       compatible = "qcom,scm";
+                       compatible = "qcom,scm-msm8974", "qcom,scm";
                        clocks = <&gcc GCC_CE1_CLK>, <&gcc GCC_CE1_AXI_CLK>, <&gcc GCC_CE1_AHB_CLK>;
                        clock-names = "core", "bus", "iface";
                };