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

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

Merge "ARM: dts: msm: Add tz-log node for scuba"

parents 7c21b630 1b032d33

qcom/scuba-ion.dtsi

+18 −0
Original line number Diff line number Diff line
@@ -19,5 +19,23 @@ 
			memory-region = <&secure_display_memory>;

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

		};



		qcom,ion-heap@26 { /* USER CONTIG HEAP */

			reg = <26>;

			memory-region = <&user_contig_mem>;

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

		};



		qcom,ion-heap@27 { /* QSEECOM HEAP */

			reg = <27>;

			memory-region = <&qseecom_mem>;

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

		};



		qcom,ion-heap@19 { /* QSEECOM HEAP */

			reg = <19>;

			memory-region = <&qseecom_ta_mem>;

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

		};

	};

};

qcom/scuba.dtsi

+75 −0
Original line number Diff line number Diff line
@@ -264,6 +264,30 @@ 
			size = <0 0x5c00000>;

		};



		user_contig_mem: user_contig_region {

			compatible = "shared-dma-pool";

			alloc-ranges = <0x0 0x00000000 0x0 0xffffffff>;

			reusable;

			alignment = <0x0 0x400000>;

			size = <0x0 0x1000000>;

		};



		qseecom_mem: qseecom_region {

			compatible = "shared-dma-pool";

			alloc-ranges = <0x0 0x00000000 0x0 0xffffffff>;

			reusable;

			alignment = <0x0 0x400000>;

			size = <0x0 0x1400000>;

		};



		qseecom_ta_mem: qseecom_ta_region {

			compatible = "shared-dma-pool";

			alloc-ranges = <0x0 0x00000000 0x0 0xffffffff>;

			reusable;

			alignment = <0x0 0x400000>;

			size = <0x0 0x1000000>;

		};



		/* global autoconfigured region for contiguous allocations */

		linux,cma {

			compatible = "shared-dma-pool";
@@ -500,6 +524,57 @@ 
		reg-names = "pshold-base", "tcsr-boot-misc-detect";

	};



	qcom_seecom: qseecom@61700000 {

		compatible = "qcom,qseecom";

		reg = <0x61700000 0x2200000>;

		reg-names = "secapp-region";

		memory-region = <&qseecom_mem>;

		qcom,hlos-num-ce-hw-instances = <1>;

		qcom,hlos-ce-hw-instance = <0>;

		qcom,qsee-ce-hw-instance = <0>;

		qcom,disk-encrypt-pipe-pair = <2>;

		qcom,support-fde;

		qcom,fde-key-size;

		qcom,appsbl-qseecom-support;

		qcom,commonlib64-loaded-by-uefi;

		qcom,msm-bus,name = "qseecom-noc";

		qcom,msm-bus,num-cases = <4>;

		qcom,msm-bus,num-paths = <1>;

		qcom,msm-bus,vectors-KBps =

			<MSM_BUS_MASTER_CRYPTO_CORE0

			MSM_BUS_SLAVE_FIRST 0 0>,

			<MSM_BUS_MASTER_CRYPTO_CORE0

			MSM_BUS_SLAVE_FIRST 200000 400000>,

			<MSM_BUS_MASTER_CRYPTO_CORE0

			MSM_BUS_SLAVE_FIRST 300000 800000>,

			<MSM_BUS_MASTER_CRYPTO_CORE0

			MSM_BUS_SLAVE_FIRST 400000 1000000>;

		clock-names =

			"core_clk_src", "core_clk",

			"iface_clk", "bus_clk";

		clocks =

			<&rpmcc QSEECOM_CE1_CLK>,

			<&rpmcc QSEECOM_CE1_CLK>,

			<&rpmcc QSEECOM_CE1_CLK>,

			<&rpmcc QSEECOM_CE1_CLK>;

		qcom,ce-opp-freq = <192000000>;

		qcom,qsee-reentrancy-support = <2>;

	};



	qcom_smcinvoke: smcinvoke@61700000 {

		compatible = "qcom,smcinvoke";

		reg = <0x61700000 0x2200000>;

		reg-names = "secapp-region";

	};



	qcom_tzlog: tz-log@c125720 {

		compatible = "qcom,tz-log";

		reg = <0xc125720 0x3000>;

		qcom,hyplog-enabled;

		hyplog-address-offset = <0x410>;

		hyplog-size-offset = <0x414>;

	};



	qcom,mpm2-sleep-counter@4403000 {

		compatible = "qcom,mpm2-sleep-counter";

		reg = <0x4403000 0x1000>;