Promotion of kernel.lnx.4.4-161016. (d24625a7) · Commits · e / devices / android_kernel_sony_msm8998

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

+1 −0

Original line number	Diff line number	Diff line
		@@ -25,6 +25,7 @@ The device tree parameters for the core hang detection are:
		Required properties:

		- compatible : "qcom,core-hang-detect"
		- label: unique name used to created sysfs entry
		- qcom,threshold-arr :
		Array of APCS_ALIAS*_CORE_HANG_THRESHOLD register address
		for each core.

Documentation/devicetree/bindings/input/pixart-pat9125-switch.txt

+25 −0

Original line number	Diff line number	Diff line
		@@ -15,6 +15,25 @@ Optional properties:
		- pixart,inverse-x : boolean, use this to invert the x data before sending it to input framework
		- pixart,inverse-y : boolean, use this to invert the y data before sending it to input framework
		- pixart,press-enabled : boolean, use this to enable detection of pressing the button
		- pinctrl-names : This should be defined if a target uses pinctrl framework.
		See "pinctrl" in Documentation/devicetree/bindings/pinctrl/msm-pinctrl.txt
		It should specify the names of the configs that pinctrl can
		install in driver.
		Following are the pinctrl configs that can be installed:
		"pmx_rot_switch_active" : Active configuration of pins,
		it should specify active config
		defined in pin groups of
		interrupt gpio.
		"pmx_rot_switch_suspend" : Disabled configuration of
		pins, it should specify sleep
		config defined in pin groups
		of interrupt gpio.
		"pmx_rot_switch_release" : Release configuration of
		pins, it should specify release
		config defined in pin groups of
		interrupt gpio.
		- pixart,irq-gpio : This should be defined if a target doesn't use pinctrl framework.
		irq gpio, which is to provide interrupts to host, same as "interrupts" node.

		Required properties if 'pixart,press-enabled' DT property is defined:
		- pixart,press-keycode : keycode to be sent when press is detected by the driver.
		@@ -26,4 +45,10 @@ Example:
		interrupt-parent = <&msm_gpio>;
		interrupts = <98 0x2008>;
		pixart,irq-gpio = <&msm_gpio 98 0x2008>;
		pinctrl-names = "pmx_rot_switch_active",
		"pmx_rot_switch_suspend",
		"pmx_rot_switch_release";
		pinctrl-0 = <&pix_int_active>;
		pinctrl-1 = <&pix_int_suspend>;
		pinctrl-2 = <&pix_release>;
		};

Documentation/devicetree/bindings/leds/leds-qpnp-flash-v2.txt

+10 −4

Original line number	Diff line number	Diff line
		@@ -38,17 +38,23 @@ Optional properties:
		Default value is 4500000 uA.
		- qcom,rparasitic-uohm : Integer property for flash current predictive mitigation indicating
		parasitic component of battery resistance. Default value is 0 uOhm.
		- qcom,lmh-ocv-threshold-uv : Required property for flash current preemptive mitigation.
		- qcom,lmh-ocv-threshold-uv : Required property for flash current preemptive LMH mitigation.
		Default value is 3700000 uV.
		- qcom,lmh-rbatt-threshold-uohm : Required property for flash current preemptive mitigation.
		- qcom,lmh-rbatt-threshold-uohm : Required property for flash current preemptive LMH mitigation.
		Default value is 400000 uOhm.
		- qcom,lmh-mitigation-sel : Optional property to configure flash current preemptive mitigation.
		- qcom,lmh-mitigation-sel : Optional property to configure flash current preemptive LMH mitigation.
		Accepted values are:
		0: MITIGATION_DISABLED
		1: MITIGATION_BY_ILED_THRESHOLD
		2: MITIGATION_BY_SW
		Default value is 2.
		- qcom,lmh-level : Optional property to configure flash current preemptive mitigation.
		- qcom,chgr-mitigation-sel : Optional property to configure flash current preemptive charger mitigation.
		Accepted values are:
		0: MITIGATION_DISABLED
		1: MITIGATION_BY_ILED_THRESHOLD
		2: MITIGATION_BY_SW
		Default value is 2.
		- qcom,lmh-level : Optional property to configure flash current preemptive LMH mitigation.
		Accepted values are 0, 1, and 3. Default value is 0.
		- qcom,iled-thrsh-ma : Optional property to configure the led current threshold at which HW
		preemptive mitigation is triggered. Unit is mA. Default value is 1000.

Documentation/devicetree/bindings/usb/qpnp-pdphy.txt

+3 −0

Original line number	Diff line number	Diff line
		@@ -40,6 +40,9 @@ Optional properties:
		- vconn-supply: Regulator that enables VCONN source output. This will
		be supplied on the USB CC line that is not used for
		communication when Ra resistance is detected.
		- qcom,vconn-uses-external-source: Indicates whether VCONN supply is sourced
		from an external regulator. If omitted, then it is
		assumed it is connected to VBUS.

		Example:
		qcom,qpnp-pdphy@1700 {

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

+12 −4

Original line number	Diff line number	Diff line
		@@ -1135,13 +1135,21 @@
		qcom,firmware-name = "ipa_fws";
		};

		qcom,chd {
		qcom,chd_silver {
		compatible = "qcom,core-hang-detect";
		label = "silver";
		qcom,threshold-arr = <0x179880b0 0x179980b0
		0x179a80b0 0x179b80b0 0x178880b0 0x178980b0
		0x178a80b0 0x178b80b0>;
		0x179a80b0 0x179b80b0>;
		qcom,config-arr = <0x179880b8 0x179980b8
		0x179a80b8 0x179b80b8 0x178880b8 0x178980b8
		0x179a80b8 0x179b80b8>;
		};

		qcom,chd_gold {
		compatible = "qcom,core-hang-detect";
		label = "gold";
		qcom,threshold-arr = <0x178880b0 0x178980b0
		0x178a80b0 0x178b80b0>;
		qcom,config-arr = <0x178880b8 0x178980b8
		0x178a80b8 0x178b80b8>;
		};