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

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

Merge "ARM: dts: msm: Add hwspinlock, smem and smp2p for Kona"

parents 4de05dc7 86f6bde7

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

0 → 100644
+78 −0
Original line number Diff line number Diff line 
// SPDX-License-Identifier: GPL-2.0

/*

 * Copyright (c) 2018, The Linux Foundation. All rights reserved.

 */



#include <dt-bindings/interrupt-controller/arm-gic.h>

#include <dt-bindings/soc/qcom,ipcc.h>



&soc {



	qcom,smp2p-adsp {

		compatible = "qcom,smp2p";

		qcom,smem = <443>, <429>;

		interrupt-parent = <&ipcc_mproc>;

		interrupts = <IPCC_CLIENT_LPASS IPCC_MPROC_SIGNAL_SMP2P

			      IRQ_TYPE_EDGE_RISING>;

		mboxes = <&ipcc_mproc IPCC_CLIENT_LPASS

			  IPCC_MPROC_SIGNAL_SMP2P>;

		qcom,local-pid = <0>;

		qcom,remote-pid = <2>;



		adsp_smp2p_out: master-kernel {

			qcom,entry-name = "master-kernel";

			#qcom,smem-state-cells = <1>;

		};



		adsp_smp2p_in: slave-kernel {

			qcom,entry-name = "slave-kernel";

			interrupt-controller;

			#interrupt-cells = <2>;

		};

	};



	qcom,smp2p-dsps {

		compatible = "qcom,smp2p";

		qcom,smem = <481>, <430>;

		interrupt-parent = <&ipcc_mproc>;

		interrupts = <IPCC_CLIENT_SLPI IPCC_MPROC_SIGNAL_SMP2P

			      IRQ_TYPE_EDGE_RISING>;

		mboxes = <&ipcc_mproc IPCC_CLIENT_SLPI IPCC_MPROC_SIGNAL_SMP2P>;

		qcom,local-pid = <0>;

		qcom,remote-pid = <3>;



		dsps_smp2p_out: master-kernel {

			qcom,entry-name = "master-kernel";

			#qcom,smem-state-cells = <1>;

		};



		dsps_smp2p_in: slave-kernel {

			qcom,entry-name = "slave-kernel";

			interrupt-controller;

			#interrupt-cells = <2>;

		};

	};



	qcom,smp2p-cdsp {

		compatible = "qcom,smp2p";

		qcom,smem = <94>, <432>;

		interrupt-parent = <&ipcc_mproc>;

		interrupts = <IPCC_CLIENT_CDSP IPCC_MPROC_SIGNAL_SMP2P

			      IRQ_TYPE_EDGE_RISING>;

		mboxes = <&ipcc_mproc IPCC_CLIENT_CDSP IPCC_MPROC_SIGNAL_SMP2P>;

		qcom,local-pid = <0>;

		qcom,remote-pid = <5>;



		cdsp_smp2p_out: master-kernel {

			qcom,entry-name = "master-kernel";

			#qcom,smem-state-cells = <1>;

		};



		cdsp_smp2p_in: slave-kernel {

			qcom,entry-name = "slave-kernel";

			interrupt-controller;

			#interrupt-cells = <2>;

		};

	};

};

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

+18 −0
Original line number Diff line number Diff line
@@ -745,8 +745,26 @@ qcom,msm-imem@146bf000 { 
				  <CONTROL_TCS 0>;

		status = "disabled";

	};



	tcsr_mutex_block: syscon@1f40000 {

		compatible = "syscon";

		reg = <0x1f40000 0x20000>;

	};



	tcsr_mutex: hwlock {

		compatible = "qcom,tcsr-mutex";

		syscon = <&tcsr_mutex_block 0 0x1000>;

		#hwlock-cells = <1>;

	};



	smem: qcom,smem {

		compatible = "qcom,smem";

		memory-region = <&smem_mem>;

		hwlocks = <&tcsr_mutex 3>;

	};

};



#include "kona-ion.dtsi"

#include "msm-arm-smmu-kona.dtsi"

#include "kona-pinctrl.dtsi"

#include "kona-smp2p.dtsi"