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

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

Merge "cma: Change to reserve-contiguous-region"

parents 96906b9d 84361a5f

Documentation/devicetree/bindings/memory.txt

+4 −4
Original line number Diff line number Diff line
@@ -34,7 +34,7 @@ wit the following convention: 


(name): region@(base-address) {

	reg = <(baseaddr) (size)>;

	(linux,contiguous-region);

	(linux,reserve-contiguous-region);

	(linux,default-contiguous-region);

	(linux,reserve-region);

	(linux,memory-limit);
@@ -44,7 +44,7 @@ wit the following convention: 
name:		an name given to the defined region.

base-address:	the base address of the defined region.

size:		the size of the memory region.

linux,contiguous-region: property indicating that the defined memory

linux,reserve-contiguous-region: property indicating that the defined memory

		region is used for contiguous memory allocations,

		Linux specific (optional)

linux,default-contiguous-region: property indicating that the region
@@ -98,13 +98,13 @@ logo appears. 
			0x70000000 0x10000000>;



		contig_mem: region@72000000 {

			linux,contiguous-region;

			linux,reserve-contiguous-region;

			linux,default-contiguous-region;

			reg = <0x72000000 0x4000000>;

		};



		display_mem: region@78000000 {

			linux,contiguous-region;

			linux,reserve-contiguous-region;

			reg = <0x78000000 0x1000000>;

		};

	};

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

+3 −3
Original line number Diff line number Diff line
@@ -31,20 +31,20 @@ 
		#size-cells = <2>;



		qsecom_mem: qsecom_region@0 {

			linux,contiguous-region;

			linux,reserve-contiguous-region;

			reg = <0 0 0 0x1100000>;

			label = "qseecom_mem";

                };



		fb_mem: fb_region@0 {

			linux,contiguous-region;

			linux,reserve-contiguous-region;

			reg = <0 0 0 0x1000000>;

			label = "fb_mem";

			linux,memory-limit = <0xffffffff>;

		};



		secure_mem: secure_region@0 {

			linux,contiguous-region;

			linux,reserve-contiguous-region;

			reg = <0 0 0 0xfc00000>;

			label = "secure_mem";

		};

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

+1 −1
Original line number Diff line number Diff line
@@ -26,7 +26,7 @@ 


	memory {

		audio_mem: audio_region@0 {

			linux,contiguous-region;

			linux,reserve-contiguous-region;

			linux,reserve-region;

			reg = <0 0xAF000>;

			label = "audio_mem";

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

+3 −3
Original line number Diff line number Diff line
@@ -31,20 +31,20 @@ 


	memory {

		audio_mem: audio_region@0 {

			linux,contiguous-region;

			linux,reserve-contiguous-region;

			linux,reserve-region;

			reg = <0 0x614000>;

			label = "audio_mem";

		};



		qseecom_mem: qseecom_region@0 {

			linux,contiguous-region;

			linux,reserve-contiguous-region;

			reg = <0 0x1100000>;

			label = "qseecom_mem";

                };



		secure_mem: secure_region@0 {

			linux,contiguous-region;

			linux,reserve-contiguous-region;

			reg = <0 0xfc00000>;

			label = "secure_mem";

		};

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

+5 −5
Original line number Diff line number Diff line
@@ -26,31 +26,31 @@ 


	memory {

		secure_mem: secure_region@0 {

			linux,contiguous-region;

			linux,reserve-contiguous-region;

			reg = <0 0x6D00000>;

			label = "secure_mem";

		};



		adsp_mem: adsp_region@0 {

			linux,contiguous-region;

			linux,reserve-contiguous-region;

			reg = <0 0x2a00000>;

			label = "adsp_mem";

		};



		qsecom_mem: qsecom_region@0 {

			linux,contiguous-region;

			linux,reserve-contiguous-region;

			reg = <0 0xd00000>;

			label = "qsecom_mem";

		};



		fb_mem: fb_region@0 {

			linux,contiguous-region;

			linux,reserve-contiguous-region;

			reg = <0 0x800000>;

			label = "fb_mem";

		};



		audio_mem: audio_region@0 {

			linux,contiguous-region;

			linux,reserve-contiguous-region;

			linux,reserve-region;

			reg = <0 0x314000>;

			label = "audio_mem";