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

Commit 9735c7bb authored by Kyle Yan's avatar Kyle Yan Committed by Gerrit - the friendly Code Review server
Browse files

Merge "ARM: dts: msm Add support for SLPI PIL on msmskunk" into msm-4.8

parents 067baec6 b693da32

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

+23 −0
Original line number Original line Diff line number Diff line
@@ -262,6 +262,29 @@ 
		#interrupt-cells = <2>;

		#interrupt-cells = <2>;

	};

	};





	/* ssr - inbound entry from ssc */

	smp2pgpio_ssr_smp2p_3_in: qcom,smp2pgpio-ssr-smp2p-3-in {

		compatible = "qcom,smp2pgpio";

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

		qcom,remote-pid = <3>;

		qcom,is-inbound;

		gpio-controller;

		#gpio-cells = <2>;

		interrupt-controller;

		#interrupt-cells = <2>;

	};



	/* ssr - outbound entry to ssc */

	smp2pgpio_ssr_smp2p_3_out: qcom,smp2pgpio-ssr-smp2p-3-out {

		compatible = "qcom,smp2pgpio";

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

		qcom,remote-pid = <3>;

		gpio-controller;

		#gpio-cells = <2>;

		interrupt-controller;

		#interrupt-cells = <2>;

	};



	/* ssr - inbound entry from cdsp */

	/* ssr - inbound entry from cdsp */

	smp2pgpio_ssr_smp2p_5_in: qcom,smp2pgpio-ssr-smp2p-5-in {

	smp2pgpio_ssr_smp2p_5_in: qcom,smp2pgpio-ssr-smp2p-5-in {

		compatible = "qcom,smp2pgpio";

		compatible = "qcom,smp2pgpio";

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

+34 −0
Original line number Original line Diff line number Diff line
@@ -597,6 +597,40 @@ 
		qcom,gpio-force-stop = <&smp2pgpio_ssr_smp2p_2_out 0 0>;

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

	};

	};





	qcom,ssc@5c00000 {

		compatible = "qcom,pil-tz-generic";

		reg = <0x5c00000 0x4000>;

		interrupts = <0 494 1>;



		vdd_cx-supply = <&pmcobalt_l27_level>;

		vdd_px-supply = <&pmcobalt_lvs2>;

		qcom,vdd_cx-uV-uA = <RPMH_REGULATOR_LEVEL_MAX 0>;

		qcom,proxy-reg-names = "vdd_cx", "vdd_px";

		qcom,keep-proxy-regs-on;



		clocks = <&clock_gcc RPMH_CXO_CLK>;

		clock-names = "xo";

		qcom,proxy-clock-names = "xo";



		qcom,pas-id = <12>;

		qcom,proxy-timeout-ms = <10000>;

		qcom,smem-id = <424>;

		qcom,sysmon-id = <3>;

		qcom,ssctl-instance-id = <0x16>;

		qcom,firmware-name = "slpi";

		status = "ok";

		memory-region = <&pil_slpi_mem>;



		/* GPIO inputs from ssc */

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

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

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

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



		/* GPIO output to ssc */

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

	};



	eud: qcom,msm-eud@88e0000 {

	eud: qcom,msm-eud@88e0000 {

		compatible = "qcom,msm-eud";

		compatible = "qcom,msm-eud";

		interrupt-names = "eud_irq";

		interrupt-names = "eud_irq";