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

Commit 3b7bfa64 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: Fix interrupt flags for smb1351-charger for mdmcalifornium"

parents 21bd0319 5dea82a7

arch/arm/boot/dts/qcom/mdmcalifornium-cdp.dtsi

+2 −1
Original line number Diff line number Diff line
@@ -10,6 +10,7 @@ 
 * GNU General Public License for more details.

 */



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

#include "mdmcalifornium.dtsi"

#include "mdmcalifornium-pinctrl.dtsi"

#include "mdmcalifornium-display.dtsi"
@@ -31,7 +32,7 @@ 
		compatible = "qcom,smb1351-charger";

		reg = <0x55>;

		interrupt-parent = <&tlmm_pinmux>;

		interrupts = <83 0>;

		interrupts = <83 IRQ_TYPE_LEVEL_LOW>;

		qcom,float-voltage-mv = <4200>;

		qcom,charging-timeout = <1536>;

		qcom,recharge-thresh-mv = <200>;

arch/arm/boot/dts/qcom/mdmcalifornium-mtp.dtsi

+2 −1
Original line number Diff line number Diff line
@@ -10,6 +10,7 @@ 
 * GNU General Public License for more details.

 */



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

#include "mdmcalifornium.dtsi"

#include "mdmcalifornium-pinctrl.dtsi"

#include "mdmcalifornium-display.dtsi"
@@ -31,7 +32,7 @@ 
		compatible = "qcom,smb1351-charger";

		reg = <0x55>;

		interrupt-parent = <&tlmm_pinmux>;

		interrupts = <83 0>;

		interrupts = <83 IRQ_TYPE_LEVEL_LOW>;

		qcom,float-voltage-mv = <4200>;

		qcom,charging-timeout = <1536>;

		qcom,recharge-thresh-mv = <200>;

arch/arm/boot/dts/qcom/mdmcalifornium-v1.1-cdp.dtsi

+2 −1
Original line number Diff line number Diff line
@@ -10,6 +10,7 @@ 
 * GNU General Public License for more details.

 */



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

#include "mdmcalifornium-v1.1.dtsi"

#include "mdmcalifornium-pinctrl.dtsi"

#include "mdmcalifornium-display.dtsi"
@@ -31,7 +32,7 @@ 
		compatible = "qcom,smb1351-charger";

		reg = <0x55>;

		interrupt-parent = <&tlmm_pinmux>;

		interrupts = <83 0>;

		interrupts = <83 IRQ_TYPE_LEVEL_LOW>;

		qcom,float-voltage-mv = <4200>;

		qcom,charging-timeout = <1536>;

		qcom,recharge-thresh-mv = <200>;

arch/arm/boot/dts/qcom/mdmcalifornium-v1.1-mtp.dtsi

+2 −1
Original line number Diff line number Diff line
@@ -10,6 +10,7 @@ 
 * GNU General Public License for more details.

 */



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

#include "mdmcalifornium-v1.1.dtsi"

#include "mdmcalifornium-pinctrl.dtsi"
@@ -29,7 +30,7 @@ 
		compatible = "qcom,smb1351-charger";

		reg = <0x55>;

		interrupt-parent = <&tlmm_pinmux>;

		interrupts = <83 0>;

		interrupts = <83 IRQ_TYPE_LEVEL_LOW>;

		qcom,float-voltage-mv = <4200>;

		qcom,charging-timeout = <1536>;

		qcom,recharge-thresh-mv = <200>;