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

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

Merge "ARM: dts: msm: change to use default pin state for smb_int_pin"

parents 32c98eea d64010c0

Documentation/devicetree/bindings/power/smb1360-charger-fg.txt

+8 −0
Original line number Diff line number Diff line
@@ -15,6 +15,12 @@ Optional Properties: 


- interrupts			This indicates the IRQ number of the GPIO

				connected to the STAT pin.

- pinctrl-names:		The state name of the pin configuration. Only

				support: "default".

- pinctrl-0:			The phandle of the pin configuration node in

				pinctrl for smb_int_pin.

				For details of pinctrl properties, please refer to:

				"Documentation/devicetree/bindings/pinctrl/pinctrl-bindings.txt"

- qcom,float-voltage-mv	 	Float Voltage in mV - the maximum voltage up to which

				the battery is charged. Supported range 3460V to 4360V

- qcom,charging-timeout		Maximum duration in minutes that a single charge
@@ -57,6 +63,8 @@ Example: 
			reg = <0x1b>;

			interrupt-parent = <&spmi_bus>;

			interrupts = <0x00 0xcd 0>;

			pinctrl-names = "default";

			pinctrl-0 = <&smb_int_default>;

			qcom,float-voltage-mv = <4200>;

			qcom,iterm-ma = <100>;

			qcom,charging-disabled;

arch/arm/boot/dts/qcom/msm8916-cdp-smb1360.dts

+2 −3
Original line number Diff line number Diff line
@@ -27,9 +27,8 @@ 
			reg = <0x14>;

			interrupt-parent = <&msm_gpio>;

			interrupts = <62 8>;

			pinctrl-names = "active", "sleep";

			pinctrl-0 = <&smb_int_active>;

			pinctrl-1 = <&smb_int_sleep>;

			pinctrl-names = "default";

			pinctrl-0 = <&smb_int_default>;

			regulator-name = "smb1360_otg_vreg";



			qcom,float-voltage-mv = <4200>;

arch/arm/boot/dts/qcom/msm8916-mtp-smb1360.dts

+2 −3
Original line number Diff line number Diff line
@@ -27,9 +27,8 @@ 
			reg = <0x14>;

			interrupt-parent = <&msm_gpio>;

			interrupts = <62 8>;

			pinctrl-names = "active", "sleep";

			pinctrl-0 = <&smb_int_active>;

			pinctrl-1 = <&smb_int_sleep>;

			pinctrl-names = "default";

			pinctrl-0 = <&smb_int_default>;

			regulator-name = "smb1360_otg_vreg";



			qcom,chg-inhibit-disabled;

arch/arm/boot/dts/qcom/msm8916-pinctrl.dtsi

+1 −5
Original line number Diff line number Diff line
@@ -1182,11 +1182,7 @@ 
			qcom,num-grp-pins = <1>;

			qcom,pin-func = <0>;

			label = "smb1360_int_gpio";

			smb_int_active: smb_int_active {

				drive-strength = <2>;	/* 2 MA */

				bias-pull-up;		/* PULL UP*/

			};

			smb_int_sleep: smb_int_sleep {

			smb_int_default: smb_int_default {

				drive-strength = <2>;	/* 2 MA */

				bias-pull-up;		/* PULL UP*/

			};