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

Commit c28bc9ae 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: add SMB1360 charger device node for MSM8939 CDP/MTP/QRD"

parents c82fe615 144e3980

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

+28 −0
Original line number Diff line number Diff line
@@ -19,3 +19,31 @@ 
	compatible = "qcom,msm8939-cdp", "qcom,msm8939", "qcom,cdp";

	qcom,board-id = <1 1>;

};



&i2c_4 {

	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,chg-inhibit-disabled;

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

		qcom,iterm-ma = <100>;

		qcom,recharge-thresh-mv = <100>;

		qcom,thermal-mitigation = <1500 700 600 0>;

		regulator-name = "smb1360_otg_vreg";

	};

};



&pm8916_chg {

	status = "disabled";

	qcom,use-external-charger;

};



&pm8916_bms {

	status = "disabled";

	qcom,disable-bms;

};

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

+28 −0
Original line number Diff line number Diff line
@@ -19,3 +19,31 @@ 
	compatible = "qcom,msm8939-mtp", "qcom,msm8939", "qcom,mtp";

	qcom,board-id = <8 1>;

};



&i2c_4 {

	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,chg-inhibit-disabled;

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

		qcom,iterm-ma = <100>;

		qcom,recharge-thresh-mv = <100>;

		qcom,thermal-mitigation = <1500 700 600 0>;

		regulator-name = "smb1360_otg_vreg";

	};

};



&pm8916_chg {

	status = "disabled";

	qcom,use-external-charger;

};



&pm8916_bms {

	status = "disabled";

	qcom,disable-bms;

};

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

+11 −0
Original line number Diff line number Diff line
@@ -186,6 +186,17 @@ 
			};

		};



		smb_int_pin {

			qcom,pins = <&gp 62>;

			qcom,num-grp-pins = <1>;

			qcom,pin-func = <0>;

			label = "smb1360_int_gpio";

			smb_int_default: smb_int_default {

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

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

			};

		};



		 spi0_active {

                        /* MOSI, MISO, CLK */

                        qcom,pins = <&gp 8>, <&gp 9>, <&gp 11>;

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

+28 −0
Original line number Diff line number Diff line
@@ -17,3 +17,31 @@ 
/ {

	qcom,board-id = <0x1000b 5>;

};



&i2c_4 {

	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,chg-inhibit-disabled;

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

		qcom,iterm-ma = <100>;

		qcom,recharge-thresh-mv = <100>;

		qcom,thermal-mitigation = <1500 700 600 0>;

		regulator-name = "smb1360_otg_vreg";

	};

};



&pm8916_chg {

	status = "disabled";

	qcom,use-external-charger;

};



&pm8916_bms {

	status = "disabled";

	qcom,disable-bms;

};