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

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

Merge "ARM: dts: msm: Add SMB1390 and SMB1355 support to SM6150"

parents 68d6836e bbf04994

arch/arm64/boot/dts/qcom/sm6150-idp.dtsi

+31 −0
Original line number Diff line number Diff line
@@ -13,6 +13,12 @@ 
#include <dt-bindings/iio/qcom,spmi-vadc.h>

#include "sm6150-sde-display.dtsi"



&qupv3_se3_i2c {

	status = "ok";

	#include "smb1390.dtsi"

	#include "smb1355.dtsi"

};



&soc {

};
@@ -129,6 +135,31 @@ 
	qcom,battery-data = <&mtp_batterydata>;

	qcom,step-charging-enable;

	qcom,sw-jeita-enable;

	qcom,sec-charger-config = <3>;

};



&smb1390 {

	/delete-property/ interrupts;

	interrupts = <0x0 0xc2 0x0 IRQ_TYPE_LEVEL_LOW>;

	pinctrl-names = "default";

	pinctrl-0 = <&smb_stat_default>;

	status = "ok";

};



&smb1390_charger {

	io-channels = <&pm6150_vadc ADC_AMUX_THM3>;

	io-channel-names = "cp_die_temp";

	status = "ok";

};



&smb1355 {

	/delete-property/ interrupts;

	interrupts = <0x0 0xc2 0x0 IRQ_TYPE_LEVEL_LOW>;

	status = "ok";

};



&smb1355_charger {

	status = "ok";

};



&dsi_sim_cmd {

arch/arm64/boot/dts/qcom/sm6150-pinctrl.dtsi

+13 −0
Original line number Diff line number Diff line
@@ -10,6 +10,8 @@ 
 * GNU General Public License for more details.

 */



#include <dt-bindings/pinctrl/qcom,pmic-gpio.h>



&soc {

	tlmm: pinctrl@03000000 {

		compatible = "qcom,sm6150-pinctrl";
@@ -997,4 +999,15 @@ 
			output-low;

		};

	};



	smb_stat {

		smb_stat_default: smb_stat_default {

			pins = "gpio3";

			function = "normal";

			input-enable;

			bias-pull-up;

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

			power-source = <0>;

		};

	};

};

arch/arm64/boot/dts/qcom/sm6150-qrd.dtsi

+21 −0
Original line number Diff line number Diff line
@@ -14,6 +14,12 @@ 
#include <dt-bindings/iio/qcom,spmi-vadc.h>

#include "sm6150-sde-display.dtsi"



&qupv3_se3_i2c {

	status = "ok";

	#include "smb1390.dtsi"

	#include "smb1355.dtsi"

};



&soc {

};
@@ -68,6 +74,21 @@ 
	qcom,battery-data = <&mtp_batterydata>;

	qcom,step-charging-enable;

	qcom,sw-jeita-enable;

	qcom,sec-charger-config = <1>;

};



&smb1390 {

	/delete-property/ interrupts;

	interrupts = <0x0 0xc2 0x0 IRQ_TYPE_LEVEL_LOW>;

	pinctrl-names = "default";

	pinctrl-0 = <&smb_stat_default>;

	status = "ok";

};



&smb1390_charger {

	io-channels = <&pm6150_vadc ADC_AMUX_THM3>;

	io-channel-names = "cp_die_temp";

	status = "ok";

};



&qupv3_se1_i2c {