Merge "ARM: dts: msm: reenable CPUSS LDO mode on msm8996v2" (13e83d1a) · Commits · e / devices / android_kernel_xiaomi_markw

Documentation/devicetree/bindings/arm/msm/lpm-levels.txt

+7 −4

Original line number	Original line	Diff line number	Diff line
	@@ -87,6 +87,9 @@ Required properties:
	is defined at the lpm-levels root node.		is defined at the lpm-levels root node.
	- qcom,psci-mode: ID to be passed into the PSCI firmware. Required		- qcom,psci-mode: ID to be passed into the PSCI firmware. Required
	only if qcom,use-psci is defined at the lpm-levels root node.		only if qcom,use-psci is defined at the lpm-levels root node.
			- qcom,is-reset: This boolean property will tell whether
			cluster level need power management notifications to be sent out
			or not for the drivers to prepare for cluster collapse.

	[Node bindings for qcom,pm-cpu]		[Node bindings for qcom,pm-cpu]
	qcom,pm-cpu contains the low power modes that a cpu could enter. Currently it		qcom,pm-cpu contains the low power modes that a cpu could enter. Currently it
	@@ -114,17 +117,17 @@ qcom,pm-cpu-levels.
	power collapse and the cpu relies on Broadcast timer for scheduled		power collapse and the cpu relies on Broadcast timer for scheduled
	wakeups. Required only for states where the CPUs internal timer state		wakeups. Required only for states where the CPUs internal timer state
	is lost.		is lost.
	- qcom,cpu-is-reset: This boolean property map to "power state" bit in
	PSCI state_id configuration. This property will tell whether CPU get
	reset for a particular LPM are not.

	Optional properties:		Optional properties:
	- qcom,psci-mode-shift: Same as cluster level fields.		- qcom,psci-mode-shift: Same as cluster level fields.
	- qcom,psci-mode-mask: Same as cluster level fields.		- qcom,psci-mode-mask: Same as cluster level fields.
	- qcom,psci-cpu-mode: ID to be passed into PSCI firmware.		- qcom,psci-cpu-mode: ID to be passed into PSCI firmware.
	- qcom,cpu-is-reset: Whether CPU get reset are not.
	- qcom,jtag-save-restore: A boolean specifying jtag registers save and restore		- qcom,jtag-save-restore: A boolean specifying jtag registers save and restore
	required are not.		required are not.
			- qcom,is-reset: This boolean property maps to "power state" bit in PSCI
			state_id configuration. This property will tell whether CPU get reset for
			a particular LPM or not. This property will also be used to notify the
			drivers in case of cpu reset.

	[Example dts]		[Example dts]

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

+22 −0

Original line number	Original line	Diff line number	Diff line
	@@ -41,6 +41,12 @@ First Level Nodes
	Definition: The value for retention voltage in microvolts. Must be		Definition: The value for retention voltage in microvolts. Must be
	between 520000 and 865000 uV.		between 520000 and 865000 uV.

			- qcom,ldo-headroom-voltage
			Usage: required
			Value type: <u32>
			Definition: Voltage in microvolts required between the VDD_APCC voltage supply
			and the LDO output in order for the LDO to be operational.

	- qcom,vref-functional-step-voltage		- qcom,vref-functional-step-voltage
	Usage: required		Usage: required
	Value type: <u32>		Value type: <u32>
	@@ -63,6 +69,16 @@ First Level Nodes
	Value type: <u32>		Value type: <u32>
	Definition: The minimum configurable retention LDO voltage in microvolts.		Definition: The minimum configurable retention LDO voltage in microvolts.

			- qcom,ldo-config-init
			Usage: required
			Value type: <u32>
			Definition: Initialization value used to configure the Kryo LDO hardware.

			- qcom,apm-config-init
			Usage: required
			Value type: <u32>
			Definition: Initialization value used to configure the Kryo APM hardware.

	- qcom,cluster-num		- qcom,cluster-num
	Usage: required		Usage: required
	Value type: <u32>		Value type: <u32>
	@@ -94,10 +110,13 @@ Example
	regulator-max-microvolt = <865000>;		regulator-max-microvolt = <865000>;
	qcom,ldo-default-voltage = <750000>;		qcom,ldo-default-voltage = <750000>;
	qcom,retention-voltage = <520000>;		qcom,retention-voltage = <520000>;
			qcom,ldo-headroom-voltage = <150000>;
	qcom,vref-functional-step-voltage = <4100>;		qcom,vref-functional-step-voltage = <4100>;
	qcom,vref-functional-min-voltage = <299000>;		qcom,vref-functional-min-voltage = <299000>;
	qcom,vref-retention-step-voltage = <4554>;		qcom,vref-retention-step-voltage = <4554>;
	qcom,vref-retention-min-voltage = <332000>;		qcom,vref-retention-min-voltage = <332000>;
			qcom,ldo-config-init = <0xf1f0e471>;
			qcom,apm-config-init = <0x0>;
	qcom,cluster-num = <0>;		qcom,cluster-num = <0>;
	kryo0_retention_vreg: regulator {		kryo0_retention_vreg: regulator {
	regulator-name = "kryo0-retention";		regulator-name = "kryo0-retention";
	@@ -116,10 +135,13 @@ Example
	regulator-max-microvolt = <865000>;		regulator-max-microvolt = <865000>;
	qcom,ldo-default-voltage = <750000>;		qcom,ldo-default-voltage = <750000>;
	qcom,retention-voltage = <520000>;		qcom,retention-voltage = <520000>;
			qcom,ldo-headroom-voltage = <150000>;
	qcom,vref-functional-step-voltage = <4063>;		qcom,vref-functional-step-voltage = <4063>;
	qcom,vref-functional-min-voltage = <296000>;		qcom,vref-functional-min-voltage = <296000>;
	qcom,vref-retention-step-voltage = <4554>;		qcom,vref-retention-step-voltage = <4554>;
	qcom,vref-retention-min-voltage = <332000>;		qcom,vref-retention-min-voltage = <332000>;
			qcom,ldo-config-init = <0xf1f0e471>;
			qcom,apm-config-init = <0x0>;
	qcom,cluster-num = <1>;		qcom,cluster-num = <1>;
	kryo1_retention_vreg: regulator {		kryo1_retention_vreg: regulator {
	regulator-name = "kryo1-retention";		regulator-name = "kryo1-retention";

arch/arm/boot/dts/qcom/msm8996-pm.dtsi

+3 −0

Original line number	Original line	Diff line number	Diff line
	@@ -61,6 +61,7 @@
	qcom,time-overhead = <3200>;		qcom,time-overhead = <3200>;
	qcom,min-child-idx = <2>;		qcom,min-child-idx = <2>;
	qcom,notify-rpm;		qcom,notify-rpm;
			qcom,is-reset;
	};		};

	qcom,pm-cluster@0{		qcom,pm-cluster@0{
	@@ -104,6 +105,7 @@
	qcom,energy-overhead = <65000>;		qcom,energy-overhead = <65000>;
	qcom,time-overhead = <1900>;		qcom,time-overhead = <1900>;
	qcom,min-child-idx = <1>;		qcom,min-child-idx = <1>;
			qcom,is-reset;
	};		};

	qcom,pm-cpu {		qcom,pm-cpu {
	@@ -175,6 +177,7 @@
	qcom,energy-overhead = <80000>;		qcom,energy-overhead = <80000>;
	qcom,time-overhead = <2300>;		qcom,time-overhead = <2300>;
	qcom,min-child-idx = <1>;		qcom,min-child-idx = <1>;
			qcom,is-reset;
	};		};

	qcom,pm-cpu {		qcom,pm-cpu {

arch/arm/boot/dts/qcom/msm8996-regulator.dtsi

+6 −0

arch/arm/boot/dts/qcom/msm8996-v2.dtsi

+12 −2

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

	qcom,ldo-headroom-voltage = <150000>;		qcom,ldo-headroom-voltage = <150000>;
	qcom,ldo-max-voltage = <805000>;		qcom,ldo-max-voltage = <805000>;
	qcom,ldo-disable;

	qcom,cpr-corner-fmax-map = <1 2 6 11 19>;		qcom,cpr-corner-fmax-map = <1 2 6 11 19>;

	@@ -136,6 +135,8 @@
	<0 0 0 0 0>,		<0 0 0 0 0>,
	<0 0 0 0 0>,		<0 0 0 0 0>,
	<0 0 0 0 0>;		<0 0 0 0 0>;

			/delete-property/ qcom,ldo-disable;
	};		};

	&apc0_cbf_vreg {		&apc0_cbf_vreg {
	@@ -196,7 +197,6 @@

	qcom,ldo-headroom-voltage = <150000>;		qcom,ldo-headroom-voltage = <150000>;
	qcom,ldo-max-voltage = <805000>;		qcom,ldo-max-voltage = <805000>;
	qcom,ldo-disable;

	qcom,cpr-corner-fmax-map = <1 3 5 11 18>;		qcom,cpr-corner-fmax-map = <1 3 5 11 18>;

	@@ -241,6 +241,8 @@
	<0 0 0 20000 0>,		<0 0 0 20000 0>,
	<0 0 0 0 0>,		<0 0 0 0 0>,
	<0 0 0 0 0>;		<0 0 0 0 0>;

			/delete-property/ qcom,ldo-disable;
	};		};

	&gfx_cpr {		&gfx_cpr {
	@@ -299,6 +301,14 @@
	<0 130000 40000 85000 85000>;		<0 130000 40000 85000 85000>;
	};		};

			&kryo0_vreg {
			qcom,ldo-config-init = <0x31f0e471>;
			};

			&kryo1_vreg {
			qcom,ldo-config-init = <0x31f0e471>;
			};

	/* GPU overrides */		/* GPU overrides */
	&msm_gpu {		&msm_gpu {
	/* Updated chip ID */		/* Updated chip ID */