From b85434c16ffe031270e6c8c62bd26fc46ddce37f Mon Sep 17 00:00:00 2001
From: Daniel Hillenbrand <codeworkx@cyanogenmod.org>
Date: Sat, 13 Apr 2013 12:33:40 +0000
Subject: p31xx: add support for dock audio

Change-Id: I35363baf1d0ad4930bee049faf6e8ae25ad94211
---
 configs/audio_policy.conf | 9 +--------
 configs/tiny_hw.xml       | 2 +-
 2 files changed, 2 insertions(+), 9 deletions(-)

(limited to 'configs')

diff --git a/configs/audio_policy.conf b/configs/audio_policy.conf
index f483979..72249cf 100644
--- a/configs/audio_policy.conf
+++ b/configs/audio_policy.conf
@@ -26,7 +26,7 @@ audio_hw_modules {
         sampling_rates 44100
         channel_masks AUDIO_CHANNEL_OUT_STEREO
         formats AUDIO_FORMAT_PCM_16_BIT
-        devices AUDIO_DEVICE_OUT_EARPIECE|AUDIO_DEVICE_OUT_SPEAKER|AUDIO_DEVICE_OUT_WIRED_HEADSET|AUDIO_DEVICE_OUT_WIRED_HEADPHONE|AUDIO_DEVICE_OUT_ALL_SCO
+        devices AUDIO_DEVICE_OUT_EARPIECE|AUDIO_DEVICE_OUT_SPEAKER|AUDIO_DEVICE_OUT_WIRED_HEADSET|AUDIO_DEVICE_OUT_WIRED_HEADPHONE|AUDIO_DEVICE_OUT_ALL_SCO|AUDIO_DEVICE_OUT_ANLG_DOCK_HEADSET|AUDIO_DEVICE_OUT_AUX_DIGITAL|AUDIO_DEVICE_OUT_DGTL_DOCK_HEADSET
         flags AUDIO_OUTPUT_FLAG_PRIMARY
       }
       deep_buffer {
@@ -36,13 +36,6 @@ audio_hw_modules {
         devices AUDIO_DEVICE_OUT_SPEAKER|AUDIO_DEVICE_OUT_WIRED_HEADSET|AUDIO_DEVICE_OUT_WIRED_HEADPHONE
         flags AUDIO_OUTPUT_FLAG_DEEP_BUFFER
       }
-      hdmi {
-        sampling_rates 44100|48000
-        channel_masks dynamic
-        formats AUDIO_FORMAT_PCM_16_BIT
-        devices AUDIO_DEVICE_OUT_AUX_DIGITAL
-        flags AUDIO_OUTPUT_FLAG_DIRECT
-      }
     }
     inputs {
       primary {
diff --git a/configs/tiny_hw.xml b/configs/tiny_hw.xml
index 9a22e4a..49d71ea 100644
--- a/configs/tiny_hw.xml
+++ b/configs/tiny_hw.xml
@@ -166,7 +166,7 @@ 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="analog-dock">
+<device name="dock">
     <path name="on">
         <ctl name="LINEOUT1N Switch" val="1"/>
         <ctl name="LINEOUT1P Switch" val="1"/>
-- 
cgit v1.1