Audio config: Remove aic326x
We don't have the device or the codec.
Log before this change:
V/nvaudio_hw(154): Invalid card name tegraaic326x tegramax9808
V/nvaudio_hw(154): PCM config for invalid alsa_device
Change-Id: I18689b4c3d4bc96bca20f7bb5d1522d0eb3af16f
diff --git a/configs/asound.conf b/configs/asound.conf
index 3639326..51e0d53 100644
--- a/configs/asound.conf
+++ b/configs/asound.conf
@@ -2,7 +2,7 @@
# ALSA library configuration file
#
-pcm.!default {
+pcm.default {
type plug
slave {
pcm "hw:tegramax98088,0"
@@ -11,7 +11,7 @@
}
}
-ctl.!default {
+ctl.default {
type hw
card tegramax98088
}
@@ -202,79 +202,3 @@
}
capture.pcm "voice"
}
-
-pcm.default_aic326x {
- type plug
- slave {
- pcm "hw:tegraaic326x,0"
- channels 2
- rate 48000
- }
-}
-
-ctl.default_aic326x {
- type hw
- card tegraaic326x
-}
-
-pcm.music-aic326x {
- type plug
- slave {
- pcm "hw:tegraaic326x,0"
- channels 2
- rate 48000
- }
-}
-
-pcm.voice-aic326x {
- type plug
- slave {
- pcm "hw:tegraaic326x,2"
- channels 1
- rate 8000
- }
-}
-
-pcm.voice_call-aic326x {
- type plug
- slave {
- pcm "hw:tegraaic326x,3"
- channels 2
- rate 48000
- }
-}
-
-pcm.bt_voice_call-aic326x {
- type plug
- slave {
- pcm "hw:tegraaic326x,4"
- channels 1
- rate 8000
- }
-}
-
-pcm.music_and_voice-aic326x {
- type asym
-
- playback.pcm {
- type plug
-
- slave.pcm {
- type multi
-
- slaves.a.pcm music-aic326x
- slaves.b.pcm voice-aic326x
- slaves.a.channels 2
- slaves.b.channels 1
-
- bindings.0.slave a
- bindings.0.channel 0
- bindings.1.slave a
- bindings.1.channel 1
- bindings.2.slave b
- bindings.2.channel 0
- }
- route_policy duplicate
- }
- capture.pcm "voice-aic326x"
-}
diff --git a/configs/nvaudio_conf.xml b/configs/nvaudio_conf.xml
index 18e8c99..6b931de 100644
--- a/configs/nvaudio_conf.xml
+++ b/configs/nvaudio_conf.xml
@@ -383,204 +383,4 @@
</device>
</fm_playback>
</alsa_device>
-
-
- <alsa_device name="music"
- card_id="1"
- card_name="tegraaic326x"
- device_id="0">
- <pcm_config rate="48000"
- channels="2"
- bps="16"
- period_size="1024"
- period_count="4"
- start_threshold="4095"
- stop_threshold="4096"
- silence_threshold="0"
- avail_min="1"/>
-
- <path>
- <!--playback paths-->
- <ctl name="PCM Playback Volume" val="150"/>
- <ctl name="Speaker Amplifier Volume" val="1"/>
- <ctl name="Receiver Amplifier Volume" val="10"/>
- <ctl name="LOL Output Mixer LDAC Switch" val="1"/>
- <ctl name="LOR Output Mixer RDAC Switch" val="1"/>
- <ctl name="SPKL Output Mixer LOL Volume" val="10"/>
- <ctl name="SPKR Output Mixer LOR Volume" val="10"/>
- <ctl name="REC Output Mixer LOL-B2 Volume" val="10"/>
- <ctl name="REC Output Mixer LOR-B2 Volume" val="10"/>
- <ctl name="HPL Output Mixer LDAC Switch" val="1"/>
- <ctl name="HPR Output Mixer RDAC Switch" val="1"/>
- <ctl name="Minidsp mode" val="0"/>
- <!--capture paths-->
- <ctl name="Left Input Mixer IN2L Switch" val="1"/>
- <ctl name="Right Input Mixer IN2R Switch" val="1"/>
- <ctl name="Left Input Mixer CM1L Switch" val="1"/>
- <ctl name="Right Input Mixer CM1R Switch" val="1"/>
- <ctl name="Left Input Mixer CM2L Switch" val="1"/>
- <ctl name="Mic Bias ext independent enable" val="1"/>
- <ctl name="Input CM mode" val="1"/>
- <ctl name="Left Input Mixer IN1L Switch" val="1"/>
- <ctl name="Left Input Mixer CM1L Switch" val="1"/>
- <ctl name="MICBIAS_EXT ON" val="1"/>
- <ctl name="MICBIAS EXT Power Level" val="0"/>
- </path>
-
- <playback>
- <device name="headphone">
- <path name="on">
- <ctl name="Headphone Jack Switch" val="1"/>
- </path>
- <path name="off">
- <ctl name="Headphone Jack Switch" val="0"/>
- </path>
- </device>
- <device name="speaker">
- <path name="on">
- <ctl name="Int Spk Switch" val="1"/>
- </path>
- <path name="off">
- <ctl name="Int Spk Switch" val="0"/>
- </path>
- </device>
- <device name="earpiece">
- <path name="on">
- <ctl name="Earpiece Switch" val="1"/>
- </path>
- <path name="off">
- <ctl name="Earpiece Switch" val="0"/>
- </path>
- </device>
- </playback>
-
- <capture>
- <pcm_config start_threshold="1"/>
-
- <device name="builtin-mic">
- <path name="on">
- <ctl name="Int Mic Switch" val="1"/>
- </path>
- <path name="off">
- <ctl name="Int Mic Switch" val="0"/>
- </path>
- </device>
- <device name="headset-mic">
- <path name="on">
- <ctl name="Mic Jack Switch" val="1"/>
- </path>
- <path name="off">
- <ctl name="Mic Jack Switch" val="0"/>
- </path>
- </device>
- </capture>
- </alsa_device>
-
- <alsa_device name="voice"
- card_id="1"
- card_name="tegraaic326x"
- device_id="2">
- <pcm_config rate="8000"
- channels="1"
- bps="16"
- period_size="256"
- period_count="4"
- start_threshold="1023"
- stop_threshold="1024"
- silence_threshold="0"
- avail_min="1"/>
- <playback>
- <device name="bt-sco"/>
- </playback>
-
- <capture>
- <pcm_config start_threshold="1"/>
- <device name="bt-sco-mic"/>
- </capture>
- </alsa_device>
-
- <alsa_device name ="voice-call"
- card_id="1"
- card_name="tegraaic326x"
- device_id="3">
- <pcm_config rate="48000"
- channels="2"
- bps="16"/>
- <voice-call>
- <path name="on">
- <ctl name="Call Mode Switch" val="1"/>
- <ctl name="Minidsp mode" val="1"/>
- <ctl name="ASI2OUT Route" val="ASI1 Out"/>
- <ctl name="DAC MiniDSP IN2 Route" val="ASI1 In"/>
- <ctl name="DAC MiniDSP IN1 Route" val="ASI2 In"/>
- <ctl name="MicPGA Volume Control" val="50"/>
- </path>
- <path name="off">
- <ctl name="Call Mode Switch" val="0"/>
- <ctl name="Minidsp mode" val="0"/>
- </path>
-
- <device name="headphone">
- <path name="on">
- <ctl name="Headphone Jack Switch" val="1"/>
- </path>
- <path name="off">
- <ctl name="Headphone Jack Switch" val="0"/>
- </path>
- </device>
- <device name="speaker">
- <path name="on">
- <ctl name="Int Spk Switch" val="1"/>
- </path>
- <path name="off">
- <ctl name="Int Spk Switch" val="0"/>
- </path>
- </device>
- <device name="earpiece">
- <path name="on">
- <ctl name="Earpiece Switch" val="1"/>
- </path>
- <path name="off">
- <ctl name="Earpiece Switch" val="0"/>
- </path>
- </device>
- <device name="builtin-mic">
- <path name="on">
- <ctl name="Int Mic Switch" val="1"/>
- </path>
- <path name="off">
- <ctl name="Int Mic Switch" val="0"/>
- </path>
- </device>
- <device name="headset-mic">
- <path name="on">
- <ctl name="Mic Jack Switch" val="1"/>
- </path>
- <path name="off">
- <ctl name="Mic Jack Switch" val="0"/>
- </path>
- </device>
- </voice-call>
- </alsa_device>
-
- <alsa_device name ="bt-voice-call"
- card_id="1"
- card_name="tegraaic326x"
- device_id="4">
- <pcm_config rate="8000"
- channels="1"
- bps="16"/>
- <voice-call>
- <path name="on">
- <at node="dev/ttyACM2" cmd="at%iaudcnf=4\r\n"/>
- <ctl name="Call Mode Switch" val="1"/>
- </path>
- <path name="off">
- <ctl name="Call Mode Switch" val="0"/>
- </path>
-
- <device name="bt-sco"/>
- <device name="bt-sco-mic"/>
- </voice-call>
- </alsa_device>
</AudioConfigs>