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

Commit 3b75c28d 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: Specify the interrupts properly for haptics on pm660"

parents cec4a662 c38c85e7

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

+3 −3
Original line number Diff line number Diff line 
/* Copyright (c) 2016, The Linux Foundation. All rights reserved.

/* Copyright (c) 2016-2017, The Linux Foundation. All rights reserved.

 *

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of the GNU General Public License version 2 and
@@ -585,8 +585,8 @@ 
		pm660_haptics: qcom,haptic@c000 {

			compatible = "qcom,qpnp-haptic";

			reg = <0xc000 0x100>;

			interrupts = <0x1 0xc0 0x0>,

				     <0x1 0xc0 0x1>;

			interrupts = <0x1 0xc0 0x0 IRQ_TYPE_NONE>,

				     <0x1 0xc0 0x1 IRQ_TYPE_NONE>;

			interrupt-names = "sc-irq", "play-irq";

			qcom,actuator-type = "lra";

			qcom,play-mode = "direct";