From 50680f56b82f1b1cfae22dc6e989e5ebf2f41691 Mon Sep 17 00:00:00 2001
From: xkeita <keita_nya@live.jp>
Date: Sat, 20 May 2017 06:05:28 +0000
Subject: shinano-common: audio: audio_platform_config imports

- Used snd_soc_msm_Taiko (from Honami WCD9320) config file for old audio
  HAL as reference for ACDB IDs
- Fixed some ACDB IDs for speaker outputs, everything that Honami uses
  as 14 for us it's 15.
- Updated some alias from our mixer_paths.xml
- Reverted back to original bt-sco acdbid.
- Deleted Speaker-Safe, for us, it's Speaker-protected- ID's are good.

Change-Id: Id6fb72cc32ba9a3afcc5a54914844a86efe21156
---
 audio/audio_platform_info.xml | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

(limited to 'audio/audio_platform_info.xml')

diff --git a/audio/audio_platform_info.xml b/audio/audio_platform_info.xml
index 83ab430..2a32fea 100644
--- a/audio/audio_platform_info.xml
+++ b/audio/audio_platform_info.xml
@@ -28,8 +28,10 @@
     <acdb_ids>
         <!-- Output devices -->
         <device name="SND_DEVICE_OUT_SPEAKER" acdb_id="15" />
-        <device name="SND_DEVICE_OUT_SPEAKER_AND_HEADPHONES" acdb_id="15" />
+        <device name="SND_DEVICE_OUT_SPEAKER_REVERSE" acdb_id="15" />
         <device name="SND_DEVICE_OUT_VOICE_SPEAKER" acdb_id="15" />
+        <device name="SND_DEVICE_OUT_SPEAKER_AND_HDMI" acdb_id="15" />
+        <device name="SND_DEVICE_OUT_SPEAKER_AND_USB_HEADSET" acdb_id="15" />
 
         <!-- Input devices -->
         <device name="SND_DEVICE_IN_CAMCORDER_MIC" acdb_id="544" />
@@ -41,7 +43,7 @@
         <device name="SND_DEVICE_OUT_HANDSET" backend="handset" />
         <device name="SND_DEVICE_OUT_SPEAKER" backend="speaker" />
         <device name="SND_DEVICE_OUT_SPEAKER_REVERSE" backend="speaker" />
-        <device name="SND_DEVICE_OUT_SPEAKER_SAFE" backend="speaker" />
+        <device name="SND_DEVICE_OUT_SPEAKER_PROTECTED" backend="speaker" />
         <device name="SND_DEVICE_OUT_SPEAKER_AND_HEADPHONES" backend="speaker-and-headphones" />
         <device name="SND_DEVICE_OUT_VOICE_HANDSET" backend="handset" />
         <device name="SND_DEVICE_OUT_VOICE_SPEAKER" backend="speaker" />
@@ -51,10 +53,9 @@
 
     <device_names>
         <!-- Output devices -->
-        <device name="SND_DEVICE_OUT_SPEAKER_SAFE" alias="speaker-protected" />
         <device name="SND_DEVICE_OUT_VOICE_HAC_HANDSET" alias="voice-handset-hac" />
 
       <!-- Input devices -->
-        <device name="SND_DEVICE_IN_HDMI_MIC" alias="hdmi-mic" />
+        <device name="SND_DEVICE_IN_HDMI_MIC" alias="hdmi-tx" />
     </device_names>
 </audio_platform_info>
-- 
cgit v1.2.3