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

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

Merge "ARM: dts: msm: Enable smmu for APQ8084"

parents bd25ca81 0ad7c6da

arch/arm/boot/dts/apq8084-ion.dtsi

+0 −8
Original line number Diff line number Diff line
@@ -47,13 +47,5 @@ 
			reg = <27>;

			linux,contiguous-region = <&qsecom_mem>;

		};



		qcom,ion-heap@28 { /* AUDIO HEAP */

			compatible = "qcom,msm-ion-reserve";

			reg = <28>;

			qcom,heap-align = <0x1000>;

			qcom,memory-reservation-type = "EBI1"; /* reserve EBI memory */

			qcom,memory-reservation-size = <0x614000>;

		};

	};

};

arch/arm/boot/dts/apq8084.dtsi

+5 −0
Original line number Diff line number Diff line
@@ -1896,6 +1896,11 @@ 
		qcom,adsp-state = <0>;

	};



	qcom,msm-audio-ion {

		compatible = "qcom,msm-audio-ion";

		qcom,smmu-enabled;

	};



	qcom,msm-pcm {

		compatible = "qcom,msm-pcm-dsp";

		qcom,msm-pcm-dsp-id = <0>;