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

Commit cf5054c6 authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "ARM: dts: msm: Add SMP2P inbound & outbound entries for MSS & LPASS"

parents 2480b34e 6ecf6697

arch/arm/boot/dts/qcom/msm8994-smp2p.dtsi

+48 −0
Original line number Diff line number Diff line
@@ -118,4 +118,52 @@ 
		compatible = "qcom,smp2pgpio_test_smp2p_2_out";

		gpios = <&smp2pgpio_smp2p_2_out 0 0>;

	};



	/* ssr - inbound entry from lpass. */

	smp2pgpio_ssr_smp2p_2_in: qcom,smp2pgpio-ssr-smp2p-2-in {

		compatible = "qcom,smp2pgpio";

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

		qcom,remote-pid = <2>;

		qcom,is-inbound;

		gpio-controller;

		#gpio-cells = <2>;

		interrupt-controller;

		#interrupt-cells = <2>;

	};



	/* ssr - outbound entry to lpass */

	smp2pgpio_ssr_smp2p_2_out: qcom,smp2pgpio-ssr-smp2p-2-out {

		compatible = "qcom,smp2pgpio";

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

		qcom,remote-pid = <2>;

		gpio-controller;

		#gpio-cells = <2>;

		interrupt-controller;

		#interrupt-cells = <2>;

	};



	/* ssr - inbound entry from mss. */

	smp2pgpio_ssr_smp2p_1_in: qcom,smp2pgpio-ssr-smp2p-1-in {

		compatible = "qcom,smp2pgpio";

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

		qcom,remote-pid = <1>;

		qcom,is-inbound;

		gpio-controller;

		#gpio-cells = <2>;

		interrupt-controller;

		#interrupt-cells = <2>;

	};



	/* ssr - outbound entry to mss. */

	smp2pgpio_ssr_smp2p_1_out: qcom,smp2pgpio-ssr-smp2p-1-out {

		compatible = "qcom,smp2pgpio";

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

		qcom,remote-pid = <1>;

		gpio-controller;

		#gpio-cells = <2>;

		interrupt-controller;

		#interrupt-cells = <2>;

	};





};

arch/arm/boot/dts/qcom/msm8994.dtsi

+20 −0
Original line number Diff line number Diff line
@@ -1217,6 +1217,16 @@ 
		qcom,firmware-name = "modem";

		qcom,pil-self-auth;

		qcom,mba-image-is-not-elf;



		/* GPIO inputs from mss */

		qcom,gpio-err-fatal = <&smp2pgpio_ssr_smp2p_1_in 0 0>;

		qcom,gpio-err-ready = <&smp2pgpio_ssr_smp2p_1_in 1 0>;

		qcom,gpio-proxy-unvote = <&smp2pgpio_ssr_smp2p_1_in 2 0>;

		qcom,gpio-stop-ack = <&smp2pgpio_ssr_smp2p_1_in 3 0>;



		/* GPIO output to mss */

		qcom,gpio-force-stop = <&smp2pgpio_ssr_smp2p_1_out 0 0>;



		linux,contiguous-region = <&modem_mem>;

	};
@@ -1241,6 +1251,16 @@ 
		qcom,proxy-timeout-ms = <10000>;

		qcom,smem-id = <423>;

		qcom,firmware-name = "adsp";



		/* GPIO inputs from lpass */

		qcom,gpio-err-fatal = <&smp2pgpio_ssr_smp2p_2_in 0 0>;

		qcom,gpio-proxy-unvote = <&smp2pgpio_ssr_smp2p_2_in 2 0>;

		qcom,gpio-err-ready = <&smp2pgpio_ssr_smp2p_2_in 1 0>;

		qcom,gpio-stop-ack = <&smp2pgpio_ssr_smp2p_2_in 3 0>;



		/* GPIO output to lpass */

		qcom,gpio-force-stop = <&smp2pgpio_ssr_smp2p_2_out 0 0>;



		linux,contiguous-region = <&peripheral_mem>;

	};