Merge "msm: Change devicetree prefix to qti for Ion and memory reserve" (76e6f7ef) · Commits · e / devices / android_kernel_sony_msm8994

Documentation/devicetree/bindings/arm/msm/memory-reserve.txt

+12 −12

Original line number	Diff line number	Diff line
		@@ -7,16 +7,16 @@ must specify the size and type of the memory needed. Any driver wanting to
		allocate contiguous memory should indicate this via device tree bindings:

		Required parameters:
		- qcom,memory-reservation-type: type of memory to be reserved. This is a
		- qti,memory-reservation-type: type of memory to be reserved. This is a
		string defined in arch/arm/mach-msm/memory.c
		- qcom,memory-reservation-size: size of memory to be reserved
		- qti,memory-reservation-size: size of memory to be reserved

		Example:

		qcom,a-driver {
		compatible = "qcom,a-driver";
		qcom,memory-reservation-type = "EBI1" /* reserve EBI memory */
		qcom,memory-reservation-size = <0x400000>; /* size 4MB */
		qti,memory-reservation-type = "EBI1" /* reserve EBI memory */
		qti,memory-reservation-size = <0x400000>; /* size 4MB */
		};

		Under some circumstances, it may be necessary to remove a chunk of memory
		@@ -26,12 +26,12 @@ range is not affected. Any driver needing to remove a block of memory should
		add the appropriate binding:

		Required parameters:
		- qcom,memblock-remove: array of the base and size of blocks to be removed
		- qti,memblock-remove: array of the base and size of blocks to be removed

		qcom,a-driver {
		compatible = "qcom,a-driver";
		/* Remove 4MB at 0x200000 and 2MB at 0x800000*/
		qcom,memblock-remove = <0x200000 0x400000
		qti,memblock-remove = <0x200000 0x400000
		0x800000 0x200000>;
		};

		@@ -48,8 +48,8 @@ example:

		qcom,msm-contig-mem {
		compatible = "qcom,msm-contig-mem";
		qcom,memory-reservation-type = "EBI1";
		qcom,memory-reservation-size = <0x280000>; /* 2.5M EBI1 buffer */
		qti,memory-reservation-type = "EBI1";
		qti,memory-reservation-size = <0x280000>; /* 2.5M EBI1 buffer */
		};


		@@ -59,12 +59,12 @@ that the region has been removed by a separate memblock-remove property
		present in the device tree.

		Required parameters:
		-qcom,memory-fixed: base and size of the fixed memory region
		-qti,memory-fixed: base and size of the fixed memory region

		qcom,a-driver {
		compatible = "qcom,a-driver";
		/* Fixed Memory region of 4MB at 0x200000*/
		qcom,memory-fixed = <0x200000 0x400000>;
		qti,memory-fixed = <0x200000 0x400000>;
		};

		This region is assumed to be a part of a separate hole that has been removed
		@@ -78,12 +78,12 @@ from the buddy allocator at bootup but may be freed back at a later point in
		time with memblock_free and free_bootmem_late.

		Required parameters:
		-qcom,memblock-reserve: base and size of block to be reserved. Drivers should
		-qti,memblock-reserve: base and size of block to be reserved. Drivers should
		call memblock_is_reserved before attempting to use the base address to ensure
		the memory was completely reserved.

		qcom,a-driver {
		compatible = "qcom,a-driver";
		/* reserve a 4MB region @ 0x200000 for use later */
		qcom,memblock-reserve = <0x200000 0x400000>;
		qti,memblock-reserve = <0x200000 0x400000>;
		};

Documentation/devicetree/bindings/arm/msm/msm_ion.txt

+24 −24

Original line number	Diff line number	Diff line
		@@ -8,16 +8,16 @@ bindings (see Documentation/devicetree/bindings/arm/msm/memory-reserve.txt).

		Required properties for Ion

		- compatible: "qcom,msm-ion"
		- compatible: "qti,msm-ion"


		All child nodes of a qcom,msm-ion node are interpreted as Ion heap
		All child nodes of a qti,msm-ion node are interpreted as Ion heap
		configurations.

		Required properties for Ion heaps

		- reg: The ID of the ION heap.
		- qcom,ion-heap-type: The heap type to use for this heap. Should be one of
		- qti,ion-heap-type: The heap type to use for this heap. Should be one of
		the following:
		- "SYSTEM"
		- "SYSTEM_CONTIG"
		@@ -30,40 +30,40 @@ Required properties for Ion heaps

		Optional properties for Ion heaps

		- compatible: "qcom,msm-ion-reserve" This is required if memory is to be reserved
		as specified by qcom,memory-reservation-size below.
		- qcom,heap-align: Alignment of start of the memory in the heap.
		- qcom,heap-adjacent: ID of heap this heap needs to be adjacent to.
		- qcom,memory-reservation-size: size of reserved memory for the ION heap.
		- qcom,memory-reservation-type: type of memory to be reserved
		- compatible: "qti,msm-ion-reserve" This is required if memory is to be reserved
		as specified by qti,memory-reservation-size below.
		- qti,heap-align: Alignment of start of the memory in the heap.
		- qti,heap-adjacent: ID of heap this heap needs to be adjacent to.
		- qti,memory-reservation-size: size of reserved memory for the ION heap.
		- qti,memory-reservation-type: type of memory to be reserved
		(see memory-reserve.txt for information about memory reservations)

		Example:
		qcom,ion {
		compatible = "qcom,msm-ion";
		qti,ion {
		compatible = "qti,msm-ion";
		#address-cells = <1>;
		#size-cells = <0>;

		qcom,ion-heap@25 {
		qti,ion-heap@25 {
		reg = <25>;
		qcom,ion-heap-type = "SYSTEM";
		qti,ion-heap-type = "SYSTEM";
		};

		qcom,ion-heap@8 { /* CP_MM HEAP */
		compatible = "qcom,msm-ion-reserve";
		qti,ion-heap@8 { /* CP_MM HEAP */
		compatible = "qti,msm-ion-reserve";
		reg = <8>;
		qcom,heap-align = <0x1000>;
		qti,heap-align = <0x1000>;
		linux,contiguous-region = <&secure_mem>;
		qcom,ion-heap-type = "SECURE_DMA";
		qti,ion-heap-type = "SECURE_DMA";
		};

		qcom,ion-heap@29 { /* FIRMWARE HEAP */
		compatible = "qcom,msm-ion-reserve";
		qti,ion-heap@29 { /* FIRMWARE HEAP */
		compatible = "qti,msm-ion-reserve";
		reg = <29>;
		qcom,heap-align = <0x20000>;
		qcom,heap-adjacent = <8>;
		qcom,memory-reservation-type = "EBI1"; /* reserve EBI memory */
		qcom,memory-reservation-size = <0xA00000>;
		qcom,ion-heap-type = "CARVEOUT";
		qti,heap-align = <0x20000>;
		qti,heap-adjacent = <8>;
		qti,memory-reservation-type = "EBI1"; /* reserve EBI memory */
		qti,memory-reservation-size = <0xA00000>;
		qti,ion-heap-type = "CARVEOUT";
		};
		};

Documentation/devicetree/bindings/arm/msm/msm_memory_hole.txt

+1 −1

Original line number	Diff line number	Diff line
		@@ -15,6 +15,6 @@ Required properties

		qcom,msm-mem-hole {
		compatible = "qcom,msm-mem-hole";
		qcom,memblock-remove = <0x8100000 0x7e00000>; /* Address and Size of Hole */
		qti,memblock-remove = <0x8100000 0x7e00000>; /* Address and Size of Hole */
		};

Documentation/devicetree/bindings/cache/msm_cache_dump.txt

+4 −4

Original line number	Diff line number	Diff line
		@@ -6,15 +6,15 @@ Required properties:
		- compatible: Should be "qcom,cache_dump"
		- qcom,l1-dump-size: Amount of memory needed for L1 dump(s), in bytes
		- qcom,l2-dump-size: Amount of memory needed for L2 dump, in bytes
		- qcom,memory-reservation-size: Combined reserved memory for the dump buffers
		- qcom,memory-reservation-type: Type of memory to be reserved
		- qti,memory-reservation-size: Combined reserved memory for the dump buffers
		- qti,memory-reservation-type: Type of memory to be reserved

		Example:
		qcom,cache_dump {
		compatible = "qcom,cache_dump";
		qcom,l1-dump-size = <0x100000>;
		qcom,l2-dump-size = <0x400000>;
		qcom,memory-reservation-type = "EBI1";
		qcom,memory-reservation-size = <0x500000>;
		qti,memory-reservation-type = "EBI1";
		qti,memory-reservation-size = <0x500000>;
		};

Documentation/devicetree/bindings/fb/mdss-dsi-panel.txt

+1 −1

Original line number	Diff line number	Diff line
		@@ -65,7 +65,7 @@ Optional properties:
		- qcom,cont-splash-enabled: Boolean used to enable continuous splash mode.
		If this property is specified, it is required to
		to specify the memory reserved for the splash
		screen using the qcom,memblock-reserve binding
		screen using the qti,memblock-reserve binding
		for the framebuffer device attached to the panel.
		- qcom,mdss-dsi-panel-broadcast-mode: Boolean used to enable broadcast mode.
		- qcom,mdss-dsi-fbc-enable: Boolean used to enable frame buffer compression mode.