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

Commit ff8cd198 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 8916 MTP/CDP"

parents 39e3e1e9 a69da4e1

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

+27 −0
Original line number Diff line number Diff line
@@ -20,3 +20,30 @@ 
	qcom,board-id = <1 1>;

};



&soc {

	i2c@78b8000 {

		smb1360_otg_supply: smb1360-chg-fg@14 {

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

			reg = <0x14>;

			interrupt-parent = <&msm_gpio>;

			interrupts = <62 8>;

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

			pinctrl-0 = <&smb_int_active>;

			pinctrl-1 = <&smb_int_sleep>;

			regulator-name = "smb1360_otg_vreg";



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

			qcom,iterm-ma = <100>;

			qcom,charging-disabled;

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

		};

	};

};



&pm8916_chg {

	status = "disabled";

};



&pm8916_bms {

	status = "disabled";

};

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

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

	qcom,board-id = <8 1>;

};



&soc {

	i2c@78b8000 {

		smb1360_otg_supply: smb1360-chg-fg@14 {

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

			reg = <0x14>;

			interrupt-parent = <&msm_gpio>;

			interrupts = <62 8>;

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

			pinctrl-0 = <&smb_int_active>;

			pinctrl-1 = <&smb_int_sleep>;

			regulator-name = "smb1360_otg_vreg";



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

			qcom,iterm-ma = <100>;

			qcom,charging-disabled;

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

		};

	};

};



&pm8916_chg {

	status = "disabled";

};



&pm8916_bms {

	status = "disabled";

};

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

+34 −0
Original line number Diff line number Diff line
@@ -1073,5 +1073,39 @@ 
				bias-pull-down = <0>; /* PULL DOWN */

			};

		};



		pmx_i2c_4 {

			/* CLK, DATA */

			qcom,pins = <&gp 14>, <&gp 15>;

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

			qcom,pin-func = <2>;

			label = "pmx_i2c_4";



			i2c_4_active: i2c_4_active {

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

				bias-disable = <0>;	/* No PULL */

			};



			i2c_4_sleep: i2c_4_sleep {

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

				bias-disable = <0>;	/* No PULL */

			};



		};



		smb_int_pin {

			qcom,pins = <&gp 62>;

			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 {

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

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

			};

		};

	};

};

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

+26 −0
Original line number Diff line number Diff line
@@ -40,6 +40,7 @@ 
		i2c0 = &i2c_0; /* I2C0 controller device */

		i2c5 = &i2c_5; /* I2C5 controller device */

		i2c6 = &i2c_6; /* I2C6 NFC qup6 device */

		i2c4 = &i2c_4; /* I2C4 controller device */

	};



	cpus {
@@ -1267,6 +1268,31 @@ 
		qcom,master-id = <86>;

	};



	i2c_4: i2c@78b8000 { /* BLSP1 QUP4 */

		compatible = "qcom,i2c-msm-v2";

		#address-cells = <1>;

		#size-cells = <0>;

		reg-names = "qup_phys_addr", "bam_phys_addr";

		reg = <0x78b8000 0x1000>,

			<0x7884000 0x23f00>;

		interrupt-names = "qup_irq", "bam_irq";

		interrupts = <0 98 0>, <0 238 0>;

		qcom,clk-freq-out = <400000>;

		qcom,clk-freq-in  = <19200000>;

		clock-names = "iface_clk", "core_clk";

		clocks = <&clock_gcc clk_gcc_blsp1_ahb_clk>,

			<&clock_gcc clk_gcc_blsp1_qup4_i2c_apps_clk>;

		qcom,use-pinctrl;

		pinctrl-names = "i2c_active", "i2c_sleep";

		pinctrl-0 = <&i2c_4_active>;

		pinctrl-1 = <&i2c_4_sleep>;

		qcom,noise-rjct-scl = <0>;

		qcom,noise-rjct-sda = <0>;

		qcom,bam-pipe-idx-cons = <10>;

		qcom,bam-pipe-idx-prod = <11>;

		qcom,master-id = <86>;

	};



	spmi_bus: qcom,spmi@200f000 {

		compatible = "qcom,spmi-pmic-arb";

		reg = <0x200f000 0x1000>,