From: zhangjiaquan <zhangjiaquan@huaqin.com>
Date: Mon, 19 Nov 2018 07:48:32 +0000 (-0500)
Subject: (CR):[Kane]audio:update audio-parameter-for cs-11-19
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=3ba29fa20701f362f8ccb6fef745cbd12b4620e5;p=GitHub%2FLineageOS%2Fandroid_kernel_motorola_exynos9610.git

(CR):[Kane]audio:update audio-parameter-for cs-11-19

1,update aac audio-parameters
2,change the name sec to qisheng
3,increase timeout
4,firmware loading timeout issue

Change-Id: If82d9f595940698d594d0978dbdab20171b07946
Signed-off-by: zhangjiaquan <zhangjiaquan@huaqin.com>
---

diff --git a/arch/arm64/boot/dts/exynos/exynos9609-robusta2_evb.dts b/arch/arm64/boot/dts/exynos/exynos9609-robusta2_evb.dts
index eeb59055f84d..9b7abc0ec8e2 100755
--- a/arch/arm64/boot/dts/exynos/exynos9609-robusta2_evb.dts
+++ b/arch/arm64/boot/dts/exynos/exynos9609-robusta2_evb.dts
@@ -1754,25 +1754,25 @@
 						cirrus,wmfw-file = "cs35l41-dsp1-prot.wmfw";
 						cirrus,bin-file = "cs35l41-dsp1-spk-prot-notification-aac.bin";
 					};
-					protection_music_sec {
+					protection_music_qisheng {
 						cirrus,full-name;
 						cirrus,wmfw-file = "cs35l41-dsp1-prot.wmfw";
-						cirrus,bin-file = "cs35l41-dsp1-spk-prot-music-sec.bin";
+						cirrus,bin-file = "cs35l41-dsp1-spk-prot-music-qisheng.bin";
 					};
-					protection_voice_sec {
+					protection_voice_qisheng {
 						cirrus,full-name;
 						cirrus,wmfw-file = "cs35l41-dsp1-prot.wmfw";
-						cirrus,bin-file = "cs35l41-dsp1-spk-prot-voice-sec.bin";
+						cirrus,bin-file = "cs35l41-dsp1-spk-prot-voice-qisheng.bin";
 					};
-					protection_ringtone_sec{
+					protection_ringtone_qisheng{
 						cirrus,full-name;
 						cirrus,wmfw-file = "cs35l41-dsp1-prot.wmfw";
-						cirrus,bin-file = "cs35l41-dsp1-spk-prot-ringtone-sec.bin";
+						cirrus,bin-file = "cs35l41-dsp1-spk-prot-ringtone-qisheng.bin";
 					};
-					protection_notification_sec {
+					protection_notification_qisheng {
 						cirrus,full-name;
 						cirrus,wmfw-file = "cs35l41-dsp1-prot.wmfw";
-						cirrus,bin-file = "cs35l41-dsp1-spk-prot-notification-sec.bin";
+						cirrus,bin-file = "cs35l41-dsp1-spk-prot-notification-qisheng.bin";
 					};
 					calibration_aac {
 						cirrus,full-name;
diff --git a/sound/soc/codecs/cs35l41.c b/sound/soc/codecs/cs35l41.c
index ba1731f1d705..77dc57511b1f 100755
--- a/sound/soc/codecs/cs35l41.c
+++ b/sound/soc/codecs/cs35l41.c
@@ -153,10 +153,11 @@ static int cs35l41_dsp_power_ev(struct snd_soc_dapm_widget *w,
 
 		return 0;
 	case SND_SOC_DAPM_PRE_PMD:
-		if (cs35l41->halo_booted == false) {
+	     //if (cs35l41->halo_booted == false) {
 			wm_halo_early_event(w, kcontrol, event);
 			wm_halo_event(w, kcontrol, event);
-		}
+	     //}
+             cs35l41->halo_booted = false;
 	default:
 		return 0;
 	}
diff --git a/sound/soc/codecs/cs35l41.h b/sound/soc/codecs/cs35l41.h
index 9a75eae48de0..81d2b0ddc94e 100755
--- a/sound/soc/codecs/cs35l41.h
+++ b/sound/soc/codecs/cs35l41.h
@@ -731,7 +731,7 @@ extern const struct cs35l41_otp_map_element_t
 				cs35l41_otp_map_map[CS35L41_NUM_OTP_MAPS];
 
 #define CS35L41_REGSTRIDE			4
-#define CS35L41_MBOXWAIT			5
+#define CS35L41_MBOXWAIT			50
 
 #define CS35L41_DSP_VIRT1_MBOX_SHIFT		20
 #define CS35L41_DSP_VIRT2_MBOX_SHIFT		21