Merge remote-tracking branch 'quic/msm-4.14' into dev/msm-4.14-display (13781d61) · Commits · e / devices / android_kernel_xiaomi_nabu

Documentation/devicetree/bindings/arm/msm/msm.txt

+7 −2

Original line number	Diff line number	Diff line
		@@ -53,6 +53,9 @@ SoCs:
		- QCS405
		compatible = "qcom,qcs405"

		- QCS403
		compatible = "qcom,qcs403"

		- SDXPRAIRIE
		compatible = "qcom,sdxprairie"

		@@ -100,6 +103,8 @@ Generic board variants:
		- RUMI device:
		compatible = "qcom,rumi"

		- IOT device:
		compatible = "qcom,iot"


		Boards (SoC type + board variant):
		@@ -156,8 +161,8 @@ compatible = "qcom,sm6150-cdp"
		compatible = "qcom,sm6150-qrd"
		compatible = "qcom,sm6150-idp"
		compatible = "qcom,qcs405-rumi"
		compatible = "qcom,qcs405-mtp"
		compatible = "qcom,qcs405-cdp"
		compatible = "qcom,qcs405-iot"
		compatible = "qcom,qcs403-iot"
		compatible = "qcom,sm8150-auto-adp-star"
		compatible = "qcom,auto-adp-star"
		compatible = "qcom,sdxprairie-rumi"

Documentation/devicetree/bindings/batterydata/batterydata.txt

+8 −0

Original line number	Diff line number	Diff line
		@@ -69,6 +69,14 @@ Profile data node optional properties:
		size 5.
		- qcom,therm-center-offset: Specifies the resistor divide ratio between pull-up
		resistor and the thermistor for GEN4 FG.
		- qcom,therm-pull-up: Specifies the thermistor pull-up resistor value in
		KOhms.
		- qcom,rslow-normal-coeffs: Array of Rslow coefficients that will be applied
		when the battery temperature is greater than 0 degree
		Celsius for GEN4 FG. This should be exactly of size 4.
		- qcom,rslow-low-coeffs: Array of Rslow coefficients that will be applied
		when the battery temperature is lower than 0 degree
		Celsius for GEN4 FG. This should be exactly of size 4.
		- qcom,soc-based-step-chg: A bool property to indicate if the battery will
		perform SoC (State of Charge) based step charging.
		If yes, the low and high thresholds defined in

Documentation/devicetree/bindings/input/qti-haptics.txt

+40 −26

Original line number	Diff line number	Diff line
		@@ -66,19 +66,6 @@ Properties:
		specified in the LRA actuator datasheet. Allowed values are:
		0 to 20475. If this is not specified, 5715us play rate is used.

		- qcom,brake-pattern
		Usage: optional
		Value type: <prop-encoded-array>
		Definition: Specifies the brake pattern with 4 elements used to enable the
		internal reverse braking. Allowed values for each element are:
		0: no brake;
		1: brake with (Vmax / 2) strength;
		2: brake with Vmax strength;
		3: brake with (2 * Vmax) strength;
		If this property is specified with an array of non-zero values,
		then the brake pattern is applied at the end of the playing
		waveform.

		- qcom,external-waveform-source
		Usage: optional
		Value type: <string>
		@@ -108,11 +95,12 @@ Following properties are specific only when LRA actuator is used:
		values: "sine", "square". If this is not specified, sinusoid
		resonance driver signal is used.

		- qcom,lra-auto-resonance-en
		- qcom,lra-allow-variable-play-rate
		Usage: optional
		Value type: <empty>
		Definition: If specified, the hardware feature of LRA auto resonance detection
		is enabled for correcting the resonance frequency variation.
		Definition: If specified, "qcom,wf-play-rate-us" for LRA defined in each
		effect could be different with the resonance period of the
		LRA actuator.

		- qcom,lra-auto-resonance-mode
		Usage: optional
		@@ -136,16 +124,20 @@ waveforms/effects:
		Usage: required
		Value type: <prop-encoded-array>
		Definition: Specifies the waveform pattern in a byte array that will be
		played for the effect-id. Allowed values for each element
		are: 0x00 to 0x1F.
		played for the effect-id. The bit fields of each byte are:
		[7]: drive direction, 0 - forward; 1 - reverse
		[6]: overdrive, 0 -- 1x drive; 1 -- 2x drive
		[5:1]: waveform amplitude
		[0]: reserved.

		- qcom,wf-play-rate-us
		Usage: optional
		Value type: <u32>
		Definition: Specifies the play period in microseconds for each byte pattern.
		For LRA actuator, For LRA, it should be set equal to the resonance
		period specified in the LRA actuator datasheet. Allowed values
		are: 0 to 20475.
		Allowed values are: 0 to 20475. For LRA actuator, if
		"qcom,lra-allow-variable-play-rate" is defined, it could be
		set to other values not equal to the resonance period of the
		LRA actuator.

		- qcom,wf-repeat-count
		Usage: optional
		@@ -159,6 +151,25 @@ waveforms/effects:
		Definition: Specifies the repeat times for each sample defined in
		qcom,wf-pattern. Allowed values are: 1, 2, 4, 8.

		- qcom,wf-brake-pattern
		Usage: optional
		Value type: <prop-encoded-array>
		Definition: Specifies the brake pattern with 4 elements used to enable the
		internal reverse braking. Allowed values for each element are:
		0: no brake
		1: brake with (Vmax / 2) strength
		2: brake with Vmax strength
		3: brake with (2 * Vmax) strength
		If this property is specified with an array of non-zero values,
		then the brake pattern is applied at the end of the playing
		waveform.

		- qcom,lra-auto-resonance-disable
		Usage: optional
		Value type: <empty>
		Definition: If specified, the hardware feature of LRA auto resonance detection
		is disabled.

		Example:
		qcom,haptics@c000 {
		compatible = "qcom,haptics";
		@@ -169,20 +180,23 @@ Example:
		qcom,actuator-type = "lra";
		qcom,vmax-mv = <1800>;
		qcom,ilim-ma = <400>;
		qcom,play-rate-us = <4255>;
		qcom,brake-pattern = [03 02 01 00];
		qcom,play-rate-us = <8000>;
		qcom,lra-resonance-sig-shape = "sine";
		qcom,lra-auto-resonance-mode;
		qcom,lra-auto-resonance-mode = "qwd";
		qcom,lra-allow-variable-play-rate;

		wf_0 {
		/* CLICK effect */
		qcom,effect-id = <0>;
		qcom,wf-pattern = [0a 14 1f 1f 1f 1f 14 0a];
		qcom,wf-play-rate-us = <6250>;
		qcom,wf-pattern = [3e 3e 3e];
		qcom,lra-auto-resonance-disable;
		};

		wf_5 {
		/* HEAVY_CLICK effect */
		qcom,effect-id = <5>;
		qcom,wf-pattern = [08 0a 1a 1f 1f 1a 0a 08];
		qcom,wf-play-rate-us = <6250>;
		qcom,wf-pattern = [7e 7e 7e];
		};
		};

Documentation/devicetree/bindings/media/video/msm-camera-flash.txt

+7 −1

Original line number	Diff line number	Diff line
		@@ -65,6 +65,11 @@ First Level Node - CAM FLASH device
		Value type: <u32>
		Definition: Max duration in ms flash can glow.

		- wled-flash-support
		Usage: optional
		Value type: <boolean>
		Definition: To identity wled flash hardware support.

		- gpios
		Usage: optional
		Value type: <u32>
		@@ -109,6 +114,7 @@ led_flash_rear: qcom,camera-flash@0 {
		flash-source = <&pmi8998_flash0 &pmi8998_flash1>;
		torch-source = <&pmi8998_torch0 &pmi8998_torch1>;
		switch-source = <&pmi8998_switch0>;
		wled-flash-support;
		qcom,slave-id = <0x00 0x00 0x0011>;
		qcom,cci-master = <0>;
		gpios = <&msmgpio 23 0>,

Documentation/devicetree/bindings/power/supply/qcom/qpnp-qnovo5.txt

0 → 100644

+40 −0

Original line number	Diff line number	Diff line
		QPNP Qnovo5 pulse engine

		QPNP Qnovo5 is a PBS based pulse charging engine which works in tandem with the
		QPNP SMB5 Charger device. It configures the QPNP SMB5 charger to
		charge/discharge as per pulse characteristics.

		The QPNP Qnovo5 pulse engine has a single peripheral assigned to it.

		Properties:
		- compatible:
		Usage: required
		Value type: <string>
		Definition: It must be "qcom,qpnp-qnovo5".

		- reg:
		Usage: required
		Value type: <u32>
		Definition: Specifies the base address of the module. Qnovo5 is using a
		SDAM peripheral so this is the address of the SDAM module
		being used.

		- interrupts:
		Usage: required
		Value type: <prop-encoded-array>
		Definition: Specifies the interrupt associated with Qnovo5.

		- interrupt-names:
		Usage: required
		Value type: <string>
		Definition: Specifies the interrupt name for Qnovo5. There is only one
		interrupt named as "ptrain-done".

		Example:

		qcom,qpnp-qnovo@b000 {
		compatible = "qcom,qpnp-qnovo5";
		reg = <0xb000 0x100>;
		interrupts = <0x2 0xb0 0x0 IRQ_TYPE_NONE>;
		interrupt-names = "ptrain-done";
		};