i9300: audio: update hal

Brings the audio in line with i9305, n7100, n7105

Fixes various issues.
Only bug left now is audio stutter in real racing 3
which is probably due to the lovely hwcomposer.

Change-Id: I67b0df685e4175b248d2f75608c47cb2bfe85527

1 files changed, 18 insertions, 21 deletions

diff --git a/audio/audio_hw.h b/audio/audio_hw.h
index f882959..ae7905e 100644
--- a/audio/audio_hw.h
+++ b/audio/audio_hw.h
@@ -118,8 +118,6 @@ struct route_setting
 };
 
 struct route_setting voicecall_default[] = {
-    { .ctl_name = "AIF2DACL Source", .intval = 0, },
-    { .ctl_name = "AIF2DACR Source", .intval = 0, },
     { .ctl_name = "AIF2 Mode", .intval = 0, },
     { .ctl_name = "DAC1L Mixer AIF1.1 Switch", .intval = 1, },
     { .ctl_name = "DAC1R Mixer AIF1.1 Switch", .intval = 1, },
@@ -130,20 +128,20 @@ struct route_setting voicecall_default[] = {
 };
 
 struct route_setting voicecall_default_disable[] = {
-    { .ctl_name = "AIF2DACL Source", .intval = 0, },
-    { .ctl_name = "AIF2DACR Source", .intval = 1, },
     { .ctl_name = "AIF2 Mode", .intval = 0, },
     { .ctl_name = "DAC1L Mixer AIF2 Switch", .intval = 0, },
     { .ctl_name = "DAC1R Mixer AIF2 Switch", .intval = 0, },
     { .ctl_name = "AIF2DAC Mux", .strval = "AIF3DACDAT", },
     { .ctl_name = "Main Mic Switch", .intval = 0, },
     { .ctl_name = "MIXINL IN1L Switch", .intval = 0, },
+    { .ctl_name = "Sub Mic Switch", .intval = 0, },
+    { .ctl_name = "MIXINR IN1R Switch", .intval = 0, },
     { .ctl_name = NULL, },
 };
 
 struct route_setting default_input[] = {
     { .ctl_name = "Main Mic Switch", .intval = 1, },
-    { .ctl_name = "IN1L Volume", .intval = 30, },
+    { .ctl_name = "IN1L Volume", .intval = 28, },
     { .ctl_name = "MIXINL IN1L Switch", .intval = 1, },
     { .ctl_name = "MIXINL IN1L Volume", .intval = 0, },
     { .ctl_name = "AIF1ADC1 HPF Mode", .intval = 0, },
@@ -153,7 +151,7 @@ struct route_setting default_input[] = {
 
 struct route_setting default_input_disable[] = {
     { .ctl_name = "Main Mic Switch", .intval = 0, },
-    { .ctl_name = "IN1L Volume", .intval = 22, },
+    { .ctl_name = "IN1L Volume", .intval = 4, },
     { .ctl_name = "MIXINL IN1L Switch", .intval = 0, },
     { .ctl_name = "AIF1ADC1 HPF Switch", .intval = 0, },
     { .ctl_name = NULL, },
@@ -165,7 +163,6 @@ struct route_setting noise_suppression[] = {
     { .ctl_name = "MIXINR IN1R Switch", .intval = 1, },
     { .ctl_name = "MIXINR IN1R Volume", .intval = 0, },
     { .ctl_name = "AIF1ADCR Source", .intval = 1, },
-    { .ctl_name = "AIF2ADCR Source", .intval = 1, },
     { .ctl_name = NULL, },
 };
 
@@ -181,15 +178,14 @@ struct route_setting headset_input[] = {
     { .ctl_name = "MIXINL IN1L Switch", .intval = 0, },
     { .ctl_name = "MIXINR IN1R Switch", .intval = 0, },
     { .ctl_name = "Headset Mic Switch", .intval = 1, },
-    { .ctl_name = "IN2L Volume", .intval = 30, },
+    { .ctl_name = "IN2L Volume", .intval = 18, },
     { .ctl_name = "MIXINL IN2L Switch", .intval = 1, },
     { .ctl_name = "MIXINL IN2L Volume", .intval = 0, },
-    { .ctl_name = "AIF1ADC1 HPF Mode", .intval = 0, },
+    { .ctl_name = "AIF1ADC1 HPF Mode", .intval = 1, },
     { .ctl_name = "AIF1ADC1 HPF Switch", .intval = 1, },
     { .ctl_name = "AIF1ADC1 Volume", .intval = 96, },
     { .ctl_name = "AIF1ADCL Source", .intval = 0, },
     { .ctl_name = "AIF1ADCR Source", .intval = 0, },
-    { .ctl_name = "AIF2ADCL Source", .intval = 0, },
     { .ctl_name = NULL, },
 };
 
@@ -202,24 +198,23 @@ struct route_setting headset_input_disable[] = {
 };
 
 struct route_setting bt_output[] = {
+    { .ctl_name = "AIF1DAC1 Volume", .intval = 96, },
+    { .ctl_name = "AIF1 Boost Volume", .intval = 0, },
+    { .ctl_name = "DAC2 Volume", .intval = 96, },
+    { .ctl_name = "AIF2ADC Volume", .intval = 96, },
     { .ctl_name = "DAC1L Mixer AIF1.1 Switch", .intval = 1, },
     { .ctl_name = "DAC1R Mixer AIF1.1 Switch", .intval = 1, },
     { .ctl_name = "AIF3ADC Mux", .intval = 1, },
     { .ctl_name = "AIF2DAC2L Mixer AIF1.1 Switch", .intval = 1, },
     { .ctl_name = "AIF2DAC2R Mixer AIF1.1 Switch", .intval = 1, },
     { .ctl_name = "AIF2DAC Volume", .intval = 96, },
-    { .ctl_name = "DAC2 Volume", .intval = 96, },
-    { .ctl_name = "AIF2ADC Volume", .intval = 96, },
-    { .ctl_name = "Speaker Mixer Volume", .intval = 1, },
-    { .ctl_name = "MIXINL IN2L Volume", .intval = 1, },
-    { .ctl_name = "IN1L Volume", .intval = 25, },
-    { .ctl_name = "IN1R Volume", .intval = 25, },
-    { .ctl_name = "Speaker Boost Volume", .intval = 4, },
+    { .ctl_name = "MIXINL IN1L Volume", .intval = 1, },
+    { .ctl_name = "IN1L Volume", .intval = 28, },
+    { .ctl_name = "IN1R Volume", .intval = 28, },
     { .ctl_name = "LINEOUT1N Switch", .intval = 0, },
     { .ctl_name = "LINEOUT1P Switch", .intval = 0, },
-    { .ctl_name = "AIF2DACR Source", .intval = 0, },
     { .ctl_name = "AIF1ADC1 HPF Switch", .intval = 0, },
-    { .ctl_name = "AIF2ADC HPF Mode", .intval = 1, },
+    { .ctl_name = "AIF2ADC HPF Mode", .intval = 3, },
     { .ctl_name = "AIF2ADC HPF Switch", .intval = 1, },
     { .ctl_name = "AIF2DAC Mux", .strval = "AIF2DACDAT", },
     { .ctl_name = "AIF2DAC2R Mixer AIF2 Switch", .intval = 1, },
@@ -231,8 +226,6 @@ struct route_setting bt_input[] = {
     { .ctl_name = "AIF2ADC Mux", .intval = 1, },
     { .ctl_name = "AIF1ADCL Source", .intval = 0, },
     { .ctl_name = "AIF1ADCR Source", .intval = 1, },
-    { .ctl_name = "AIF2ADCL Source", .intval = 0, },
-    { .ctl_name = "AIF2ADCR Source", .intval = 1, },
     { .ctl_name = "DAC1L Mixer AIF2 Switch", .intval = 1, },
     { .ctl_name = "DAC1R Mixer AIF2 Switch", .intval = 1, },
     { .ctl_name = "AIF1ADC1R Mixer AIF2 Switch", .intval = 1, },
@@ -243,6 +236,10 @@ struct route_setting bt_input[] = {
 };
 
 struct route_setting bt_disable[] = {
+    { .ctl_name = "AIF1DAC1 Volume", .intval = 96, },
+    { .ctl_name = "AIF1 Boost Volume", .intval = 0, },
+    { .ctl_name = "DAC2 Volume", .intval = 96, },
+    { .ctl_name = "AIF2ADC Volume", .intval = 96, },
     { .ctl_name = "AIF2ADC Mux", .intval = 0, },
     { .ctl_name = "MIXINL IN2L Volume", .intval = 0, },
     { .ctl_name = "LINEOUT1N Switch", .intval = 1, },