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

Commit 72af33e7 authored Oct 29, 2013 by Laura Abbott

msm: rtb: Convert away from allocate_contiguous_ebi APIs



The allocate_contiguous_ebi APIs are now deprecated. Move
to using dma_alloc_coherent for the RTB buffer. Because we
aren't using allocate_contiguous_ebi for allocation, change
the devicetree bindings as well to support using CMA or just
a regular size from the generic region.

Change-Id: I8ab0b7336924a78b40c68af3f215d7bfd2fba33c
Signed-off-by: Laura Abbott <lauraa@codeaurora.org>

parent 4bb26321

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

+6 −5

Original line number	Original line	Diff line number	Diff line
	@@ -8,14 +8,15 @@ Documentation/devicetree/bindings/arm/msm/memory-reserve.txt).
	Required properties		Required properties

	- compatible: "qcom,msm-rtb"		- compatible: "qcom,msm-rtb"
	- qcom,memory-reservation-size: size of reserved memory for the RTB buffer		- qcom,rtb-size: size of the RTB buffer in bytes
	- qcom,memory-reservation-type: type of memory to be reserved
	(see memory-reserve.txt for information about memory reservations)		Optional properties:

			- linux,contiguous-region: phandle reference to a CMA region

	Example:		Example:

	qcom,msm-rtb {		qcom,msm-rtb {
	compatible = "qcom,msm-rtb";		compatible = "qcom,msm-rtb";
	qcom,memory-reservation-type = "EBI1";		qcom,rtb-size = <0x100000>;
	qcom,memory-reservation-size = <0x100000>; /* 1M EBI1 buffer */
	};		};

arch/arm/boot/dts/apq8084.dtsi

+1 −2

Original line number	Original line	Diff line number	Diff line
	@@ -257,8 +257,7 @@

	qcom,msm-rtb {		qcom,msm-rtb {
	compatible = "qcom,msm-rtb";		compatible = "qcom,msm-rtb";
	qcom,memory-reservation-type = "EBI1";		qcom,rtb-size = <0x100000>;
	qcom,memory-reservation-size = <0x100000>; /* 1M EBI1 buffer */
	};		};

	qcom,vpu@fde0b000 {		qcom,vpu@fde0b000 {

arch/arm/boot/dts/mpq8092.dtsi

+1 −2

Original line number	Original line	Diff line number	Diff line
	@@ -128,8 +128,7 @@

	qcom,msm-rtb {		qcom,msm-rtb {
	compatible = "qcom,msm-rtb";		compatible = "qcom,msm-rtb";
	qcom,memory-reservation-type = "EBI1";		qcom,rtb-size = <0x100000>;
	qcom,memory-reservation-size = <0x100000>; /* 1M EBI1 buffer */
	};		};

arch/arm/boot/dts/msm8226.dtsi

+1 −2

Original line number	Original line	Diff line number	Diff line
	@@ -1176,8 +1176,7 @@

	qcom,msm-rtb {		qcom,msm-rtb {
	compatible = "qcom,msm-rtb";		compatible = "qcom,msm-rtb";
	qcom,memory-reservation-type = "EBI1";		qcom,rtb-size = <0x100000>; /* 1M EBI1 buffer */
	qcom,memory-reservation-size = <0x100000>; /* 1M EBI1 buffer */
	};		};

	qcom,msm-rng@f9bff000 {		qcom,msm-rng@f9bff000 {

arch/arm/boot/dts/msm8610.dtsi

+1 −2

Original line number	Original line	Diff line number	Diff line
	@@ -900,8 +900,7 @@

	qcom,msm-rtb {		qcom,msm-rtb {
	compatible = "qcom,msm-rtb";		compatible = "qcom,msm-rtb";
	qcom,memory-reservation-type = "EBI1";		qcom,msm-rtb = <0x100000>; /* 1M EBI1 buffer */
	qcom,memory-reservation-size = <0x100000>; /* 1M EBI1 buffer */
	};		};

	jtag_fuse: jtagfuse@fc4be024 {		jtag_fuse: jtagfuse@fc4be024 {