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

Commit 5332a6cf authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "ARM: dts: msm: enable the watchdog bark interrupt for smb138x"

parents 6daf3a8c 5b55bcfa

arch/arm/boot/dts/qcom/msm-smb138x.dtsi

+13 −4
Original line number Diff line number Diff line
@@ -14,11 +14,11 @@ 


&i2c_7 {

	status = "okay";

	qcom,smb138x@8 {

	smb138x: qcom,smb138x@8 {

		compatible = "qcom,i2c-pmic";

		reg = <0x8>;

		#address-cells = <2>;

		#size-cells = <0>;

		#address-cells = <1>;

		#size-cells = <1>;

		interrupt-parent = <&spmi_bus>;

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

		interrupt_names = "smb138x";
@@ -37,6 +37,7 @@ 
			#address-cells = <1>;

			#size-cells = <0>;

			#io-channel-cells = <1>;

			interrupt-parent = <&smb138x>;

			interrupts = <0x36 0x0 IRQ_TYPE_EDGE_BOTH>;

			interrupt-names = "eoc";
@@ -91,13 +92,21 @@ 
			compatible = "qcom,smb138x-parallel-slave";

			qcom,pmic-revid = <&smb138x_revid>;

			reg = <0x1000 0x700>;



			#address-cells = <1>;

			#size-cells = <1>;

			interrupt-parent = <&smb138x>;

			io-channels = <&smb138x_tadc 2>,

				      <&smb138x_tadc 12>,

				      <&smb138x_tadc 3>;

			io-channel-names = "charger_temp",

					   "charger_temp_max",

					   "batt_i";



			qcom,chgr-misc@1600 {

				reg = <0x1600 0x100>;

				interrupts = <0x16 0x1 IRQ_TYPE_EDGE_RISING>;

				interrupt-names = "wdog-bark";

			};

		};

	};

};