From 09bfb85b157588d4fde842337c851176de5524c8 Mon Sep 17 00:00:00 2001 From: Konstantin Makariev Date: Thu, 21 Nov 2019 08:14:21 -0600 Subject: [PATCH] aw8697: decouple haptics and calibration wave forms Awinic AW8697 uses special wave form for oscillator calibration only. This commit decouples haptics and calibration wave form files. Change-Id: I94d32e8ce472a1d8a62a2c0287645682d44077a4 Signed-off-by: Konstantin Makariev Reviewed-on: https://gerrit.mot.com/1459130 SLTApproved: Slta Waiver SME-Granted: SME Approvals Granted Tested-by: Jira Key Reviewed-by: Konstantin Makariev Submit-Approved: Jira Key --- drivers/misc/awinic/aw8697/aw8697.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/drivers/misc/awinic/aw8697/aw8697.c b/drivers/misc/awinic/aw8697/aw8697.c index 0dcc50354938..3831da29e3ba 100644 --- a/drivers/misc/awinic/aw8697/aw8697.c +++ b/drivers/misc/awinic/aw8697/aw8697.c @@ -64,9 +64,9 @@ struct pm_qos_request pm_qos_req_vb; ******************************************************/ #define AW8697_RTP_NAME_MAX 64 static char *aw8697_ram_name = "aw8697_haptic.bin"; +static char *aw8697_cali_name = "aw8697_osc_rtp_24K_5s.bin"; static char aw8697_rtp_name[][AW8697_RTP_NAME_MAX] = { - {"aw8697_osc_rtp_24K_5s.bin"}, - {"aw8697_rtp.bin"}, + {"aw8697_rtp.bin"}, {"aw8697_rtp_lighthouse.bin"}, {"aw8697_rtp_silk.bin"}, }; @@ -1424,11 +1424,11 @@ static int aw8697_rtp_osc_calibration(struct aw8697 *aw8697) pr_info("%s enter\n", __func__); /* fw loaded */ ret = request_firmware(&rtp_file, - aw8697_rtp_name[0],/*aw8697->rtp_file_num */ + aw8697_cali_name, aw8697->dev); if (ret < 0) { pr_err("%s: failed to read %s\n", __func__, - aw8697_rtp_name[0]);/*aw8697->rtp_file_num */ + aw8697_cali_name); return ret; } /*awinic add stop,for irq interrupt during calibrate*/ @@ -1446,7 +1446,7 @@ static int aw8697_rtp_osc_calibration(struct aw8697 *aw8697) aw8697_rtp->len = rtp_file->size; aw8697->rtp_len = rtp_file->size; pr_info("%s: rtp file [%s] size = %d\n", __func__, - aw8697_rtp_name[0], aw8697_rtp->len);/*aw8697->rtp_file_num */ + aw8697_cali_name, aw8697_rtp->len); memcpy(aw8697_rtp->data, rtp_file->data, rtp_file->size); release_firmware(rtp_file); mutex_unlock(&aw8697->rtp_lock);