diff options
| author | Linux Build Service Account <lnxbuild@quicinc.com> | 2018-01-26 16:10:30 -0800 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2018-01-26 16:10:30 -0800 |
| commit | 64a4e2672f42c52afeab60acd04100e8e3349593 (patch) | |
| tree | e2489449286eb2029f0a9db9621f497b0ba030b1 | |
| parent | d52f1917e6c99375618fdf952db93f30ebb8920e (diff) | |
| parent | e3a9cb27827b1b723472ba24a55dddad11b06f4b (diff) | |
Merge "ARM: dts: msm: Change haptic vmax and play-rate setting for QRD660"
| -rw-r--r-- | arch/arm/boot/dts/qcom/sdm660-qrd.dtsi | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/arch/arm/boot/dts/qcom/sdm660-qrd.dtsi b/arch/arm/boot/dts/qcom/sdm660-qrd.dtsi index b1408cc295e8..88aea6d1f15e 100644 --- a/arch/arm/boot/dts/qcom/sdm660-qrd.dtsi +++ b/arch/arm/boot/dts/qcom/sdm660-qrd.dtsi @@ -1,4 +1,4 @@ -/* Copyright (c) 2016-2017, The Linux Foundation. All rights reserved. +/* Copyright (c) 2016-2018, 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 @@ -246,6 +246,11 @@ qcom,battery-thermal-coefficients = [9d 50 ff]; }; +&pm660_haptics { + qcom,wave-play-rate-us = <4255>; + qcom,vmax-mv = <1800>; +}; + &i2c_2 { status = "ok"; smb1351_charger: smb1351-charger@1d { |