arm64: dts: qcom: msm8996-oneplus: do not enable incomplete nodes

status=okay should appear in final place where all required properties
are provided, because that makes the code the easiest to read.  Move the
status from common OnePlus DTSI to board DTS.  No functional changes.

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/20230308125906.236885-11-krzysztof.kozlowski@linaro.org

diff --git a/arch/arm64/boot/dts/qcom/msm8996-oneplus-common.dtsi b/arch/arm64/boot/dts/qcom/msm8996-oneplus-common.dtsi
index 104deaee74e5ca88c9aa0e99d7fcaf87cacbf9e1..2adadc1e5b7ca503480c8e78fd52354ea020f772 100644 (file)
--- a/arch/arm64/boot/dts/qcom/msm8996-oneplus-common.dtsi
+++ b/arch/arm64/boot/dts/qcom/msm8996-oneplus-common.dtsi
@@ -85,10 +85,6 @@
        };
 };
 
-&adsp_pil {
-       status = "okay";
-};
-
 &blsp1_i2c3 {
        status = "okay";
 
@@ -183,10 +179,6 @@
        status = "okay";
 };
 
-&gpu {
-       status = "okay";
-};
-
 &hsusb_phy1 {
        vdd-supply = <&vreg_l28a_0p925>;
        vdda-pll-supply = <&vreg_l12a_1p8>;
@@ -215,7 +207,6 @@
 
 &mss_pil {
        pll-supply = <&vreg_l12a_1p8>;
-       status = "okay";
 };
 
 &pcie0 {
@@ -548,10 +539,6 @@
        };
 };
 
-&slpi_pil {
-       status = "okay";
-};
-
 &sound {
        compatible = "qcom,apq8096-sndcard";
        model = "OnePlus3";
@@ -812,7 +799,3 @@
 
        maximum-speed = "high-speed";
 };
-
-&venus {
-       status = "okay";
-};

diff --git a/arch/arm64/boot/dts/qcom/msm8996-oneplus3.dts b/arch/arm64/boot/dts/qcom/msm8996-oneplus3.dts
index 1bdc1b13430511fc2eb4c1b7c26c42fc1fd3195e..dfe75119b8d25fce4a6a14e0ab4f07414aadc8c5 100644 (file)
--- a/arch/arm64/boot/dts/qcom/msm8996-oneplus3.dts
+++ b/arch/arm64/boot/dts/qcom/msm8996-oneplus3.dts
@@ -17,6 +17,7 @@
 
 &adsp_pil {
        firmware-name = "qcom/msm8996/oneplus3/adsp.mbn";
+       status = "okay";
 };
 
 &battery {
@@ -25,6 +26,8 @@
 };
 
 &gpu {
+       status = "okay";
+
        zap-shader {
                firmware-name = "qcom/msm8996/oneplus3/a530_zap.mbn";
        };
@@ -33,12 +36,15 @@
 &mss_pil {
        firmware-name = "qcom/msm8996/oneplus3/mba.mbn",
                        "qcom/msm8996/oneplus3/modem.mbn";
+       status = "okay";
 };
 
 &slpi_pil {
        firmware-name = "qcom/msm8996/oneplus3/slpi.mbn";
+       status = "okay";
 };
 
 &venus {
        firmware-name = "qcom/msm8996/oneplus3/venus.mbn";
+       status = "okay";
 };

diff --git a/arch/arm64/boot/dts/qcom/msm8996-oneplus3t.dts b/arch/arm64/boot/dts/qcom/msm8996-oneplus3t.dts
index 34f837dd0c12f41c8f182790874df2a9a87d0805..51fce65e89f1142cff98fcdecde9744b87decdc3 100644 (file)
--- a/arch/arm64/boot/dts/qcom/msm8996-oneplus3t.dts
+++ b/arch/arm64/boot/dts/qcom/msm8996-oneplus3t.dts
@@ -18,6 +18,7 @@
 
 &adsp_pil {
        firmware-name = "qcom/msm8996/oneplus3t/adsp.mbn";
+       status = "okay";
 };
 
 &battery {
@@ -26,6 +27,8 @@
 };
 
 &gpu {
+       status = "okay";
+
        zap-shader {
                firmware-name = "qcom/msm8996/oneplus3t/a530_zap.mbn";
        };
@@ -34,12 +37,15 @@
 &mss_pil {
        firmware-name = "qcom/msm8996/oneplus3t/mba.mbn",
                        "qcom/msm8996/oneplus3t/modem.mbn";
+       status = "okay";
 };
 
 &slpi_pil {
        firmware-name = "qcom/msm8996/oneplus3t/slpi.mbn";
+       status = "okay";
 };
 
 &venus {
        firmware-name = "qcom/msm8996/oneplus3t/venus.mbn";
+       status = "okay";
 };