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

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

Merge "ARM: dts: msm: Add dt support for smb1394"

parents 3b9ec894 84de073d
Loading
Loading
Loading
Loading
+8 −1
Original line number Diff line number Diff line
@@ -52,12 +52,19 @@
};

&smb1394_div2_cp_primary {
	io-channels = <&pm7250b_vadc ADC_AMUX_THM2_PU2>;
	io-channels = <&pm7250b_vadc ADC_AMUX_THM2>;
	io-channel-names = "die_temp";
	qcom,parallel-input-mode = <1>;
	qcom,parallel-output-mode = <2>;
	status = "ok";
};

&pm7250b_vadc {
	smb1390_therm@e {
		qcom,scale-fn-type = <ADC_SCALE_HW_CALIB_PM5_SMB1398_TEMP>;
	};
};

&pm7250b_charger {
	status = "ok";
	io-channels = <&pm7250b_vadc ADC_USB_IN_V_16>,
+6 −0
Original line number Diff line number Diff line
@@ -11,8 +11,14 @@ smb1394: qcom,smb1394@34 {
	qcom,periph-map = <0x6 0x26 0x27>;
	status = "disabled";

	smb1394_revid: qcom,revid {
		compatible = "qcom,qpnp-revid";
		reg = <0x100>;
	};

	smb1394_div2_cp_primary: qcom,div2_cp_pry {
		compatible = "qcom,smb1394-div2-cp-primary";
		qcom,pmic-revid = <&smb1394_revid>;
		#io-channel-cells = <1>;
		interrupts = <0x26 0x1 IRQ_TYPE_EDGE_RISING>,
			     <0x26 0x3 IRQ_TYPE_EDGE_RISING>,