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

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

Merge "ARM: dts: msm: Modify SMB1390 driver for sm8150"

parents ec66ad44 4e92b63e

arch/arm64/boot/dts/qcom/sm8150-mtp.dtsi

+2 −0
Original line number Diff line number Diff line
@@ -645,6 +645,8 @@ 
};



&smb1390_charger {

	/delete-property/ compatible;

	compatible = "qcom,smb1390-charger-psy";

	io-channels = <&pm8150b_vadc ADC_AMUX_THM2>;

	io-channel-names = "cp_die_temp";

	status = "ok";

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

+2 −0
Original line number Diff line number Diff line
@@ -615,6 +615,8 @@ 
};



&smb1390_charger {

	/delete-property/ compatible;

	compatible = "qcom,smb1390-charger-psy";

	io-channels = <&pm8150b_vadc ADC_AMUX_THM2>;

	io-channel-names = "cp_die_temp";

	status = "ok";

arch/arm64/boot/dts/qcom/sm8150-sdx50m-qrd.dtsi

+2 −0
Original line number Diff line number Diff line
@@ -587,6 +587,8 @@ 
};



&smb1390_charger {

	/delete-property/ compatible;

	compatible = "qcom,smb1390-charger-psy";

	io-channels = <&pm8150b_vadc ADC_AMUX_THM2>;

	io-channel-names = "cp_die_temp";

	status = "ok";

arch/arm64/configs/vendor/sm8150-perf_defconfig

+1 −1
Original line number Diff line number Diff line
@@ -359,7 +359,7 @@ CONFIG_QPNP_FG_GEN4=y 
CONFIG_SMB1355_SLAVE_CHARGER=y

CONFIG_QPNP_SMB5=y

CONFIG_QPNP_QNOVO5=y

CONFIG_SMB1390_CHARGE_PUMP=y

CONFIG_SMB1390_CHARGE_PUMP_PSY=y

CONFIG_THERMAL=y

CONFIG_THERMAL_WRITABLE_TRIPS=y

CONFIG_THERMAL_GOV_USER_SPACE=y

arch/arm64/configs/vendor/sm8150_defconfig

+1 −1
Original line number Diff line number Diff line
@@ -374,7 +374,7 @@ CONFIG_QPNP_FG_GEN4=y 
CONFIG_SMB1355_SLAVE_CHARGER=y

CONFIG_QPNP_SMB5=y

CONFIG_QPNP_QNOVO5=y

CONFIG_SMB1390_CHARGE_PUMP=y

CONFIG_SMB1390_CHARGE_PUMP_PSY=y

CONFIG_THERMAL=y

CONFIG_THERMAL_WRITABLE_TRIPS=y

CONFIG_THERMAL_GOV_USER_SPACE=y