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

Commit 75c5e23f 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: align all cma regions to 4MB"

parents 2516bf48 09ef1289

arch/arm/boot/dts/qcom/mdmfermium.dtsi

+1 −0
Original line number Diff line number Diff line
@@ -46,6 +46,7 @@ 
		audio_mem: audio_region@0 {

			compatible = "shared-dma-pool";

			reusable;

			alignment = <0 0x400000>;

			size = <0x400000>;

		};

	};

arch/arm/boot/dts/qcom/msm8952.dtsi

+5 −0
Original line number Diff line number Diff line
@@ -62,24 +62,28 @@ 
			compatible = "shared-dma-pool";

			reusable;

			alloc-ranges = <0x0 0x80000000 0x0 0x10000000>;

			alignment = <0 0x400000>;

			size = <0 0x0800000>;

		};



		secure_mem: secure_region@0 {

			compatible = "shared-dma-pool";

			reusable;

			alignment = <0 0x400000>;

			size = <0 0x7000000>;

		};



		qseecom_mem: qseecom_region@0 {

			compatible = "shared-dma-pool";

			reusable;

			alignment = <0 0x400000>;

			size = <0 0x1000000>;

		};



		audio_mem: audio_region@0 {

			compatible = "shared-dma-pool";

			reusable;

			alignment = <0 0x400000>;

			size = <0 0x400000>;

		};
@@ -90,6 +94,7 @@ 
		adsp_mem: adsp_region@0 {

			compatible = "shared-dma-pool";

			reusable;

			alignment = <0 0x400000>;

			size = <0 0x400000>;

		};

	};

arch/arm/boot/dts/qcom/msmthorium.dtsi

+3 −0
Original line number Diff line number Diff line
@@ -47,18 +47,21 @@ 
			compatible = "shared-dma-pool";

			reusable;

			alloc-ranges = <0x0 0x80000000 0x0 0x10000000>;

			alignment = <0 0x400000>;

			size = <0 0x0800000>;

		};



		secure_mem: secure_region@0 {

			compatible = "shared-dma-pool";

			reusable;

			alignment = <0 0x400000>;

			size = <0 0x7000000>;

		};



		qseecom_mem: qseecom_region@0 {

			compatible = "shared-dma-pool";

			reusable;

			alignment = <0 0x400000>;

			size = <0 0x1000000>;

		};

	};

arch/arm/boot/dts/qcom/msmtitanium.dtsi

+3 −0
Original line number Diff line number Diff line
@@ -48,18 +48,21 @@ 
			compatible = "shared-dma-pool";

			reusable;

			alloc-ranges = <0x0 0x80000000 0x0 0x10000000>;

			alignment = <0 0x400000>;

			size = <0 0x0800000>;

		};



		secure_mem: secure_region@0 {

			compatible = "shared-dma-pool";

			reusable;

			alignment = <0 0x400000>;

			size = <0 0x7000000>;

		};



		qseecom_mem: qseecom_region@0 {

			compatible = "shared-dma-pool";

			reusable;

			alignment = <0 0x400000>;

			size = <0 0x1000000>;

		};

	};