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

Commit f9a3dd51 authored by qctecmdr's avatar qctecmdr Committed by Gerrit - the friendly Code Review server
Browse files

Merge "ARM: dts: msm: Use a carveout for memshare memory"

parents 715c1289 c3cdcadd

qcom/holi.dtsi

+9 −0
Original line number Diff line number Diff line
@@ -381,6 +381,14 @@ 
			alignment = <0x0 0x400000>;

			size = <0x0 0x1000000>;

		};



		memshare_mem: memshare_region {

			compatible = "shared-dma-pool";

			no-map;

			alloc-ranges = <0x0 0x00000000 0x0 0xffffffff>;

			alignment = <0x0 0x100000>;

			size = <0x0 0x800000>;

		};

	};



	soc: soc { };
@@ -1044,6 +1052,7 @@ 
		qcom,client_3 {

			compatible = "qcom,memshare-peripheral";

			qcom,peripheral-size = <0x500000>;

			memory-region = <&memshare_mem>;

			qcom,client-id = <1>;

			qcom,allocate-on-request;

			label = "modem";

qcom/lahaina.dtsi

+14 −0
Original line number Diff line number Diff line
@@ -523,6 +523,19 @@ 
			label = "dfps_data_region";

		};



		memshare_mem: memshare_region {

			compatible = "shared-dma-pool";

			no-map;

			/*

			 * Memory shared with modem needs to be outside of

			 * the CLADE address space, which begins at

			 * 0xE0000000 and spans 512 MB.

			 */

			alloc-ranges = <0x0 0x00000000 0x0 0xdfffffff>;

			alignment = <0x0 0x100000>;

			size = <0x0 0x800000>;

		};



		non_secure_display_memory: non_secure_display_region {

			compatible = "shared-dma-pool";

			alloc-ranges = <0x0 0x00000000 0x0 0xffffffff>;
@@ -2288,6 +2301,7 @@ 
		qcom,client_3 {

			compatible = "qcom,memshare-peripheral";

			qcom,peripheral-size = <0x500000>;

			memory-region = <&memshare_mem>;

			qcom,client-id = <1>;

			qcom,allocate-on-request;

			label = "modem";

qcom/shima.dtsi

+9 −0
Original line number Diff line number Diff line
@@ -428,6 +428,14 @@ 
			size = <0x0 0x400000>;

		};



		memshare_mem: memshare_region {

			compatible = "shared-dma-pool";

			no-map;

			alloc-ranges = <0x0 0x00000000 0x0 0xffffffff>;

			alignment = <0x0 0x100000>;

			size = <0x0 0x800000>;

		};



		dump_mem: mem_dump_region {

			compatible = "shared-dma-pool";

			alloc-ranges = <0x0 0x00000000 0x0 0xffffffff>;
@@ -775,6 +783,7 @@ 
		qcom,client_3 {

			compatible = "qcom,memshare-peripheral";

			qcom,peripheral-size = <0x500000>;

			memory-region = <&memshare_mem>;

			qcom,client-id = <1>;

			qcom,allocate-on-request;

			label = "modem";