diff --git a/arch/arm64/boot/dts/qcom/glymur.dtsi b/arch/arm64/boot/dts/qcom/glymur.dtsi index 2aa9c71b92d9..939140ef9ea3 100644 --- a/arch/arm64/boot/dts/qcom/glymur.dtsi +++ b/arch/arm64/boot/dts/qcom/glymur.dtsi @@ -6995,7 +6995,7 @@ clock-names = "apb_pclk"; }; - QDSS_DSP: cti@111ab000 { + cti_wpss: cti@111ab000 { compatible = "arm,coresight-cti", "arm,primecell"; reg = <0x0 0x111ab000 0x0 0x1000>; @@ -7021,12 +7021,12 @@ }; }; - tn@11200000 { - compatible = "qcom,coresight-tnoc", "arm,primecell"; - reg = <0x0 0x11200000 0x0 0x4200>; + itnoc@11200000 { + compatible = "qcom,coresight-itnoc"; + reg = <0x0 0x11200000 0x0 0x3c00>; clocks = <&aoss_qmp>; - clock-names = "apb_pclk"; + clock-names = "apb"; in-ports { #address-cells = <1>; diff --git a/arch/arm64/boot/dts/qcom/mahua.dtsi b/arch/arm64/boot/dts/qcom/mahua.dtsi index 582a11b37189..22822b6b2e8b 100644 --- a/arch/arm64/boot/dts/qcom/mahua.dtsi +++ b/arch/arm64/boot/dts/qcom/mahua.dtsi @@ -21,6 +21,7 @@ /delete-node/ &cpu_pd15; /delete-node/ &cpu_pd16; /delete-node/ &cpu_pd17; +/delete-node/ &cti_wpss; /delete-node/ &thermal_aoss_6; /delete-node/ &thermal_aoss_7; /delete-node/ &thermal_cpu_2_0_0; @@ -49,7 +50,6 @@ /delete-node/ &thermal_video_1; /delete-node/ &tsens6; /delete-node/ &tsens7; -/delete-node/ &QDSS_DSP; &aggre1_noc { compatible = "qcom,mahua-aggre1-noc", "qcom,glymur-aggre1-noc";