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

Commit ecdfea03 authored by qctecmdr's avatar qctecmdr Committed by Gerrit - the friendly Code Review server
Browse files

Merge "ARM: dts: msm: Enable smb1396 parallel charger for litomagnus MTP"

parents 7212b533 370ecfef

qcom/litomagnus-mtp.dtsi

+52 −0
Original line number Diff line number Diff line 
#include "lito-mtp.dtsi"

#include <dt-bindings/iio/qcom,spmi-vadc.h>



&soc {
@@ -71,3 +72,54 @@ 
&pmk8350_adc_tm {

	status = "disabled";

};



&pm7250b_vadc {

	smb1390_therm@e {

		qcom,scale-fn-type = <ADC_SCALE_HW_CALIB_PM5_SMB1398_TEMP>;

	};

};



&pm7250b_gpios {

	smb_stat {

		smb_stat_default: smb_stat_default {

			pins = "gpio6";

			function = "normal";

			input-enable;

			bias-pull-up;

			qcom,pull-up-strength = <PMIC_GPIO_PULL_UP_30>;

			power-source = <0>;

		};

	};

};



&qupv3_se9_i2c {

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

	status = "ok";

	#include "smb1398.dtsi"

};



&smb1396 {

	interrupts = <0x2 0xc5 0x0 IRQ_TYPE_LEVEL_LOW>;

	interrupt-parent = <&spmi_bus>;

	interrupt-names = "smb1396";

	pinctrl-names = "default";

	qcom,enable-toggle-stat;

	pinctrl-0 = <&smb_stat_default>;

	status = "ok";

};



&smb1396_div2_cp_master {

	io-channels = <&pm7250b_vadc ADC_AMUX_THM2>;

	qcom,parallel-input-mode = <1>; /* USBIN */

	qcom,parallel-output-mode = <2>; /* VBAT */

	qcom,min-ilim-ua = <1000000>;

	status = "ok";

};



&smb1396_slave {

	status = "ok";

};



&smb1396_div2_cp_slave {

	status = "ok";

};

qcom/orchid-mtp.dtsi

+52 −0
Original line number Diff line number Diff line 
#include "lito-mtp.dtsi"

#include <dt-bindings/iio/qcom,spmi-vadc.h>



&soc {
@@ -84,3 +85,54 @@ 
&pmk8350_adc_tm {

	status = "disabled";

};



&pm7250b_vadc {

	smb1390_therm@e {

		qcom,scale-fn-type = <ADC_SCALE_HW_CALIB_PM5_SMB1398_TEMP>;

	};

};



&pm7250b_gpios {

	smb_stat {

		smb_stat_default: smb_stat_default {

			pins = "gpio6";

			function = "normal";

			input-enable;

			bias-pull-up;

			qcom,pull-up-strength = <PMIC_GPIO_PULL_UP_30>;

			power-source = <0>;

		};

	};

};



&qupv3_se9_i2c {

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

	status = "ok";

	#include "smb1398.dtsi"

};



&smb1396 {

	interrupts = <0x2 0xc5 0x0 IRQ_TYPE_LEVEL_LOW>;

	interrupt-parent = <&spmi_bus>;

	interrupt-names = "smb1396";

	pinctrl-names = "default";

	qcom,enable-toggle-stat;

	pinctrl-0 = <&smb_stat_default>;

	status = "ok";

};



&smb1396_div2_cp_master {

	io-channels = <&pm7250b_vadc ADC_AMUX_THM2>;

	qcom,parallel-input-mode = <1>; /* USBIN */

	qcom,parallel-output-mode = <2>; /* VBAT */

	qcom,min-ilim-ua = <1000000>;

	status = "ok";

};



&smb1396_slave {

	status = "ok";

};



&smb1396_div2_cp_slave {

	status = "ok";

};

qcom/pmk8350.dtsi

+2 −2
Original line number Diff line number Diff line
@@ -14,8 +14,8 @@ 
	qcom,pmk8350@6 {

		compatible = "qcom,spmi-pmic";

		reg = <6 SPMI_USID>;

		#address-cells = <1>;

		#size-cells = <1>;

		#address-cells = <2>;

		#size-cells = <0>;



		pmk8350_revid: qcom,revid@100 {

			compatible = "qcom,qpnp-revid";