From 5f9937fa6e166be39f8e68c23a8ab4458bfac805 Mon Sep 17 00:00:00 2001 From: zhangyijie Date: Fri, 7 Dec 2018 14:35:52 +0800 Subject: [PATCH] (CR)[Kane]:kernel:motor add short vibrate(2/2) motor add ram mode for short vibrate Change-Id: I70c7e40ec9f22c94f876a60d23838c1c2b6a397a --- drivers/misc/aw8695_haptic/aw8695.c | 2 +- drivers/misc/aw8695_haptic/aw8695.h | 13 +++++++------ 2 files changed, 8 insertions(+), 7 deletions(-) mode change 100644 => 100755 drivers/misc/aw8695_haptic/aw8695.c mode change 100644 => 100755 drivers/misc/aw8695_haptic/aw8695.h diff --git a/drivers/misc/aw8695_haptic/aw8695.c b/drivers/misc/aw8695_haptic/aw8695.c old mode 100644 new mode 100755 index 5bf24bb84623..c38b5ee283fb --- a/drivers/misc/aw8695_haptic/aw8695.c +++ b/drivers/misc/aw8695_haptic/aw8695.c @@ -1502,7 +1502,7 @@ static int aw8695_haptic_init(struct aw8695 *aw8695) /* haptic init */ mutex_lock(&aw8695->lock); - aw8695->activate_mode = AW8695_HAPTIC_ACTIVATE_RAM_MODE; + aw8695->activate_mode = AW8695_HAPTIC_ACTIVATE_CONT_MODE; ret = aw8695_i2c_read(aw8695, AW8695_REG_WAVSEQ1, ®_val); aw8695->index = reg_val & 0x7F; diff --git a/drivers/misc/aw8695_haptic/aw8695.h b/drivers/misc/aw8695_haptic/aw8695.h old mode 100644 new mode 100755 index b44143c57a5c..19759cd6ee5a --- a/drivers/misc/aw8695_haptic/aw8695.h +++ b/drivers/misc/aw8695_haptic/aw8695.h @@ -60,7 +60,7 @@ #ifdef LRA_0832 #define AW8695_HAPTIC_F0_PRE 2350 // 235Hz #define AW8695_HAPTIC_F0_CALI_PERCEN 7 // -7%~7% -#define AW8695_HAPTIC_CONT_DRV_LVL 95 +#define AW8695_HAPTIC_CONT_DRV_LVL 98 #define AW8695_HAPTIC_CONT_DRV_LVL_OV 0x70 // 155*6.1/256=3.69v #define AW8695_HAPTIC_CONT_TD 0x0073 #define AW8695_HAPTIC_CONT_ZC_THR 0x0ff1 @@ -117,11 +117,12 @@ #endif enum ram_mode_seq { - AW8695_LONG_RAM = 1, - AW8695_SHORT_RAM_20_UP = 2, - AW8695_SHORT_RAM_60_UP = 3, - AW8695_SHORT_RAM_80_UP = 4, - AW8695_SHORT_RAM_100_UP = 5, + AW8695_SHORT_RAM_100_UP = 1, + AW8695_LONG_RAM = 2, + AW8695_SHORT_RAM_100_UP2 = 3, + AW8695_SHORT_RAM_60_UP = 4, + AW8695_SHORT_RAM_80_UP = 5, + AW8695_SHORT_RAM_20_UP = 6, }; enum aw8695_flags { -- 2.20.1