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

Commit 92bb2c81 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: Use SMR masks for iommus in FastRPC nodes for SDM855"

parents 37c95a8b 2c333eee

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

+18 −36
Original line number Original line Diff line number Diff line
@@ -2040,11 +2040,9 @@ 
		qcom,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 0x1401 0x0>,

			iommus = <&apps_smmu 0x1401 0x40>,

				 <&apps_smmu 0x1421 0x0>,

				 <&apps_smmu 0x1421 0x0>,

				 <&apps_smmu 0x1441 0x0>,

				 <&apps_smmu 0x2001 0x20>,

				 <&apps_smmu 0x2001 0x0>,

				 <&apps_smmu 0x2021 0x0>,

				 <&apps_smmu 0x2041 0x0>;

				 <&apps_smmu 0x2041 0x0>;

			dma-coherent;

			dma-coherent;

		};

		};
@@ -2052,11 +2050,9 @@ 
		qcom,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 0x1402 0x0>,

			iommus = <&apps_smmu 0x1402 0x40>,

				 <&apps_smmu 0x1422 0x0>,

				 <&apps_smmu 0x1422 0x0>,

				 <&apps_smmu 0x1442 0x0>,

				 <&apps_smmu 0x2002 0x20>,

				 <&apps_smmu 0x2002 0x0>,

				 <&apps_smmu 0x2022 0x0>,

				 <&apps_smmu 0x2042 0x0>;

				 <&apps_smmu 0x2042 0x0>;

			dma-coherent;

			dma-coherent;

		};

		};
@@ -2064,11 +2060,9 @@ 
		qcom,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 0x1403 0x0>,

			iommus = <&apps_smmu 0x1403 0x40>,

				 <&apps_smmu 0x1423 0x0>,

				 <&apps_smmu 0x1423 0x0>,

				 <&apps_smmu 0x1443 0x0>,

				 <&apps_smmu 0x2003 0x20>,

				 <&apps_smmu 0x2003 0x0>,

				 <&apps_smmu 0x2023 0x0>,

				 <&apps_smmu 0x2043 0x0>;

				 <&apps_smmu 0x2043 0x0>;

			dma-coherent;

			dma-coherent;

		};

		};
@@ -2076,11 +2070,9 @@ 
		qcom,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 0x1404 0x0>,

			iommus = <&apps_smmu 0x1404 0x40>,

				 <&apps_smmu 0x1424 0x0>,

				 <&apps_smmu 0x1424 0x0>,

				 <&apps_smmu 0x1444 0x0>,

				 <&apps_smmu 0x2004 0x20>,

				 <&apps_smmu 0x2004 0x0>,

				 <&apps_smmu 0x2024 0x0>,

				 <&apps_smmu 0x2044 0x0>;

				 <&apps_smmu 0x2044 0x0>;

			dma-coherent;

			dma-coherent;

		};

		};
@@ -2088,11 +2080,9 @@ 
		qcom,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 0x1405 0x0>,

			iommus = <&apps_smmu 0x1405 0x40>,

				 <&apps_smmu 0x1425 0x0>,

				 <&apps_smmu 0x1425 0x0>,

				 <&apps_smmu 0x1445 0x0>,

				 <&apps_smmu 0x2005 0x20>,

				 <&apps_smmu 0x2005 0x0>,

				 <&apps_smmu 0x2025 0x0>,

				 <&apps_smmu 0x2045 0x0>;

				 <&apps_smmu 0x2045 0x0>;

			dma-coherent;

			dma-coherent;

		};

		};
@@ -2100,11 +2090,9 @@ 
		qcom,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 0x1406 0x0>,

			iommus = <&apps_smmu 0x1406 0x40>,

				 <&apps_smmu 0x1426 0x0>,

				 <&apps_smmu 0x1426 0x0>,

				 <&apps_smmu 0x1446 0x0>,

				 <&apps_smmu 0x2006 0x20>,

				 <&apps_smmu 0x2006 0x0>,

				 <&apps_smmu 0x2026 0x0>,

				 <&apps_smmu 0x2046 0x0>;

				 <&apps_smmu 0x2046 0x0>;

			dma-coherent;

			dma-coherent;

		};

		};
@@ -2112,11 +2100,9 @@ 
		qcom,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";

			iommus = <&apps_smmu 0x1407 0x0>,

			iommus = <&apps_smmu 0x1407 0x40>,

				 <&apps_smmu 0x1427 0x0>,

				 <&apps_smmu 0x1427 0x0>,

				 <&apps_smmu 0x1447 0x0>,

				 <&apps_smmu 0x2007 0x20>,

				 <&apps_smmu 0x2007 0x0>,

				 <&apps_smmu 0x2027 0x0>,

				 <&apps_smmu 0x2047 0x0>;

				 <&apps_smmu 0x2047 0x0>;

			dma-coherent;

			dma-coherent;

		};

		};
@@ -2124,11 +2110,9 @@ 
		qcom,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";

			iommus = <&apps_smmu 0x1408 0x0>,

			iommus = <&apps_smmu 0x1408 0x40>,

				 <&apps_smmu 0x1428 0x0>,

				 <&apps_smmu 0x1428 0x0>,

				 <&apps_smmu 0x1448 0x0>,

				 <&apps_smmu 0x2008 0x20>,

				 <&apps_smmu 0x2008 0x0>,

				 <&apps_smmu 0x2028 0x0>,

				 <&apps_smmu 0x2048 0x0>;

				 <&apps_smmu 0x2048 0x0>;

			dma-coherent;

			dma-coherent;

		};

		};
@@ -2136,11 +2120,9 @@ 
		qcom,msm_fastrpc_compute_cb9 {

		qcom,msm_fastrpc_compute_cb9 {

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

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

			label = "cdsprpc-smd";

			label = "cdsprpc-smd";

			iommus = <&apps_smmu 0x1409 0x0>,

			iommus = <&apps_smmu 0x1409 0x40>,

				 <&apps_smmu 0x1429 0x0>,

				 <&apps_smmu 0x1429 0x0>,

				 <&apps_smmu 0x1449 0x0>,

				 <&apps_smmu 0x2009 0x20>,

				 <&apps_smmu 0x2009 0x0>,

				 <&apps_smmu 0x2029 0x0>,

				 <&apps_smmu 0x2049 0x0>;

				 <&apps_smmu 0x2049 0x0>;

			dma-coherent;

			dma-coherent;

		};

		};