From: dengwei1 <dengwei1@motorola.com>
Date: Mon, 12 Aug 2019 06:08:58 +0000 (+0800)
Subject: Troika	: vibrator reset itself when IC hang
X-Git-Tag: MMI-QSB30.62-17~93
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=24113aa42cd3088da5aa3e720be7a24bfcdf7694;p=GitHub%2FMotorolaMobilityLLC%2Fkernel-slsi.git

Troika	: vibrator reset itself when IC hang

check with IC vendor
reset the IC when it hang

Change-Id: I5a169e10a3d9b544ab7b041bf9e2fcad9d672f5b
Signed-off-by: dengwei1 <dengwei1@motorola.com>
Reviewed-on: https://gerrit.mot.com/1400750
SLTApproved: Slta Waiver
SME-Granted: SME Approvals Granted
Tested-by: Jira Key
Reviewed-by: Wei Xu <xuwei9@mt.com>
Reviewed-by: Xiangpo Zhao <zhaoxp3@motorola.com>
Submit-Approved: Jira Key
(cherry picked from commit 4455d772f87642258340ba5d913a7b26c4820357)
Reviewed-on: https://gerrit.mot.com/1400777
---

diff --git a/drivers/misc/aw8695_haptic/aw8695.c b/drivers/misc/aw8695_haptic/aw8695.c
index 920de2f3c820..05926488b788 100755
--- a/drivers/misc/aw8695_haptic/aw8695.c
+++ b/drivers/misc/aw8695_haptic/aw8695.c
@@ -119,6 +119,7 @@ static const struct wave_index aw8695_rtp_wave_id[AW8695_RTP_NAME_MAX] = {
 struct aw8695_container *aw8695_rtp;
 struct aw8695 *g_aw8695;
 
+static char f0_cali_lra = 0;
 /******************************************************
  *
  * functions
@@ -129,6 +130,7 @@ static int aw8695_haptic_trig_enable_config(struct aw8695 *aw8695);
 #ifdef MOTO_VIBRATOR_SUOOPRT
 static void aw8695_vibrate(struct aw8695 *aw8695, int value);
 #endif
+static int aw8695_haptic_reset_init(struct aw8695 *aw8695);
 
  /******************************************************
  *
@@ -595,7 +597,7 @@ static int aw8695_haptic_stop_delay(struct aw8695 *aw8695)
             __func__, reg_val);
     }
     pr_err("%s do not enter standby automatically\n", __func__);
-
+	aw8695_haptic_reset_init(aw8695);
     return 0;
 }
 
@@ -1438,7 +1440,6 @@ static int aw8695_haptic_f0_calibration(struct aw8695 *aw8695)
     int ret = 0;
     unsigned char reg_val = 0;
     unsigned int f0_limit = 0;
-    char f0_cali_lra = 0;
     int f0_cali_step = 0;
     int f0_dft_step = 0;
 
@@ -1765,6 +1766,63 @@ static int aw8695_haptic_init(struct aw8695 *aw8695)
 }
 
 
+static int aw8695_haptic_reset_init(struct aw8695 *aw8695)
+{
+    int ret = 0;
+    unsigned char i = 0;
+    unsigned char reg_val = 0;
+
+    pr_info("%s enter\n", __func__);
+
+    aw8695_haptic_softreset(aw8695);
+    /* haptic init */
+
+    ret = aw8695_i2c_read(aw8695, AW8695_REG_WAVSEQ1, &reg_val);
+    aw8695->index = reg_val & 0x7F;
+    ret = aw8695_i2c_read(aw8695, AW8695_REG_DATDBG, &reg_val);
+    aw8695->gain = reg_val & 0xFF;
+    ret = aw8695_i2c_read(aw8695, AW8695_REG_BSTDBG4, &reg_val);
+    aw8695->vmax = (reg_val>>1)&0x1F;
+    for(i=0; i<AW8695_SEQUENCER_SIZE; i++) {
+        ret = aw8695_i2c_read(aw8695, AW8695_REG_WAVSEQ1+i, &reg_val);
+        aw8695->seq[i] = reg_val;
+    }
+
+    aw8695_haptic_play_mode(aw8695, AW8695_HAPTIC_STANDBY_MODE);
+
+    aw8695_haptic_set_pwm(aw8695, AW8695_PWM_24K);
+
+    aw8695_i2c_write(aw8695, AW8695_REG_BSTDBG1, 0x30);
+    aw8695_i2c_write(aw8695, AW8695_REG_BSTDBG2, 0xeb);
+    aw8695_i2c_write(aw8695, AW8695_REG_BSTDBG3, 0xd4);
+    aw8695_i2c_write(aw8695, AW8695_REG_TSET, 0x12);
+    aw8695_i2c_write(aw8695, AW8695_REG_R_SPARE, 0x68);
+
+    aw8695_i2c_write_bits(aw8695, AW8695_REG_ANADBG,
+            AW8695_BIT_ANADBG_IOC_MASK, AW8695_BIT_ANADBG_IOC_4P65A);
+
+    aw8695_haptic_set_bst_peak_cur(aw8695, AW8695_DEFAULT_PEAKCUR);
+
+    aw8695_haptic_swicth_motorprotect_config(aw8695, 0x00, 0x00);
+
+    aw8695_haptic_auto_boost_config(aw8695, false);
+
+    aw8695_haptic_trig_param_init(aw8695);
+    aw8695_haptic_trig_param_config(aw8695);
+
+    aw8695_haptic_cont_vbat_mode(aw8695,
+            AW8695_HAPTIC_CONT_VBAT_HW_COMP_MODE);
+    aw8695->ram_vbat_comp = AW8695_HAPTIC_RAM_VBAT_COMP_ENABLE;
+
+
+    /* update cali step */
+    aw8695_i2c_write(aw8695, AW8695_REG_TRIM_LRA, (char)f0_cali_lra);
+    aw8695_i2c_read(aw8695, AW8695_REG_TRIM_LRA, &reg_val);
+    pr_info("%s final trim_lra=0x%02x\n", __func__, reg_val);
+
+    return ret;
+}
+
 
 /*****************************************************
  *