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

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

Merge "arm64: defconfig: Enable QSEE IPC IRQ bridge for kona"

parents b52a3edb 175b9002

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

+54 −0
Original line number Diff line number Diff line
@@ -1255,6 +1255,43 @@ 
				  "l3-scu-faultirq";

	};



	sp_scsr: mailbox@188501c {

		compatible = "qcom,kona-spcs-global";

		reg = <0x188501c 0x4>;



		#mbox-cells = <1>;

	};



	sp_scsr_block: syscon@1880000 {

		compatible = "syscon";

		reg = <0x1880000 0x10000>;

	};



	intsp: qcom,qsee_irq {

		compatible = "qcom,kona-qsee-irq";



		syscon = <&sp_scsr_block>;

		interrupts = <0 348 IRQ_TYPE_LEVEL_HIGH>,

			     <0 349 IRQ_TYPE_LEVEL_HIGH>;



		interrupt-names = "sp_ipc0",

				  "sp_ipc1";



		interrupt-controller;

		#interrupt-cells = <3>;

	};



	qcom,qsee_irq_bridge {

		compatible = "qcom,qsee-ipc-irq-bridge";



		qcom,qsee-ipc-irq-spss {

			qcom,dev-name = "qsee_ipc_irq_spss";

			label = "spss";

			interrupt-parent = <&intsp>;

			interrupts = <1 0 IRQ_TYPE_LEVEL_HIGH>;

		};

	};



	qcom,glink {

		compatible = "qcom,glink";

		#address-cells = <1>;
@@ -1390,6 +1427,23 @@ 
						    <&glink_npu>;

			};

		};



		glink_spss: spss {

			qcom,remote-pid = <8>;

			transport = "spss";

			mboxes = <&sp_scsr 0>;

			mbox-names = "spss_spss";

			interrupt-parent = <&intsp>;

			interrupts = <0 0 IRQ_TYPE_LEVEL_HIGH>;



			reg = <0x1885008 0x8>,

			      <0x1885010 0x4>;

			reg-names = "qcom,spss-addr",

				    "qcom,spss-size";



			label = "spss";

			qcom,glink-label = "spss";

		};

	};



	qcom,lpass@17300000 {

arch/arm64/configs/vendor/kona-perf_defconfig

+2 −0
Original line number Diff line number Diff line
@@ -383,6 +383,7 @@ CONFIG_MSM_DISPCC_KONA=y 
CONFIG_HWSPINLOCK=y

CONFIG_HWSPINLOCK_QCOM=y

CONFIG_MAILBOX=y

CONFIG_QCOM_APCS_IPC=y

CONFIG_IOMMU_IO_PGTABLE_FAST=y

CONFIG_ARM_SMMU=y

CONFIG_QCOM_LAZY_MAPPING=y
@@ -415,6 +416,7 @@ CONFIG_MSM_PIL=y 
CONFIG_MSM_PIL_SSR_GENERIC=y

CONFIG_MSM_BOOT_STATS=y

CONFIG_QCOM_EUD=y

CONFIG_QSEE_IPC_IRQ_BRIDGE=y

CONFIG_QCOM_GLINK=y

CONFIG_QCOM_GLINK_PKT=y

CONFIG_MSM_CDSP_LOADER=y

arch/arm64/configs/vendor/kona_defconfig

+2 −0
Original line number Diff line number Diff line
@@ -396,6 +396,7 @@ CONFIG_MSM_DISPCC_KONA=y 
CONFIG_HWSPINLOCK=y

CONFIG_HWSPINLOCK_QCOM=y

CONFIG_MAILBOX=y

CONFIG_QCOM_APCS_IPC=y

CONFIG_IOMMU_IO_PGTABLE_FAST=y

CONFIG_ARM_SMMU=y

CONFIG_QCOM_LAZY_MAPPING=y
@@ -429,6 +430,7 @@ CONFIG_MSM_PIL_SSR_GENERIC=y 
CONFIG_MSM_BOOT_STATS=y

CONFIG_QCOM_EUD=y

CONFIG_MSM_CORE_HANG_DETECT=y

CONFIG_QSEE_IPC_IRQ_BRIDGE=y

CONFIG_QCOM_GLINK=y

CONFIG_QCOM_GLINK_PKT=y

CONFIG_MSM_CDSP_LOADER=y