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

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

Merge "msm: rtb: Convert away from allocate_contiguous_ebi APIs"

parents 65765e21 72af33e7

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

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



- compatible: "qcom,msm-rtb"

- qcom,memory-reservation-size: size of reserved memory for the RTB buffer

- qcom,memory-reservation-type: type of memory to be reserved

(see memory-reserve.txt for information about memory reservations)

- qcom,rtb-size: size of the RTB buffer in bytes



Optional properties:



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



Example:



	qcom,msm-rtb {

		compatible = "qcom,msm-rtb";

		qcom,memory-reservation-type = "EBI1";

		qcom,memory-reservation-size = <0x100000>; /* 1M EBI1 buffer */

		qcom,rtb-size = <0x100000>;

	};

arch/arm/boot/dts/apq8084.dtsi

+1 −2
Original line number Diff line number Diff line
@@ -257,8 +257,7 @@ 


	qcom,msm-rtb {

		compatible = "qcom,msm-rtb";

		qcom,memory-reservation-type = "EBI1";

		qcom,memory-reservation-size = <0x100000>; /* 1M EBI1 buffer */

		qcom,rtb-size = <0x100000>;

	};



	qcom,vpu@fde0b000 {

arch/arm/boot/dts/mpq8092.dtsi

+1 −2
Original line number Diff line number Diff line
@@ -129,8 +129,7 @@ 


	qcom,msm-rtb {

                compatible = "qcom,msm-rtb";

                qcom,memory-reservation-type = "EBI1";

                qcom,memory-reservation-size = <0x100000>; /* 1M EBI1 buffer */

                qcom,rtb-size = <0x100000>;

        };

arch/arm/boot/dts/msm8226.dtsi

+1 −2
Original line number Diff line number Diff line
@@ -1177,8 +1177,7 @@ 


	qcom,msm-rtb {

		compatible = "qcom,msm-rtb";

		qcom,memory-reservation-type = "EBI1";

		qcom,memory-reservation-size = <0x100000>; /* 1M EBI1 buffer */

		qcom,rtb-size = <0x100000>; /* 1M EBI1 buffer */

	};



	qcom,msm-rng@f9bff000 {

arch/arm/boot/dts/msm8610.dtsi

+1 −2
Original line number Diff line number Diff line
@@ -900,8 +900,7 @@ 


	qcom,msm-rtb {

		compatible = "qcom,msm-rtb";

		qcom,memory-reservation-type = "EBI1";

		qcom,memory-reservation-size = <0x100000>; /* 1M EBI1 buffer */

		qcom,msm-rtb = <0x100000>; /* 1M EBI1 buffer */

	};



	jtag_fuse: jtagfuse@fc4be024 {