From c41dfe622f863ca6d37fb3687a30aa491b847dcc Mon Sep 17 00:00:00 2001 From: Sangchul Lee Date: Thu, 17 Dec 2015 12:53:12 +0900 Subject: [PATCH] [target-tm1/audio] Modify asound.conf and add audio_hw.xml for tm1 target Change-Id: I38b4fe8389b6c87d64b2ded600202bd9dfb23f63 Signed-off-by: Sangchul Lee --- mmfw-sysconf-target-tm1/etc/asound.conf | 49 +++---------------- mmfw-sysconf-target-tm1/usr/etc/audio_hw.xml | 51 ++++++++++++++++++++ packaging/mmfw-sysconf.spec | 3 +- 3 files changed, 61 insertions(+), 42 deletions(-) create mode 100644 mmfw-sysconf-target-tm1/usr/etc/audio_hw.xml diff --git a/mmfw-sysconf-target-tm1/etc/asound.conf b/mmfw-sysconf-target-tm1/etc/asound.conf index f717a3e..289d7d1 100644 --- a/mmfw-sysconf-target-tm1/etc/asound.conf +++ b/mmfw-sysconf-target-tm1/etc/asound.conf @@ -1,50 +1,17 @@ -pcm. !default { - type asym - playback.pcm { - type hw - card 0 - device 0 - } - capture.pcm { - type hw - card 0 - device 0 - } -} - -ctl. !default { - type hw - card 0 -} +# default sound configuration for sprd6820 -pcm. AIF2{ - type hw - card 0 - device 1 - format S16_LE - channels 2 - rate 8000 -} - -pcm. AIF3{ +pcm. !default { type hw - card 0 - device 2 - format S16_LE - channels 2 - rate 8000 + card sprdphone + device 0 } -pcm. AIF4{ +ctl. !default { type hw - card 0 - device 4 - format S16_LE - channels 2 - rate 44100 + card sprdphone } -ctl. wm1811 { +ctl. sprdphone { type hw - card 0 + card sprdphone } diff --git a/mmfw-sysconf-target-tm1/usr/etc/audio_hw.xml b/mmfw-sysconf-target-tm1/usr/etc/audio_hw.xml new file mode 100644 index 0000000..a49df9f --- /dev/null +++ b/mmfw-sysconf-target-tm1/usr/etc/audio_hw.xml @@ -0,0 +1,51 @@ + + + + diff --git a/packaging/mmfw-sysconf.spec b/packaging/mmfw-sysconf.spec index 70c0868..0e512aa 100644 --- a/packaging/mmfw-sysconf.spec +++ b/packaging/mmfw-sysconf.spec @@ -2,7 +2,7 @@ Name: mmfw-sysconf Summary: Multimedia Framework system configuration package -Version: 0.2.35 +Version: 0.2.36 Release: 0 Group: Multimedia/Configuration License: Apache-2.0 @@ -230,6 +230,7 @@ rm -rf %{_datadir}/mmfw-sysconf-simulator %{_datadir}/mmfw-sysconf-target-tm1/usr/etc/*.ini %{_datadir}/mmfw-sysconf-target-tm1/usr/etc/gst-openmax.conf %{_datadir}/mmfw-sysconf-target-tm1/usr/etc/gst-tz-openmax.conf +%{_datadir}/mmfw-sysconf-target-tm1/usr/etc/audio_hw.xml %{_datadir}/mmfw-sysconf-target-tm1/usr/share/pulseaudio/alsa-mixer/paths/*.conf %{_datadir}/mmfw-sysconf-target-tm1/usr/share/pulseaudio/alsa-mixer/paths/*.common %{_datadir}/mmfw-sysconf-target-tm1/usr/share/pulseaudio/alsa-mixer/profile-sets/*.conf -- 2.34.1