Merge "ARM: dts: msm: Modify SMB1390 and SMB1355 device specification" (cb6ffdd4) · Commits · e / devices / android_kernel_oneplus_sm8150

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

+5 −0

Original line number	Diff line number	Diff line
		@@ -17,8 +17,11 @@
		#include "sm8150-sde-display.dtsi"
		#include "sm8150-camera-sensor-mtp.dtsi"
		#include "sm8150-thermal-overlay.dtsi"

		&qupv3_se4_i2c {
		#include "smb1390.dtsi"
		#include "smb1355.dtsi"
		};

		&qupv3_se12_2uart {
		status = "ok";
		@@ -616,6 +619,8 @@
		};

		&smb1390_charger {
		io-channels = <&pm8150b_vadc ADC_AMUX_THM2>;
		io-channel-names = "cp_die_temp";
		status = "ok";
		};

+5 −0

Original line number	Diff line number	Diff line
		@@ -17,8 +17,11 @@
		#include "sm8150-sde-display.dtsi"
		#include "sm8150-camera-sensor-qrd.dtsi"
		#include "sm8150-thermal-overlay.dtsi"

		&qupv3_se4_i2c {
		#include "smb1390.dtsi"
		#include "smb1355.dtsi"
		};

		&vendor {
		bluetooth: bt_wcn3990 {
		@@ -538,6 +541,8 @@
		};

		&smb1390_charger {
		io-channels = <&pm8150b_vadc ADC_AMUX_THM2>;
		io-channel-names = "cp_die_temp";
		status = "ok";
		};

+34 −36

Original line number	Diff line number	Diff line
		@@ -12,7 +12,6 @@

		#include <dt-bindings/interrupt-controller/irq.h>

		&qupv3_se4_i2c {
		smb1355: qcom,smb1355@c {
		compatible = "qcom,i2c-pmic";
		reg = <0xc>;
		@@ -55,4 +54,3 @@
		};
		};
		};
		};

+38 −43

Original line number	Diff line number	Diff line
		@@ -12,7 +12,6 @@

		#include <dt-bindings/interrupt-controller/irq.h>

		&qupv3_se4_i2c {
		smb1390: qcom,smb1390@10 {
		compatible = "qcom,i2c-pmic";
		reg = <0x10>;
		@@ -37,9 +36,6 @@
		interrupt-parent = <&smb1390>;
		status = "disabled";

		io-channels = <&pm8150b_vadc ADC_AMUX_THM2>;
		io-channel-names = "cp_die_temp";

		qcom,core {
		interrupts = <0x10 0x0 IRQ_TYPE_EDGE_RISING>,
		<0x10 0x1 IRQ_TYPE_EDGE_RISING>,
		@@ -60,4 +56,3 @@
		};
		};
		};
		};