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

Commit 44521c71 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/FG DT node for APQ8009-refboard"

parents 860a4c6b 95a4f554

arch/arm/boot/dts/qcom/apq8009-512mb-mtp-wcd9326-refboard.dts

+29 −0
Original line number Diff line number Diff line
@@ -59,3 +59,32 @@ 
&peripheral_mem {

	reg = <0x0 0x89e00000 0x0 0x0500000>;

};



&i2c_4 {

	smb1360_otg_supply: smb1360-chg-fg@14 {

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

		reg = <0x14>;

		interrupt-parent = <&msm_gpio>;

		interrupts = <58 8>;

		pinctrl-names = "default";

		pinctrl-0 = <&smb_int_default>;

		qcom,charging-disabled;

		qcom,empty-soc-disabled;

		qcom,chg-inhibit-disabled;

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

		qcom,iterm-ma = <200>;

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

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

		regulator-name = "smb1360_otg_vreg";

	};

};



&pm8916_chg {

	status = "ok";

	qcom,use-external-charger;

};



&pm8916_bms {

	status = "ok";

	qcom,disable-bms;

};

arch/arm/boot/dts/qcom/apq8009-mtp-wcd9326-refboard.dts

+29 −0
Original line number Diff line number Diff line
@@ -59,3 +59,32 @@ 
&peripheral_mem {

	reg = <0x0 0x89e00000 0x0 0x0500000>;

};



&i2c_4 {

	smb1360_otg_supply: smb1360-chg-fg@14 {

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

		reg = <0x14>;

		interrupt-parent = <&msm_gpio>;

		interrupts = <58 8>;

		pinctrl-names = "default";

		pinctrl-0 = <&smb_int_default>;

		qcom,charging-disabled;

		qcom,empty-soc-disabled;

		qcom,chg-inhibit-disabled;

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

		qcom,iterm-ma = <200>;

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

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

		regulator-name = "smb1360_otg_vreg";

	};

};



&pm8916_chg {

	status = "ok";

	qcom,use-external-charger;

};



&pm8916_bms {

	status = "ok";

	qcom,disable-bms;

};

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

+2 −2
Original line number Diff line number Diff line
@@ -277,7 +277,7 @@ 
			smb_int_default: smb_int_default {

				mux {

					pins = "gpio58";

					function ="smb1360_int_gpio";

					function ="smb_int";

				};

				config {

					pins = "gpio58";
@@ -288,7 +288,7 @@ 
			smb_int_sleep: smb_int_sleep {

				mux {

					pins = "gpio58";

					function ="smb1360_int_gpio";

					function ="smb_int";

				};

				config {

					pins = "gpio58";

drivers/pinctrl/qcom/pinctrl-msm8909.c

+1 −1
Original line number Diff line number Diff line
@@ -1162,7 +1162,7 @@ static const struct msm_pingroup msm8909_groups[] = { 
	PINGROUP(55, uim1_reset, NA, NA, NA, NA, NA, NA, NA, NA),

	PINGROUP(56, uim1_present, NA, NA, NA, NA, NA, NA, NA, NA),

	PINGROUP(57, uim_batt, NA, NA, NA, NA, NA, NA, NA, NA),

	PINGROUP(58, qdss_tracedata_a, NA, NA, NA, NA, NA, NA, NA, NA),

	PINGROUP(58, qdss_tracedata_a, smb_int, NA, NA, NA, NA, NA, NA, NA),

	PINGROUP(59, cdc_pdm0, pri_mi2s_mclk_a, atest_char3, NA, NA, NA, NA,

		 NA, bimc_dte0),

	PINGROUP(60, cdc_pdm0, pri_mi2s_sck_a, atest_char2, NA, NA, NA, NA, NA,