Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a479a11d authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "ARM: dts: msm: disable "dma-coherent" on qcs605-lc variant"

parents ff3788d4 922111f5

arch/arm64/boot/dts/qcom/qcs605-lc.dtsi

+48 −0
Original line number Original line Diff line number Diff line
@@ -411,3 +411,51 @@ 
&apps_smmu {

&apps_smmu {

	/delete-property/ qcom,actlr;

	/delete-property/ qcom,actlr;

};

};



&msm_fastrpc_compute_cb1 {

	/delete-property/ dma-coherent;

};



&msm_fastrpc_compute_cb2 {

	/delete-property/ dma-coherent;

};



&msm_fastrpc_compute_cb3 {

	/delete-property/ dma-coherent;

};



&msm_fastrpc_compute_cb4 {

	/delete-property/ dma-coherent;

};



&msm_fastrpc_compute_cb5 {

	/delete-property/ dma-coherent;

};



&msm_fastrpc_compute_cb6 {

	/delete-property/ dma-coherent;

};



&msm_fastrpc_compute_cb7 {

	/delete-property/ dma-coherent;

};



&msm_fastrpc_compute_cb8 {

	/delete-property/ dma-coherent;

};



&msm_fastrpc_compute_cb9 {

	/delete-property/ dma-coherent;

};



&msm_fastrpc_compute_cb10 {

	/delete-property/ dma-coherent;

};



&msm_fastrpc_compute_cb11 {

	/delete-property/ dma-coherent;

};



&msm_fastrpc_compute_cb12 {

	/delete-property/ dma-coherent;

};

arch/arm64/boot/dts/qcom/sdm670.dtsi

+13 −13
Original line number Original line Diff line number Diff line 
/* Copyright (c) 2017-2018, The Linux Foundation. All rights reserved.

/* Copyright (c) 2017-2019, The Linux Foundation. All rights reserved.

 *

 *

 * This program is free software; you can redistribute it and/or modify

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of the GNU General Public License version 2 and

 * it under the terms of the GNU General Public License version 2 and
@@ -2493,75 +2493,75 @@ 
		qcom,fastrpc-adsp-audio-pdr;

		qcom,fastrpc-adsp-audio-pdr;

		qcom,fastrpc-adsp-sensors-pdr;

		qcom,fastrpc-adsp-sensors-pdr;





		qcom,msm_fastrpc_compute_cb1 {

		msm_fastrpc_compute_cb1: qcom,msm_fastrpc_compute_cb1 {

			compatible = "qcom,msm-fastrpc-compute-cb";

			compatible = "qcom,msm-fastrpc-compute-cb";

			label = "cdsprpc-smd";

			label = "cdsprpc-smd";

			iommus = <&apps_smmu 0x1421 0x30>;

			iommus = <&apps_smmu 0x1421 0x30>;

			dma-coherent;

			dma-coherent;

		};

		};

		qcom,msm_fastrpc_compute_cb2 {

		msm_fastrpc_compute_cb2: qcom,msm_fastrpc_compute_cb2 {

			compatible = "qcom,msm-fastrpc-compute-cb";

			compatible = "qcom,msm-fastrpc-compute-cb";

			label = "cdsprpc-smd";

			label = "cdsprpc-smd";

			iommus = <&apps_smmu 0x1422 0x30>;

			iommus = <&apps_smmu 0x1422 0x30>;

			dma-coherent;

			dma-coherent;

		};

		};

		qcom,msm_fastrpc_compute_cb3 {

		msm_fastrpc_compute_cb3: qcom,msm_fastrpc_compute_cb3 {

			compatible = "qcom,msm-fastrpc-compute-cb";

			compatible = "qcom,msm-fastrpc-compute-cb";

			label = "cdsprpc-smd";

			label = "cdsprpc-smd";

			iommus = <&apps_smmu 0x1423 0x30>;

			iommus = <&apps_smmu 0x1423 0x30>;

			dma-coherent;

			dma-coherent;

		};

		};

		qcom,msm_fastrpc_compute_cb4 {

		msm_fastrpc_compute_cb4: qcom,msm_fastrpc_compute_cb4 {

			compatible = "qcom,msm-fastrpc-compute-cb";

			compatible = "qcom,msm-fastrpc-compute-cb";

			label = "cdsprpc-smd";

			label = "cdsprpc-smd";

			iommus = <&apps_smmu 0x1424 0x30>;

			iommus = <&apps_smmu 0x1424 0x30>;

			dma-coherent;

			dma-coherent;

		};

		};

		qcom,msm_fastrpc_compute_cb5 {

		msm_fastrpc_compute_cb5: qcom,msm_fastrpc_compute_cb5 {

			compatible = "qcom,msm-fastrpc-compute-cb";

			compatible = "qcom,msm-fastrpc-compute-cb";

			label = "cdsprpc-smd";

			label = "cdsprpc-smd";

			iommus = <&apps_smmu 0x1425 0x30>;

			iommus = <&apps_smmu 0x1425 0x30>;

			dma-coherent;

			dma-coherent;

		};

		};

		qcom,msm_fastrpc_compute_cb6 {

		msm_fastrpc_compute_cb6: qcom,msm_fastrpc_compute_cb6 {

			compatible = "qcom,msm-fastrpc-compute-cb";

			compatible = "qcom,msm-fastrpc-compute-cb";

			label = "cdsprpc-smd";

			label = "cdsprpc-smd";

			iommus = <&apps_smmu 0x1426 0x30>;

			iommus = <&apps_smmu 0x1426 0x30>;

			dma-coherent;

			dma-coherent;

		};

		};

		qcom,msm_fastrpc_compute_cb7 {

		msm_fastrpc_compute_cb7: qcom,msm_fastrpc_compute_cb7 {

			compatible = "qcom,msm-fastrpc-compute-cb";

			compatible = "qcom,msm-fastrpc-compute-cb";

			label = "cdsprpc-smd";

			label = "cdsprpc-smd";

			qcom,secure-context-bank;

			qcom,secure-context-bank;

			iommus = <&apps_smmu 0x1429 0x30>;

			iommus = <&apps_smmu 0x1429 0x30>;

			dma-coherent;

			dma-coherent;

		};

		};

		qcom,msm_fastrpc_compute_cb8 {

		msm_fastrpc_compute_cb8: qcom,msm_fastrpc_compute_cb8 {

			compatible = "qcom,msm-fastrpc-compute-cb";

			compatible = "qcom,msm-fastrpc-compute-cb";

			label = "cdsprpc-smd";

			label = "cdsprpc-smd";

			qcom,secure-context-bank;

			qcom,secure-context-bank;

			iommus = <&apps_smmu 0x142A 0x30>;

			iommus = <&apps_smmu 0x142A 0x30>;

			dma-coherent;

			dma-coherent;

		};

		};

		qcom,msm_fastrpc_compute_cb9 {

		msm_fastrpc_compute_cb9: qcom,msm_fastrpc_compute_cb9 {

			compatible = "qcom,msm-fastrpc-compute-cb";

			compatible = "qcom,msm-fastrpc-compute-cb";

			label = "adsprpc-smd";

			label = "adsprpc-smd";

			iommus = <&apps_smmu 0x1803 0x0>;

			iommus = <&apps_smmu 0x1803 0x0>;

			dma-coherent;

			dma-coherent;

		};

		};

		qcom,msm_fastrpc_compute_cb10 {

		msm_fastrpc_compute_cb10: qcom,msm_fastrpc_compute_cb10 {

			compatible = "qcom,msm-fastrpc-compute-cb";

			compatible = "qcom,msm-fastrpc-compute-cb";

			label = "adsprpc-smd";

			label = "adsprpc-smd";

			iommus = <&apps_smmu 0x1804 0x0>;

			iommus = <&apps_smmu 0x1804 0x0>;

			dma-coherent;

			dma-coherent;

		};

		};

		qcom,msm_fastrpc_compute_cb11 {

		msm_fastrpc_compute_cb11: qcom,msm_fastrpc_compute_cb11 {

			compatible = "qcom,msm-fastrpc-compute-cb";

			compatible = "qcom,msm-fastrpc-compute-cb";

			label = "adsprpc-smd";

			label = "adsprpc-smd";

			iommus = <&apps_smmu 0x1805 0x0>;

			iommus = <&apps_smmu 0x1805 0x0>;

			dma-coherent;

			dma-coherent;

		};

		};

		qcom,msm_fastrpc_compute_cb12 {

		msm_fastrpc_compute_cb12: qcom,msm_fastrpc_compute_cb12 {

			compatible = "qcom,msm-fastrpc-compute-cb";

			compatible = "qcom,msm-fastrpc-compute-cb";

			label = "adsprpc-smd";

			label = "adsprpc-smd";

			iommus = <&apps_smmu 0x1806 0x0>;

			iommus = <&apps_smmu 0x1806 0x0>;