Merge "ARM: dts: msm: add CX vote for each PCIe node on MSM8996" (7d13a246) · Commits · e / devices / android_kernel_xiaomi_markw

Documentation/devicetree/bindings/pil/pil-q6v5-mss.txt

+5 −0

Original line number	Original line	Diff line number	Diff line
	@@ -18,6 +18,7 @@ Required properties:
	"halt_nc" is required.		"halt_nc" is required.
	- interrupts: The modem watchdog interrupt		- interrupts: The modem watchdog interrupt
	- vdd_cx-supply: Reference to the regulator that supplies the vdd_cx domain.		- vdd_cx-supply: Reference to the regulator that supplies the vdd_cx domain.
			- vdd_cx-voltage: Voltage corner/level(max) for cx rail.
	- vdd_mx-supply: Reference to the regulator that supplies the memory rail.		- vdd_mx-supply: Reference to the regulator that supplies the memory rail.
	- vdd_mx-uV: Voltage setting for the mx rail.		- vdd_mx-uV: Voltage setting for the mx rail.
	- qcom,firmware-name: Base name of the firmware image. Ex. "mdsp"		- qcom,firmware-name: Base name of the firmware image. Ex. "mdsp"
	@@ -64,6 +65,9 @@ Optional properties:
	- qcom,qdsp6v56-1-3: Boolean- Present if the qdsp version is v56 1.3		- qcom,qdsp6v56-1-3: Boolean- Present if the qdsp version is v56 1.3
	- qcom,qdsp6v56-1-5: Boolean- Present if the qdsp version is v56 1.5		- qcom,qdsp6v56-1-5: Boolean- Present if the qdsp version is v56 1.5
	- qcom,edge: GLINK logical name of the remote subsystem		- qcom,edge: GLINK logical name of the remote subsystem
			- qcom,pil-force-shutdown: Boolean. If set, the SSR framework will not trigger graceful shutdown
			on behalf of the subsystem driver.
			- qcom,qdsp6v56-1-8: Boolean- Present if the qdsp version is v56 1.8

	Example:		Example:
	qcom,mss@fc880000 {		qcom,mss@fc880000 {
	@@ -77,6 +81,7 @@ Example:
	interrupts = <0 24 1>;		interrupts = <0 24 1>;
	vdd_mss-supply = <&pm8841_s3>;		vdd_mss-supply = <&pm8841_s3>;
	vdd_cx-supply = <&pm8841_s2>;		vdd_cx-supply = <&pm8841_s2>;
			vdd_cx-voltage = <7>;
	vdd_mx-supply = <&pm8841_s1>;		vdd_mx-supply = <&pm8841_s1>;
	vdd_mx-uV = <105000>;		vdd_mx-uV = <105000>;

Documentation/devicetree/bindings/pil/subsys-pil-tz.txt

+7 −0

Original line number	Original line	Diff line number	Diff line
	@@ -54,6 +54,11 @@ Optional properties:
	- qcom,keep-proxy-regs-on: Boolean. Present if during proxy unvoting, PIL needs to leave		- qcom,keep-proxy-regs-on: Boolean. Present if during proxy unvoting, PIL needs to leave
	the regulators enabled after removing the voltage/current votes.		the regulators enabled after removing the voltage/current votes.
	- qcom,edge: GLINK logical name of the remote subsystem		- qcom,edge: GLINK logical name of the remote subsystem
			- qcom,ssctl-instance-id: Instance id used by the subsystem to connect with the SSCTL
			service.
			- qcom,sysmon-id: platform device id that sysmon is probed with for the subsystem.
			- qcom,pil-force-shutdown: Boolean. If set, the SSR framework will not trigger graceful shutdown
			on behalf of the subsystem driver.

	Example:		Example:
	qcom,venus@fdce0000 {		qcom,venus@fdce0000 {
	@@ -117,4 +122,6 @@ Example:

	/* GPIO output to lpass */		/* GPIO output to lpass */
	qcom,gpio-force-stop = <&smp2pgpio_ssr_smp2p_2_out 0 0>;		qcom,gpio-force-stop = <&smp2pgpio_ssr_smp2p_2_out 0 0>;
			qcom,ssctl-instance-id = <14>;
			qcom,sysmon-id = <1>;
	};		};

Documentation/devicetree/bindings/regulator/cpr3-regulator.txt

+18 −0

Original line number	Original line	Diff line number	Diff line
	@@ -56,6 +56,14 @@ Platform independent properties:
	Definition: phandle of the underlying regulator device that is managed		Definition: phandle of the underlying regulator device that is managed
	by this CPR controller.		by this CPR controller.

			- system-supply
			Usage: optional
			Value type: <phandle>
			Definition: phandle of the system-level regulator device which the
			vdd-supply depends upon. Requests for this regulator must
			be made before increasing the vdd-supply voltage and after
			decreasing the vdd-supply voltage.

	- clocks		- clocks
	Usage: required		Usage: required
	Value type: <prop-encoded-array>		Value type: <prop-encoded-array>
	@@ -276,6 +284,16 @@ Platform independent properties:
	The list and tuples must meet the same size requirements as		The list and tuples must meet the same size requirements as
	those specified for qcom,cpr-voltage-ceiling above.		those specified for qcom,cpr-voltage-ceiling above.

			- qcom,system-voltage
			Usage: optional
			Value type: <prop-encoded-array>
			Definition: A list of integer tuples which each define the system-supply
			voltage in microvolts or corners or levels for each voltage
			corner in order from lowest to highest.

			The list and tuples must meet the same size requirements as
			those specified for qcom,cpr-voltage-ceiling above.

	- qcom,corner-frequencies		- qcom,corner-frequencies
	Usage: required		Usage: required
	Value type: <prop-encoded-array>		Value type: <prop-encoded-array>

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

+1 −0

Original line number	Original line	Diff line number	Diff line
	@@ -1134,6 +1134,7 @@

	interrupts = <0 24 1>;		interrupts = <0 24 1>;
	vdd_cx-supply = <&pmd9635_s5_corner>;		vdd_cx-supply = <&pmd9635_s5_corner>;
			vdd_cx-voltage = <7>;
	vdd_mx-supply = <&pmd9635_l9_corner>;		vdd_mx-supply = <&pmd9635_l9_corner>;
	vdd_mx-uV = <7>;		vdd_mx-uV = <7>;
	vdd_pll-supply = <&pmd9635_l7>;		vdd_pll-supply = <&pmd9635_l7>;

arch/arm/boot/dts/qcom/msm8939-common.dtsi

+1 −0

Original line number	Original line	Diff line number	Diff line
	@@ -1220,6 +1220,7 @@

	interrupts = <0 24 1>;		interrupts = <0 24 1>;
	vdd_cx-supply = <&pm8916_s1_corner>;		vdd_cx-supply = <&pm8916_s1_corner>;
			vdd_cx-voltage = <7>;
	vdd_mx-supply = <&pm8916_l3>;		vdd_mx-supply = <&pm8916_l3>;
	vdd_mx-uV = <1050000>;		vdd_mx-uV = <1050000>;
	vdd_pll-supply = <&pm8916_l7>;		vdd_pll-supply = <&pm8916_l7>;