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

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

Merge changes I61ff7292,I5088b3eb,I01c8dc7d,I05fa1ed2 into msm-next 

* changes:
  ARM: dts: msm: Update regulator on modem and lpass for sdm855
  ARM: dts: msm: Add support for CDSP PIL on sdm855
  ARM: dts: msm: Add support for SPSS PIL on sdm855
  ARM: dts: msm Add support for SLPI PIL on sdm855
parents fc0c9ea3 e0656e36

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

+106 −2
Original line number Original line Diff line number Diff line
@@ -20,6 +20,7 @@ 
#include <dt-bindings/clock/qcom,npucc-sdm855.h>

#include <dt-bindings/clock/qcom,npucc-sdm855.h>

#include <dt-bindings/clock/qcom,rpmh.h>

#include <dt-bindings/clock/qcom,rpmh.h>

#include <dt-bindings/clock/qcom,aop-qmp.h>

#include <dt-bindings/clock/qcom,aop-qmp.h>

#include <dt-bindings/regulator/qcom,rpmh-regulator.h>

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

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

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

#include <dt-bindings/soc/qcom,tcs-mbox.h>
@@ -581,7 +582,7 @@ 
		clock-names = "xo";

		clock-names = "xo";

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

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





		vdd_cx-supply = <&pm855_s1_level>;

		vdd_cx-supply = <&pm855l_s6_level>;

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

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





		qcom,firmware-name = "modem";

		qcom,firmware-name = "modem";
@@ -616,7 +617,7 @@ 
		compatible = "qcom,pil-tz-generic";

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

		reg = <0x17300000 0x00100>;

		reg = <0x17300000 0x00100>;





		vdd_cx-supply = <&pm855l_s4_level>;

		vdd_cx-supply = <&pm855l_s6_level>;

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

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





		clocks = <&clock_rpmh RPMH_CXO_CLK>;

		clocks = <&clock_rpmh RPMH_CXO_CLK>;
@@ -649,6 +650,109 @@ 
		qcom,smem-state-names = "qcom,force-stop";

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

	};

	};





	qcom,ssc@5c00000 {

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

		reg = <0x5c00000 0x4000>;



		vdd_cx-supply = <&pm855_l4_level>;

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

		qcom,keep-proxy-regs-on;



		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>;



		/* Inputs from ssc */

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

				<&dsps_smp2p_in 2 0>,

				<&dsps_smp2p_in 1 0>,

				<&dsps_smp2p_in 3 0>,

				<&dsps_smp2p_in 0 0>;



		interrupt-names = "qcom,wdog",

				"qcom,err-fatal",

				"qcom,proxy-unvote",

				"qcom,err-ready",

				"qcom,stop-ack";



		/* Outputs from ssc */

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

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

	};



	qcom,spss@1880000 {

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

		reg = <0x188101c 0x4>,

		      <0x1881024 0x4>,

		      <0x1881028 0x4>,

		      <0x188103c 0x4>,

		      <0x1882014 0x4>;

		reg-names = "sp2soc_irq_status", "sp2soc_irq_clr",

			    "sp2soc_irq_mask", "rmb_err", "rmb_err_spare2";

		interrupts = <0 352 1>;



		vdd_cx-supply = <&pm855l_s6_level>;

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

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

		vdd_mx-supply = <&pm855l_s4_level>;

		vdd_mx-uV = <RPMH_REGULATOR_LEVEL_TURBO 100000>;



		clocks = <&clock_rpmh RPMH_CXO_CLK>;

		clock-names = "xo";

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

		qcom,pil-generic-irq-handler;

		status = "ok";



		qcom,pas-id = <14>;

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

		qcom,firmware-name = "spss";

		memory-region = <&pil_spss_mem>;

		qcom,spss-scsr-bits = <24 25>;

	};



	qcom,turing@8300000 {

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

		reg = <0x8300000 0x100000>;



		vdd_cx-supply = <&pm855l_s6_level>;

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

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



		clocks = <&clock_rpmh RPMH_CXO_CLK>;

		clock-names = "xo";

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



		qcom,pas-id = <18>;

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

		qcom,smem-id = <601>;

		qcom,sysmon-id = <7>;

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

		qcom,firmware-name = "cdsp";

		memory-region = <&pil_cdsp_mem>;



		/* Inputs from turing */

		interrupts-extended = <&intc 0 578 1>,

				<&cdsp_smp2p_in 2 0>,

				<&cdsp_smp2p_in 1 0>,

				<&cdsp_smp2p_in 3 0>,

				<&cdsp_smp2p_in 0 0>;



		interrupt-names = "qcom,wdog",

				"qcom,err-fatal",

				"qcom,proxy-unvote",

				"qcom,err-ready",

				"qcom,stop-ack";



		/* Outputs from turing */

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

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

	};



	kryo-erp {

	kryo-erp {

		compatible = "arm,arm64-kryo-cpu-erp";

		compatible = "arm,arm64-kryo-cpu-erp";

		interrupts = <1 6 4>,

		interrupts = <1 6 4>,