Merge "ARM: dts: msm: add ion heaps for scuba" (fce9d66d) · Commits · e / devices / android_kernel_oneplus_sm7250

qcom/scuba-ion.dtsi

0 → 100644

+17 −0

Original line number	Diff line number	Diff line
		&soc {
		qcom,ion {
		compatible = "qcom,msm-ion";
		#address-cells = <1>;
		#size-cells = <0>;

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

		system_secure_heap: qcom,ion-heap@9 {
		reg = <9>;
		qcom,ion-heap-type = "SYSTEM_SECURE";
		};
		};
		};

qcom/scuba.dtsi

+89 −0

Original line number	Diff line number	Diff line
		@@ -145,6 +145,94 @@
		};
		};

		reserved-memory {
		#address-cells = <2>;
		#size-cells = <2>;
		ranges;

		hyp_region: hyp_region@45a00000 {
		compatible = "removed-dma-pool";
		no-map;
		reg = <0x0 0x45a00000 0x0 0x300000>;
		};

		xbl_aop_mem: xbl_aop_mem@45e00000 {
		compatible = "removed-dma-pool";
		no-map;
		reg = <0x0 0x45e00000 0x0 0x100000>;
		};

		sec_apps_mem: sec_apps_region@45fff000 {
		compatible = "removed-dma-pool";
		no-map;
		reg = <0x0 0x45fff000 0x0 0x1000>;
		};

		smem_region: smem@46000000 {
		compatible = "removed-dma-pool";
		no-map;
		reg = <0x0 0x46000000 0x0 0x200000>;
		};

		pil_modem_mem: modem_region@4ab00000 {
		compatible = "removed-dma-pool";
		no-map;
		reg = <0x0 0x4ab00000 0x0 0x6400000>;
		};

		pil_video_mem: pil_video_region@50f00000 {
		compatible = "removed-dma-pool";
		no-map;
		reg = <0x0 0x50f00000 0x0 0x500000>;
		};

		wlan_msa_mem: wlan_msa_region@51400000 {
		compatible = "removed-dma-pool";
		no-map;
		reg = <0x0 0x51400000 0x0 0x200000>;
		};

		pil_adsp_mem: adsp_regions@51600000 {
		compatible = "removed-dma-pool";
		no-map;
		reg = <0x0 0x51600000 0x0 0x1e00000>;
		};

		pil_ipa_fw_mem: ips_fw_region@53400000 {
		compatible = "removed-dma-pool";
		no-map;
		reg = <0x0 0x53400000 0x0 0x10000>;
		};

		pil_ipa_gsi_mem: ipa_gsi_region@53410000 {
		compatible = "removed-dma-pool";
		no-map;
		reg = <0x0 0x53410000 0x0 0x5000>;
		};

		pil_gpu_mem: gpu_region@53415000 {
		compatible = "removed-dma-pool";
		no-map;
		reg = <0x0 0x53415000 0x0 0x2000>;
		};

		removed_region: removed_region@5f800000 {
		compatible = "removed-dma-pool";
		no-map;
		reg = <0x0 0x5f800000 0x0 0x4100000>;
		};

		/* global autoconfigured region for contiguous allocations */
		linux,cma {
		compatible = "shared-dma-pool";
		alloc-ranges = <0x0 0x00000000 0x0 0xffffffff>;
		reusable;
		alignment = <0x0 0x400000>;
		size = <0x0 0x2000000>;
		linux,cma-default;
		};
		};

		chosen {
		bootargs = "rcupdate.rcu_expedited=1 rcu_nocbs=0-7";
		};
		@@ -593,6 +681,7 @@
		};

		#include "scuba-pinctrl.dtsi"
		#include "scuba-ion.dtsi"
		#include "scuba-stub-regulator.dtsi"
		#include "scuba-gdsc.dtsi"
		#include "scuba-qupv3.dtsi"