From 76cf1a7dac84a931f6006a7a8d99e60d56183633 Mon Sep 17 00:00:00 2001
From: Dheeraj CVR <cvr.dheeraj@gmail.com>
Date: Mon, 4 Aug 2014 05:55:14 +0530
Subject: audio: make builtin mic and back mic volumes consistent

Change-Id: I25cab57acb84a14200006e832a43676ff3c8b9d0
---
 audio/audio_hw.c | 5 -----
 audio/audio_hw.h | 7 +------
 2 files changed, 1 insertion(+), 11 deletions(-)

(limited to 'audio')

diff --git a/audio/audio_hw.c b/audio/audio_hw.c
index e32acf0..d32596b 100644
--- a/audio/audio_hw.c
+++ b/audio/audio_hw.c
@@ -88,7 +88,6 @@ struct m0_audio_device {
     struct m0_dev_cfg *dev_cfgs;
     int num_dev_cfgs;
     struct mixer *mixer;
-    struct mixer_ctls mixer_ctls;
     audio_mode_t mode;
     int active_out_device;
     int out_device;
@@ -3020,10 +3019,6 @@ static int adev_open(const hw_module_t* module, const char* name,
         return -EINVAL;
     }
 
-    /* +30db boost for mics */
-    adev->mixer_ctls.mixinl_in1l_volume = mixer_get_ctl_by_name(adev->mixer, "MIXINL IN1L Volume");
-    adev->mixer_ctls.mixinl_in2l_volume = mixer_get_ctl_by_name(adev->mixer, "MIXINL IN2L Volume");
-
     ret = adev_config_parse(adev);
     if (ret != 0)
         goto err_mixer;
diff --git a/audio/audio_hw.h b/audio/audio_hw.h
index 33930a7..bcb7485 100644
--- a/audio/audio_hw.h
+++ b/audio/audio_hw.h
@@ -97,12 +97,6 @@ enum output_type {
     OUTPUT_TOTAL
 };
 
-struct mixer_ctls
-{
-    struct mixer_ctl *mixinl_in1l_volume;
-    struct mixer_ctl *mixinl_in2l_volume;
-};
-
 struct route_setting
 {
     char *ctl_name;
@@ -143,6 +137,7 @@ struct route_setting default_input[] = {
     { .ctl_name = "AIF2ADCR Source", .intval = 1, },
     { .ctl_name = "MIXINR IN1R Switch", .intval = 1, },
     { .ctl_name = "IN1L Volume", .intval = 25, },
+    { .ctl_name = "IN1R Volume", .intval = 25, },
     { .ctl_name = "MIXINL IN1L Volume", .intval = 0, },
     { .ctl_name = "DAC2 Left Sidetone Volume", .intval = 12, },
     { .ctl_name = "DAC2 Right Sidetone Volume", .intval = 12, },
-- 
cgit v1.1