diff options
| author | Linux Build Service Account <lnxbuild@localhost> | 2017-01-09 01:32:11 -0800 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2017-01-09 01:32:11 -0800 |
| commit | 3b75c28dc2cf3690ae1e528cab47d45142ad1231 (patch) | |
| tree | 44e5ea46b39a05281f5b3b58e55f623050da309e | |
| parent | cec4a662eaa586213df0b4778773939db04a6d83 (diff) | |
| parent | c38c85e7e21ed7ab5a24af0493555a53dded63c0 (diff) | |
Merge "ARM: dts: msm: Specify the interrupts properly for haptics on pm660"
| -rw-r--r-- | arch/arm/boot/dts/qcom/msm-pm660.dtsi | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/arm/boot/dts/qcom/msm-pm660.dtsi b/arch/arm/boot/dts/qcom/msm-pm660.dtsi index 3674e2e5570b..e8e773a33622 100644 --- a/arch/arm/boot/dts/qcom/msm-pm660.dtsi +++ b/arch/arm/boot/dts/qcom/msm-pm660.dtsi @@ -1,4 +1,4 @@ -/* 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"; |