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

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

Merge "Revert "ARM: dts: msm: Increasing shared mem region size for SDM845 and SDM710""

parents 6f8847d2 6d2b08bd

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

+6 −6
Original line number Diff line number Diff line
@@ -320,10 +320,10 @@ 
				};



				iova-mem-region-shared {

					/* Shared region is 150MB long */

					/* Shared region is 100MB long */

					iova-region-name = "shared";

					iova-region-start = <0x7400000>;

					iova-region-len = <0x9600000>;

					iova-region-len = <0x6400000>;

					iova-region-id = <0x1>;

					iova-granularity = <0x15>;

					status = "ok";
@@ -332,7 +332,7 @@ 
				iova-mem-region-secondary-heap {

					/* Secondary heap region is 1MB long */

					iova-region-name = "secheap";

					iova-region-start = <0x10A00000>;

					iova-region-start = <0xd800000>;

					iova-region-len = <0x100000>;

					iova-region-id = <0x4>;

					status = "ok";
@@ -341,8 +341,8 @@ 
				iova-mem-region-io {

					/* IO region is approximately 3 GB */

					iova-region-name = "io";

					iova-region-start = <0x10C00000>;

					iova-region-len = <0xCF300000>;

					iova-region-start = <0xda00000>;

					iova-region-len = <0xd2500000>;

					iova-region-id = <0x3>;

					status = "ok";

				};
@@ -350,7 +350,7 @@ 
				iova-mem-qdss-region {

					/* qdss region is approximately 1MB */

					iova-region-name = "qdss";

					iova-region-start = <0x10B00000>;

					iova-region-start = <0xd900000>;

					iova-region-len = <0x100000>;

					iova-region-id = <0x5>;

					qdss-phy-addr = <0x16790000>;

arch/arm64/boot/dts/qcom/sdm845-camera.dtsi

+6 −6
Original line number Diff line number Diff line
@@ -294,10 +294,10 @@ 
				};



				iova-mem-region-shared {

					/* Shared region is 150MB long */

					/* Shared region is 100MB long */

					iova-region-name = "shared";

					iova-region-start = <0x7400000>;

					iova-region-len = <0x9600000>;

					iova-region-len = <0x6400000>;

					iova-region-id = <0x1>;

					status = "ok";

				};
@@ -305,7 +305,7 @@ 
				iova-mem-region-secondary-heap {

					/* Secondary heap region is 1MB long */

					iova-region-name = "secheap";

					iova-region-start = <0x10A00000>;

					iova-region-start = <0xd800000>;

					iova-region-len = <0x100000>;

					iova-region-id = <0x4>;

					status = "ok";
@@ -314,8 +314,8 @@ 
				iova-mem-region-io {

					/* IO region is approximately 3 GB */

					iova-region-name = "io";

					iova-region-start = <0x10C00000>;

					iova-region-len = <0xCF300000>;

					iova-region-start = <0xda00000>;

					iova-region-len = <0xd2500000>;

					iova-region-id = <0x3>;

					status = "ok";

				};
@@ -323,7 +323,7 @@ 
				iova-mem-qdss-region {

					/* qdss region is approximately 1MB */

					iova-region-name = "qdss";

					iova-region-start = <0x10B00000>;

					iova-region-start = <0xd900000>;

					iova-region-len = <0x100000>;

					iova-region-id = <0x5>;

					qdss-phy-addr = <0x16790000>;

arch/arm64/boot/dts/qcom/sdm845-v2-camera.dtsi

+6 −6
Original line number Diff line number Diff line
@@ -228,10 +228,10 @@ 
				};



				iova-mem-region-shared {

					/* Shared region is 150MB long */

					/* Shared region is 100MB long */

					iova-region-name = "shared";

					iova-region-start = <0x7400000>;

					iova-region-len = <0x9600000>;

					iova-region-len = <0x6400000>;

					iova-region-id = <0x1>;

					iova-granularity = <0x15>;

					status = "ok";
@@ -240,7 +240,7 @@ 
				iova-mem-region-secondary-heap {

					/* Secondary heap region is 1MB long */

					iova-region-name = "secheap";

					iova-region-start = <0x10A00000>;

					iova-region-start = <0xd800000>;

					iova-region-len = <0x100000>;

					iova-region-id = <0x4>;

					status = "ok";
@@ -249,8 +249,8 @@ 
				iova-mem-region-io {

					/* IO region is approximately 3 GB */

					iova-region-name = "io";

					iova-region-start = <0x10C00000>;

					iova-region-len = <0xCF300000>;

					iova-region-start = <0xda00000>;

					iova-region-len = <0xd2500000>;

					iova-region-id = <0x3>;

					status = "ok";

				};
@@ -258,7 +258,7 @@ 
				iova-mem-qdss-region {

					/* qdss region is approximately 1MB */

					iova-region-name = "qdss";

					iova-region-start = <0x10B00000>;

					iova-region-start = <0xd900000>;

					iova-region-len = <0x100000>;

					iova-region-id = <0x5>;

					qdss-phy-addr = <0x16790000>;