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

Commit 17f9099c authored by qctecmdr's avatar qctecmdr Committed by Gerrit - the friendly Code Review server
Browse files

Merge "ARM: dts: msm: updates the shima VM ION same as lahaina"

parents 5a778b5e afc0f64f

qcom/shima-vm-ion.dtsi

deleted100644 → 0
+0 −15
Original line number Diff line number Diff line 
#include <dt-bindings/arm/msm/msm_ion_ids.h>



/ {

	qcom,ion {

		compatible = "qcom,msm-ion";

		#address-cells = <1>;

		#size-cells = <0>;



		tui_heap: qcom,ion-heap-tui { /* TRUSTED UI CARVEOUT HEAP */

			reg = <ION_TUI_CARVEOUT_HEAP_ID>;

			qcom,dynamic-heap;

			qcom,ion-heap-type = "MSM_CARVEOUT";

		};

	};

};

qcom/shima-vm.dtsi

+1 −1
Original line number Diff line number Diff line
@@ -225,4 +225,4 @@ 
			     <GIC_PPI 12 (GIC_CPU_MASK_SIMPLE(8) | IRQ_TYPE_LEVEL_LOW)>;

	};

};

#include "shima-vm-ion.dtsi"
 
#include "lahaina-vm-ion.dtsi"