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

Commit 4093a080 authored by qctecmdr Service's avatar qctecmdr Service Committed by Gerrit - the friendly Code Review server
Browse files

Merge "ARM: dts: msm: add qseecom device and qseecom heap into kona"

parents fb42db38 284c9f08

arch/arm64/boot/dts/qcom/kona-ion.dtsi

+12 −0
Original line number Diff line number Diff line
@@ -24,5 +24,17 @@ 
			reg = <9>;

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

		};



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

			reg = <27>;

			memory-region = <&qseecom_mem>;

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

		};



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

			reg = <19>;

			memory-region = <&qseecom_ta_mem>;

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

		};

	};

};

arch/arm64/boot/dts/qcom/kona.dtsi

+41 −0
Original line number Diff line number Diff line
@@ -576,6 +576,22 @@ 
			size = <0 0x2400000>;

		};



		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";
@@ -961,6 +977,31 @@ 
		reg-names = "pshold-base", "tcsr-boot-misc-detect";

	};



	dcc: dcc_v2@1023000 {

		compatible = "qcom,dcc-v2";

		reg = <0x1023000 0x1000>,

		      <0x103a000 0x6000>;

		reg-names = "dcc-base", "dcc-ram-base";



		dcc-ram-offset = <0x1a000>;

	};



	qcom_seecom: qseecom@82200000 {

		compatible = "qcom,qseecom";

		reg = <0x82200000 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,no-clock-support;

		qcom,fde-key-size;

		qcom,commonlib64-loaded-by-uefi;

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

	};



	mdm0: qcom,mdm0 {

		compatible = "qcom,ext-sdx55m";

		cell-index = <0>;

arch/arm64/configs/vendor/kona-perf_defconfig

+1 −0
Original line number Diff line number Diff line
@@ -252,6 +252,7 @@ CONFIG_ZRAM=y 
CONFIG_BLK_DEV_LOOP=y

CONFIG_BLK_DEV_RAM=y

CONFIG_BLK_DEV_RAM_SIZE=8192

CONFIG_QSEECOM=y

CONFIG_SCSI=y

CONFIG_BLK_DEV_SD=y

CONFIG_CHR_DEV_SG=y

arch/arm64/configs/vendor/kona_defconfig

+1 −0
Original line number Diff line number Diff line
@@ -260,6 +260,7 @@ CONFIG_ZRAM=y 
CONFIG_BLK_DEV_LOOP=y

CONFIG_BLK_DEV_RAM=y

CONFIG_BLK_DEV_RAM_SIZE=8192

CONFIG_QSEECOM=y

CONFIG_SCSI=y

CONFIG_BLK_DEV_SD=y

CONFIG_CHR_DEV_SG=y