From 18e0cfd6524d042a59183f266be0766d2d15a34c Mon Sep 17 00:00:00 2001
From: yaozm1 <yaozm1@lenovo.com>
Date: Mon, 20 Dec 2021 17:23:26 +0800
Subject: [PATCH] asoc:upgrade aw88261 driver to v1.9.0.3

integrate awinic's aw88261 release;
version: 1.9.0.3

Change-Id: I8a1b52089cff107d09faf89ed9c5381ea4b7803b
Signed-off-by: yaozm1 <yaozm1@lenovo.com>
Reviewed-on: https://gerrit.mot.com/2149458
SLTApproved: Slta Waiver
SME-Granted: SME Approvals Granted
Tested-by: Jira Key
Reviewed-by: Hujun Liao <liaohj@motorola.com>
Reviewed-by: Xiangpo Zhao <zhaoxp3@motorola.com>
Submit-Approved: Jira Key
---
 asoc/codecs/aw88261/aw882xx.c   | 30 ++++++++++++++----------------
 asoc/codecs/aw88261/aw_device.c |  2 +-
 asoc/codecs/aw88261/aw_dsp.c    |  2 +-
 3 files changed, 16 insertions(+), 18 deletions(-)

diff --git a/asoc/codecs/aw88261/aw882xx.c b/asoc/codecs/aw88261/aw882xx.c
index c7bc965d85fa..3505912bcd42 100644
--- a/asoc/codecs/aw88261/aw882xx.c
+++ b/asoc/codecs/aw88261/aw882xx.c
@@ -12,7 +12,7 @@
  * option) any later version.
  */
 
-#define DEBUG
+/*#define DEBUG*/
 #include <linux/module.h>
 #include <linux/i2c.h>
 #include <sound/core.h>
@@ -35,7 +35,7 @@
 #include "aw_log.h"
 #include "aw_dsp.h"
 
-#define AW882XX_DRIVER_VERSION "v1.9.0.2"
+#define AW882XX_DRIVER_VERSION "v1.9.0.3"
 #define AW882XX_I2C_NAME "aw882xxacf_smartpa"
 
 #define AW_READ_CHIPID_RETRIES		5	/* 5 times */
@@ -1530,7 +1530,7 @@ static int aw882xx_get_algo_prof_id_by_scene_st(struct aw882xx *aw882xx)
 		return aw882xx_scene_state[index].skt_profile_id;
 	}
 
-	return AW_ALGO_PROFILE_ID_0;
+	return 0;
 }
 
 static void aw882xx_update_algo_scene_st(struct aw882xx *aw882xx,
@@ -1563,28 +1563,26 @@ static int aw882xx_update_algo_profile(struct aw882xx *aw882xx)
 	aw_dev_info(aw882xx->dev, "enter");
 
 	new_skt_prof_id = aw882xx_get_algo_prof_id_by_scene_st(aw882xx);
-	if (new_skt_prof_id > AW_ALGO_PROFILE_ID_MAX) {
+	if (new_skt_prof_id < AW_ALGO_PROFILE_ID_1) {
 		/* no active scene */
 		aw_dev_info(aw882xx->dev, "all scene disactive,do nothing");
 		return 0;
 	}
 
-	if (cur_skt_prof_id != new_skt_prof_id) {
-		aw_dev_info(aw882xx->dev, "algo scene switch. [new] %d,[old] %d",
-					new_skt_prof_id, cur_skt_prof_id);
+	aw_dev_info(aw882xx->dev, "algo scene switch. [new] %d,[old] %d", 
+			new_skt_prof_id, cur_skt_prof_id);
 		aw882xx->cur_algo_prof_id = new_skt_prof_id;
 		aw_dev = aw882xx->aw_pa;
 
-		/* set new scene pramas to skt */
-		ret = aw_dev_set_algo_prof(aw_dev, aw882xx->cur_algo_prof_id);
-		if (ret < 0) {
-			aw_dev_err(aw882xx->dev, "set algo prof failed");
-			return -1;
-		}
-	} else {
-		aw_dev_info(aw882xx->dev, "algo scene hold, cur scene %d",
-					new_skt_prof_id);
+	/* set new scene pramas to skt */
+	ret = aw_dev_set_algo_prof(aw_dev, aw882xx->cur_algo_prof_id);
+	if (ret < 0) {
+		aw_dev_err(aw882xx->dev, "set algo prof failed");
+		return -1;
 	}
+		
+	aw_dev_info(aw882xx->dev, "algo scene hold, cur scene %d", 
+					new_skt_prof_id);
 
 	return 0;
 
diff --git a/asoc/codecs/aw88261/aw_device.c b/asoc/codecs/aw88261/aw_device.c
index 6e1a44747a5a..bb2608e2d5d0 100644
--- a/asoc/codecs/aw88261/aw_device.c
+++ b/asoc/codecs/aw88261/aw_device.c
@@ -1,4 +1,4 @@
- #define DEBUG 
+/* #define DEBUG */
 #include <linux/module.h>
 #include <linux/i2c.h>
 #include <sound/core.h>
diff --git a/asoc/codecs/aw88261/aw_dsp.c b/asoc/codecs/aw88261/aw_dsp.c
index 808ad98d6e2a..eabb7764526f 100644
--- a/asoc/codecs/aw88261/aw_dsp.c
+++ b/asoc/codecs/aw88261/aw_dsp.c
@@ -1,4 +1,4 @@
-#define DEBUG
+/*#define DEBUG*/
 #include <linux/module.h>
 #include <linux/debugfs.h>
 #include <asm/ioctls.h>