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

Commit 027610c5 authored by qctecmdr's avatar qctecmdr Committed by Gerrit - the friendly Code Review server
Browse files

Merge "ARM: dts: msm: Add slpi device node for PIL on SM8150"

parents 3ae31955 f3b1e79d

qcom/sa8155-adp-common.dtsi

+4 −0
Original line number Original line Diff line number Diff line
@@ -57,3 +57,7 @@ 
&qupv3_se12_2uart {

&qupv3_se12_2uart {

	status = "ok";

	status = "ok";

};

};



&pil_modem {

	status = "disabled";

};

qcom/sa8155.dtsi

+9 −0
Original line number Original line Diff line number Diff line
@@ -101,6 +101,15 @@ 
	parent-supply = <&VDD_GFX_LEVEL>;

	parent-supply = <&VDD_GFX_LEVEL>;

};

};





&pil_ssc {

	vdd_cx-supply = <&VDD_CX_LEVEL>;

	vdd_mx-supply = <&VDD_MX_LEVEL>;

};



&pil_modem {

	vdd_mss-supply = <&pm8150_1_s8_level>;

};



&ufsphy_mem {

&ufsphy_mem {

	vdda-phy-supply = <&pm8150_2_l18>;

	vdda-phy-supply = <&pm8150_2_l18>;

};
 
};

qcom/sm8150.dtsi

+140 −0
Original line number Original line Diff line number Diff line
@@ -678,6 +678,49 @@ 
		};

		};

	};

	};





	qcom,msm-imem@146bf000 {

		compatible = "qcom,msm-imem";

		reg = <0x146bf000 0x1000>;

		ranges = <0x0 0x146bf000 0x1000>;

		#address-cells = <1>;

		#size-cells = <1>;



		mem_dump_table@10 {

			compatible = "qcom,msm-imem-mem_dump_table";

			reg = <0x10 0x8>;

		};



		restart_reason@65c {

			compatible = "qcom,msm-imem-restart_reason";

			reg = <0x65c 0x4>;

		};



		dload_type@1c {

			compatible = "qcom,msm-imem-dload-type";

			reg = <0x1c 0x4>;

		};



		boot_stats@6b0 {

			compatible = "qcom,msm-imem-boot_stats";

			reg = <0x6b0 0x20>;

		};



		kaslr_offset@6d0 {

			compatible = "qcom,msm-imem-kaslr_offset";

			reg = <0x6d0 0xc>;

		};



		pil@94c {

			compatible = "qcom,msm-imem-pil";

			reg = <0x94c 0xc8>;

		};



		diag_dload@c8 {

			compatible = "qcom,msm-imem-diag-dload";

			reg = <0xc8 0xc8>;

		};

	};



	qcom,msm-rtb {

	qcom,msm-rtb {

		compatible = "qcom,msm-rtb";

		compatible = "qcom,msm-rtb";

		qcom,rtb-size = <0x100000>;

		qcom,rtb-size = <0x100000>;
@@ -1635,6 +1678,103 @@ 
			vote = <44>;

			vote = <44>;

		};

		};

	};

	};



	pil_modem: qcom,mss@4080000 {

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

		reg = <0x4080000 0x100>;



		clocks = <&rpmhcc RPMH_CXO_CLK>;

		clock-names = "xo";

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



		vdd_cx-supply = <&VDD_CX_LEVEL>;

		qcom,vdd_cx-uV-uA = <RPMH_REGULATOR_LEVEL_TURBO 100000>;

		vdd_mss-supply = <&pm8150_s1_level>;

		qcom,vdd_mss-uV-uA = <RPMH_REGULATOR_LEVEL_TURBO 100000>;

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



		qcom,firmware-name = "modem";

		memory-region = <&pil_modem_mem>;

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

		qcom,sysmon-id = <0>;

		qcom,minidump-id = <3>;

		qcom,aux-minidump-ids = <4>;

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

		qcom,pas-id = <4>;

		qcom,smem-id = <421>;

		qcom,signal-aop;

		qcom,complete-ramdump;



		/* Inputs from mss */

		interrupts-extended = <&pdc 0 266 1>,

				<&modem_smp2p_in 0 0>,

				<&modem_smp2p_in 2 0>,

				<&modem_smp2p_in 1 0>,

				<&modem_smp2p_in 3 0>,

				<&modem_smp2p_in 7 0>;



		interrupt-names = "qcom,wdog",

				"qcom,err-fatal",

				"qcom,proxy-unvote",

				"qcom,err-ready",

				"qcom,stop-ack",

				"qcom,shutdown-ack";



		/* Outputs to mss */

		qcom,smem-states = <&modem_smp2p_out 0>;

		qcom,smem-state-names = "qcom,force-stop";



		mboxes = <&qmp_aop 0>;

		mbox-names = "mss-pil";

	};



	pil_ssc: qcom,ssc@5c00000 {

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

		reg = <0x5c00000 0x4000>;



		vdd_cx-supply = <&pm8150_l8_level>;

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

		vdd_mx-supply = <&pm8150_l4_level>;

		qcom,vdd_mx-uV-uA = <RPMH_REGULATOR_LEVEL_TURBO 0>;



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

		qcom,keep-proxy-regs-on;



		clocks = <&rpmhcc 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>;

		qcom,signal-aop;

		qcom,complete-ramdump;



		/* Inputs from ssc */

		interrupts-extended = <&pdc 0 494 1>,

				<&dsps_smp2p_in 0 0>,

				<&dsps_smp2p_in 2 0>,

				<&dsps_smp2p_in 1 0>,

				<&dsps_smp2p_in 3 0>;



		interrupt-names = "qcom,wdog",

				"qcom,err-fatal",

				"qcom,proxy-unvote",

				"qcom,err-ready",

				"qcom,stop-ack";



		/* Outputs to ssc */

		qcom,smem-states = <&dsps_smp2p_out 0>;

		qcom,smem-state-names = "qcom,force-stop";



		mboxes = <&qmp_aop 0>;

		mbox-names = "slpi-pil";

	};

};

};





&firmware {

&firmware {