arm64: dts: qcom: msm8998: Disable coresight by default

Boot failure has been reported on MSM8998 based laptop when
coresight is enabled. This is most likely due to lack of
firmware support for coresight on production device when
compared to debug device like MTP where this issue is not
observed. So disable coresight by default for MSM8998 and
enable it only for MSM8998 MTP.

Reported-and-tested-by: Jeffrey Hugo <jeffrey.l.hugo@gmail.com>
Fixes: 783abfa2249a ("arm64: dts: qcom: msm8998: Add Coresight support")
Signed-off-by: Sai Prakash Ranjan <saiprakash.ranjan@codeaurora.org>
Signed-off-by: Bjorn Andersson <bjorn.andersson@linaro.org>

diff --git a/arch/arm64/boot/dts/qcom/msm8998-mtp.dtsi b/arch/arm64/boot/dts/qcom/msm8998-mtp.dtsi
index 8adb4969baec540ef9dfdd56a7737418ba6da70d..5f101a20a20a23a1364a9ecc05cb8b5f6cd5d8bc 100644 (file)
--- a/arch/arm64/boot/dts/qcom/msm8998-mtp.dtsi
+++ b/arch/arm64/boot/dts/qcom/msm8998-mtp.dtsi
@@ -41,6 +41,66 @@ &blsp2_uart1 {
        status = "okay";
 };
 
+&etf {
+       status = "okay";
+};
+
+&etm1 {
+       status = "okay";
+};
+
+&etm2 {
+       status = "okay";
+};
+
+&etm3 {
+       status = "okay";
+};
+
+&etm4 {
+       status = "okay";
+};
+
+&etm5 {
+       status = "okay";
+};
+
+&etm6 {
+       status = "okay";
+};
+
+&etm7 {
+       status = "okay";
+};
+
+&etm8 {
+       status = "okay";
+};
+
+&etr {
+       status = "okay";
+};
+
+&funnel1 {
+       status = "okay";
+};
+
+&funnel2 {
+       status = "okay";
+};
+
+&funnel3 {
+       status = "okay";
+};
+
+&funnel4 {
+       status = "okay";
+};
+
+&funnel5 {
+       status = "okay";
+};
+
 &pm8005_lsid1 {
        pm8005-regulators {
                compatible = "qcom,pm8005-regulators";
@@ -65,6 +125,10 @@ &qusb2phy {
        vdda-phy-dpdm-supply = <&vreg_l24a_3p075>;
 };
 
+&replicator1 {
+       status = "okay";
+};
+
 &rpm_requests {
        pm8998-regulators {
                compatible = "qcom,rpm-pm8998-regulators";
@@ -263,6 +327,10 @@ &sdhc2 {
        pinctrl-1 = <&sdc2_clk_off &sdc2_cmd_off &sdc2_data_off &sdc2_cd_off>;
 };
 
+&stm {
+       status = "okay";
+};
+
 &ufshc {
        vcc-supply = <&vreg_l20a_2p95>;
        vccq-supply = <&vreg_l26a_1p2>;

diff --git a/arch/arm64/boot/dts/qcom/msm8998.dtsi b/arch/arm64/boot/dts/qcom/msm8998.dtsi
index 6e7bddd1e0fc6534caff1de95d714ff7ee1e3b8f..fc7838ea9a01023b0d4f43e765dde08adfba975b 100644 (file)
--- a/arch/arm64/boot/dts/qcom/msm8998.dtsi
+++ b/arch/arm64/boot/dts/qcom/msm8998.dtsi
@@ -1000,11 +1000,12 @@ tlmm: pinctrl@3400000 {
                        #interrupt-cells = <0x2>;
                };
 
-               stm@6002000 {
+               stm: stm@6002000 {
                        compatible = "arm,coresight-stm", "arm,primecell";
                        reg = <0x06002000 0x1000>,
                              <0x16280000 0x180000>;
                        reg-names = "stm-base", "stm-data-base";
+                       status = "disabled";
 
                        clocks = <&rpmcc RPM_SMD_QDSS_CLK>, <&rpmcc RPM_SMD_QDSS_A_CLK>;
                        clock-names = "apb_pclk", "atclk";
@@ -1018,9 +1019,10 @@ stm_out: endpoint {
                        };
                };
 
-               funnel@6041000 {
+               funnel1: funnel@6041000 {
                        compatible = "arm,coresight-dynamic-funnel", "arm,primecell";
                        reg = <0x06041000 0x1000>;
+                       status = "disabled";
 
                        clocks = <&rpmcc RPM_SMD_QDSS_CLK>, <&rpmcc RPM_SMD_QDSS_A_CLK>;
                        clock-names = "apb_pclk", "atclk";
@@ -1047,9 +1049,10 @@ funnel0_in7: endpoint {
                        };
                };
 
-               funnel@6042000 {
+               funnel2: funnel@6042000 {
                        compatible = "arm,coresight-dynamic-funnel", "arm,primecell";
                        reg = <0x06042000 0x1000>;
+                       status = "disabled";
 
                        clocks = <&rpmcc RPM_SMD_QDSS_CLK>, <&rpmcc RPM_SMD_QDSS_A_CLK>;
                        clock-names = "apb_pclk", "atclk";
@@ -1077,9 +1080,10 @@ funnel1_in6: endpoint {
                        };
                };
 
-               funnel@6045000 {
+               funnel3: funnel@6045000 {
                        compatible = "arm,coresight-dynamic-funnel", "arm,primecell";
                        reg = <0x06045000 0x1000>;
+                       status = "disabled";
 
                        clocks = <&rpmcc RPM_SMD_QDSS_CLK>, <&rpmcc RPM_SMD_QDSS_A_CLK>;
                        clock-names = "apb_pclk", "atclk";
@@ -1115,9 +1119,10 @@ merge_funnel_in1: endpoint {
                        };
                };
 
-               replicator@6046000 {
+               replicator1: replicator@6046000 {
                        compatible = "arm,coresight-dynamic-replicator", "arm,primecell";
                        reg = <0x06046000 0x1000>;
+                       status = "disabled";
 
                        clocks = <&rpmcc RPM_SMD_QDSS_CLK>, <&rpmcc RPM_SMD_QDSS_A_CLK>;
                        clock-names = "apb_pclk", "atclk";
@@ -1139,9 +1144,10 @@ replicator_in: endpoint {
                        };
                };
 
-               etf@6047000 {
+               etf: etf@6047000 {
                        compatible = "arm,coresight-tmc", "arm,primecell";
                        reg = <0x06047000 0x1000>;
+                       status = "disabled";
 
                        clocks = <&rpmcc RPM_SMD_QDSS_CLK>, <&rpmcc RPM_SMD_QDSS_A_CLK>;
                        clock-names = "apb_pclk", "atclk";
@@ -1165,9 +1171,10 @@ etf_in: endpoint {
                        };
                };
 
-               etr@6048000 {
+               etr: etr@6048000 {
                        compatible = "arm,coresight-tmc", "arm,primecell";
                        reg = <0x06048000 0x1000>;
+                       status = "disabled";
 
                        clocks = <&rpmcc RPM_SMD_QDSS_CLK>, <&rpmcc RPM_SMD_QDSS_A_CLK>;
                        clock-names = "apb_pclk", "atclk";
@@ -1183,9 +1190,10 @@ etr_in: endpoint {
                        };
                };
 
-               etm@7840000 {
+               etm1: etm@7840000 {
                        compatible = "arm,coresight-etm4x", "arm,primecell";
                        reg = <0x07840000 0x1000>;
+                       status = "disabled";
 
                        clocks = <&rpmcc RPM_SMD_QDSS_CLK>, <&rpmcc RPM_SMD_QDSS_A_CLK>;
                        clock-names = "apb_pclk", "atclk";
@@ -1202,9 +1210,10 @@ etm0_out: endpoint {
                        };
                };
 
-               etm@7940000 {
+               etm2: etm@7940000 {
                        compatible = "arm,coresight-etm4x", "arm,primecell";
                        reg = <0x07940000 0x1000>;
+                       status = "disabled";
 
                        clocks = <&rpmcc RPM_SMD_QDSS_CLK>, <&rpmcc RPM_SMD_QDSS_A_CLK>;
                        clock-names = "apb_pclk", "atclk";
@@ -1221,9 +1230,10 @@ etm1_out: endpoint {
                        };
                };
 
-               etm@7a40000 {
+               etm3: etm@7a40000 {
                        compatible = "arm,coresight-etm4x", "arm,primecell";
                        reg = <0x07a40000 0x1000>;
+                       status = "disabled";
 
                        clocks = <&rpmcc RPM_SMD_QDSS_CLK>, <&rpmcc RPM_SMD_QDSS_A_CLK>;
                        clock-names = "apb_pclk", "atclk";
@@ -1240,9 +1250,10 @@ etm2_out: endpoint {
                        };
                };
 
-               etm@7b40000 {
+               etm4: etm@7b40000 {
                        compatible = "arm,coresight-etm4x", "arm,primecell";
                        reg = <0x07b40000 0x1000>;
+                       status = "disabled";
 
                        clocks = <&rpmcc RPM_SMD_QDSS_CLK>, <&rpmcc RPM_SMD_QDSS_A_CLK>;
                        clock-names = "apb_pclk", "atclk";
@@ -1259,9 +1270,10 @@ etm3_out: endpoint {
                        };
                };
 
-               funnel@7b60000 { /* APSS Funnel */
+               funnel4: funnel@7b60000 { /* APSS Funnel */
                        compatible = "arm,coresight-etm4x", "arm,primecell";
                        reg = <0x07b60000 0x1000>;
+                       status = "disabled";
 
                        clocks = <&rpmcc RPM_SMD_QDSS_CLK>, <&rpmcc RPM_SMD_QDSS_A_CLK>;
                        clock-names = "apb_pclk", "atclk";
@@ -1345,9 +1357,10 @@ apss_funnel_in7: endpoint {
                        };
                };
 
-               funnel@7b70000 {
+               funnel5: funnel@7b70000 {
                        compatible = "arm,coresight-dynamic-funnel", "arm,primecell";
                        reg = <0x07b70000 0x1000>;
+                       status = "disabled";
 
                        clocks = <&rpmcc RPM_SMD_QDSS_CLK>, <&rpmcc RPM_SMD_QDSS_A_CLK>;
                        clock-names = "apb_pclk", "atclk";
@@ -1371,9 +1384,10 @@ apss_merge_funnel_in: endpoint {
                        };
                };
 
-               etm@7c40000 {
+               etm5: etm@7c40000 {
                        compatible = "arm,coresight-etm4x", "arm,primecell";
                        reg = <0x07c40000 0x1000>;
+                       status = "disabled";
 
                        clocks = <&rpmcc RPM_SMD_QDSS_CLK>, <&rpmcc RPM_SMD_QDSS_A_CLK>;
                        clock-names = "apb_pclk", "atclk";
@@ -1387,9 +1401,10 @@ etm4_out: endpoint {
                        };
                };
 
-               etm@7d40000 {
+               etm6: etm@7d40000 {
                        compatible = "arm,coresight-etm4x", "arm,primecell";
                        reg = <0x07d40000 0x1000>;
+                       status = "disabled";
 
                        clocks = <&rpmcc RPM_SMD_QDSS_CLK>, <&rpmcc RPM_SMD_QDSS_A_CLK>;
                        clock-names = "apb_pclk", "atclk";
@@ -1403,9 +1418,10 @@ etm5_out: endpoint {
                        };
                };
 
-               etm@7e40000 {
+               etm7: etm@7e40000 {
                        compatible = "arm,coresight-etm4x", "arm,primecell";
                        reg = <0x07e40000 0x1000>;
+                       status = "disabled";
 
                        clocks = <&rpmcc RPM_SMD_QDSS_CLK>, <&rpmcc RPM_SMD_QDSS_A_CLK>;
                        clock-names = "apb_pclk", "atclk";
@@ -1419,9 +1435,10 @@ etm6_out: endpoint {
                        };
                };
 
-               etm@7f40000 {
+               etm8: etm@7f40000 {
                        compatible = "arm,coresight-etm4x", "arm,primecell";
                        reg = <0x07f40000 0x1000>;
+                       status = "disabled";
 
                        clocks = <&rpmcc RPM_SMD_QDSS_CLK>, <&rpmcc RPM_SMD_QDSS_A_CLK>;
                        clock-names = "apb_pclk", "atclk";