From a38078ae67a818482c6c5db1eb6887db0b6562e9 Mon Sep 17 00:00:00 2001
From: mark <mcampbellsmith@gmail.com>
Date: Tue, 30 Apr 2013 21:03:46 +1000
Subject: i9305: clean up dock audio configuration

Separate the dock configuration for analogue-dock and digital-dock.
Previous configuration meant the analogue-dock configuration for
AUDIO_DEVICE_OUT_ANLG_DOCK_HEADSET was never applied

Change-Id: I0239cf13bf6e8e85cf8033b91e1832e10f9b3315
---
 audio/audio_hw.c    |  4 ++--
 configs/tiny_hw.xml | 21 ++++++++++++++++++++-
 2 files changed, 22 insertions(+), 3 deletions(-)

diff --git a/audio/audio_hw.c b/audio/audio_hw.c
index bbf776c..f05df17 100644
--- a/audio/audio_hw.c
+++ b/audio/audio_hw.c
@@ -2950,8 +2950,8 @@ static const struct {
     { AUDIO_DEVICE_OUT_SPEAKER, "speaker" },
     { AUDIO_DEVICE_OUT_WIRED_HEADSET | AUDIO_DEVICE_OUT_WIRED_HEADPHONE, "headphone" },
     { AUDIO_DEVICE_OUT_EARPIECE, "earpiece" },
-    { AUDIO_DEVICE_OUT_ANLG_DOCK_HEADSET, "dock" },
-    { AUDIO_DEVICE_OUT_DGTL_DOCK_HEADSET, "dock" },
+    { AUDIO_DEVICE_OUT_ANLG_DOCK_HEADSET, "analogue-dock" },
+    { AUDIO_DEVICE_OUT_DGTL_DOCK_HEADSET, "digital-dock" },
     { AUDIO_DEVICE_OUT_ALL_SCO, "sco-out" },
     { AUDIO_DEVICE_OUT_AUX_DIGITAL, "aux-digital" },
 
diff --git a/configs/tiny_hw.xml b/configs/tiny_hw.xml
index 6cfc499..ae3d8a6 100644
--- a/configs/tiny_hw.xml
+++ b/configs/tiny_hw.xml
@@ -213,7 +213,26 @@ We are able to have most of our routing static so do that
         <ctl name="AIF2DAC2R Mixer AIF1.1 Switch" val="0"/>
     </path>
 </device>
-<device name="dock">
+<device name="analogue-dock">
+    <path name="on">
+        <ctl name="LINEOUT2N Switch" val="1"/>
+        <ctl name="LINEOUT2P Switch" val="1"/>
+        <ctl name="LINEOUT2N Mixer Left Output Switch" val="1"/>
+        <ctl name="LINEOUT2N Mixer Right Output Switch" val="0"/>
+        <ctl name="LINEOUT2P Mixer Right Output Switch" val="1"/>
+        <ctl name="LINE Switch" val="1"/>
+        <ctl name="LineoutSwitch Mode" val="1"/>
+        <ctl name="Left Output Mixer DAC Volume" val="7"/>
+        <ctl name="Right Output Mixer DAC Volume" val="7"/>
+    </path>
+    <path name="off">
+        <ctl name="LineoutSwitch Mode" val="0"/>
+        <ctl name="LINEOUT2N Switch" val="0"/>
+        <ctl name="LINEOUT2P Switch" val="0"/>
+        <ctl name="LINE Switch" val="0"/>
+    </path>
+</device>
+<device name="digital-dock">
     <path name="on">
         <ctl name="LINEOUT2N Switch" val="1"/>
         <ctl name="LINEOUT2P Switch" val="1"/>
-- 
cgit v1.1