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

Commit 8904db4a 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: enable SMB1360 device for msm8939"

parents 22e968b6 0bce6db9

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

+3 −3
Original line number Diff line number Diff line
@@ -24,11 +24,11 @@ 
	smb1360_otg_supply: smb1360-chg-fg@14 {

		compatible = "qcom,smb1360-chg-fg";

		reg = <0x14>;

		status = "disabled";

		interrupt-parent = <&msm_gpio>;

		interrupts = <62 8>;

		pinctrl-names = "default";

		pinctrl-0 = <&smb_int_default>;

		qcom,charging-disabled;

		qcom,chg-inhibit-disabled;

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

		qcom,iterm-ma = <100>;
@@ -39,11 +39,11 @@ 
};



&pm8916_chg {

	status = "disabled";

	status = "ok";

	qcom,use-external-charger;

};



&pm8916_bms {

	status = "disabled";

	status = "ok";

	qcom,disable-bms;

};

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

+3 −3
Original line number Diff line number Diff line
@@ -24,11 +24,11 @@ 
	smb1360_otg_supply: smb1360-chg-fg@14 {

		compatible = "qcom,smb1360-chg-fg";

		reg = <0x14>;

		status = "disabled";

		interrupt-parent = <&msm_gpio>;

		interrupts = <62 8>;

		pinctrl-names = "default";

		pinctrl-0 = <&smb_int_default>;

		qcom,charging-disabled;

		qcom,chg-inhibit-disabled;

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

		qcom,iterm-ma = <100>;
@@ -39,11 +39,11 @@ 
};



&pm8916_chg {

	status = "disabled";

	status = "ok";

	qcom,use-external-charger;

};



&pm8916_bms {

	status = "disabled";

	status = "ok";

	qcom,disable-bms;

};

arch/arm/boot/dts/qcom/msm8939-qrd-skuk.dts

+2 −3
Original line number Diff line number Diff line
@@ -22,7 +22,6 @@ 
	smb1360_otg_supply: smb1360-chg-fg@14 {

		compatible = "qcom,smb1360-chg-fg";

		reg = <0x14>;

		status = "disabled";

		interrupt-parent = <&msm_gpio>;

		interrupts = <62 8>;

		pinctrl-names = "default";
@@ -37,11 +36,11 @@ 
};



&pm8916_chg {

	status = "disabled";

	status = "ok";

	qcom,use-external-charger;

};



&pm8916_bms {

	status = "disabled";

	status = "ok";

	qcom,disable-bms;

};