From 11dd22384f2ae13ec4a7563ce5f0a113cf30a53c Mon Sep 17 00:00:00 2001 From: Uday Kishore Pasupuleti Date: Wed, 24 Jun 2015 14:18:01 -0700 Subject: hal: fix to load wcd9330 mixer path file Load wcd9330 specific mixer path file on the platform where wcd9330 sound card used. Change-Id: I5578922ba01d9308b885848900f886a977cbd10b Signed-off-by: Uday Kishore Pasupuleti --- hal/msm8974/platform.c | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/hal/msm8974/platform.c b/hal/msm8974/platform.c index 7ba0bf06..921c384a 100644 --- a/hal/msm8974/platform.c +++ b/hal/msm8974/platform.c @@ -28,6 +28,7 @@ #include "platform.h" #define MIXER_XML_PATH "/system/etc/mixer_paths.xml" +#define MIXER_XML_PATH_WCD9330 "/system/etc/mixer_paths_wcd9330.xml" #define LIB_ACDB_LOADER "libacdbloader.so" #define AUDIO_DATA_BLOCK_MIXER_CTL "HDMI EDID" @@ -678,7 +679,15 @@ void *platform_init(struct audio_device *adev) snd_card_name = mixer_get_name(adev->mixer); ALOGD("%s: snd_card_name: %s", __func__, snd_card_name); - adev->audio_route = audio_route_init(snd_card_num, MIXER_XML_PATH); + if (!strncmp(snd_card_name, "msm8226-tomtom-snd-card", + sizeof("msm8226-tomtom-snd-card"))) { + ALOGD("%s: Call MIXER_XML_PATH_WCD9330", __func__); + adev->audio_route = audio_route_init(snd_card_num, + MIXER_XML_PATH_WCD9330); + } else { + adev->audio_route = audio_route_init(snd_card_num, MIXER_XML_PATH); + } + if (!adev->audio_route) { ALOGE("%s: Failed to init audio route controls, aborting.", __func__); return NULL; -- cgit v1.2.3