hal: Add snd card support for atoll target
Add snd card support for all variants of
atoll target.
Change-Id: If6e21efa9c74925c19900f539eed0f2cc9bd4534
diff --git a/hal/Android.mk b/hal/Android.mk
index 6e47039..5fb3322 100644
--- a/hal/Android.mk
+++ b/hal/Android.mk
@@ -92,6 +92,7 @@
ifneq ($(filter atoll,$(TARGET_BOARD_PLATFORM)),)
LOCAL_CFLAGS := -DPLATFORM_ATOLL
LOCAL_CFLAGS += -DMAX_TARGET_SPECIFIC_CHANNEL_CNT="4"
+ LOCAL_CFLAGS += -DINCALL_STEREO_CAPTURE_ENABLED
endif
ifneq ($(filter sdm660,$(TARGET_BOARD_PLATFORM)),)
LOCAL_CFLAGS := -DPLATFORM_MSMFALCON
diff --git a/hal/audio_extn/hfp.c b/hal/audio_extn/hfp.c
index 55551dc..1088a0c 100644
--- a/hal/audio_extn/hfp.c
+++ b/hal/audio_extn/hfp.c
@@ -66,7 +66,7 @@
defined (PLATFORM_QCS605) || defined (PLATFORM_MSMNILE) || \
defined (PLATFORM_KONA) || defined (PLATFORM_MSMSTEPPE) || \
defined (PLATFORM_QCS405) || defined (PLATFORM_TRINKET) || \
- defined (PLATFORM_LITO)
+ defined (PLATFORM_LITO) || defined(PLATFORM_ATOLL)
#define HFP_RX_VOLUME "SLIMBUS_7 LOOPBACK Volume"
#else
#define HFP_RX_VOLUME "Internal HFP RX Volume"
diff --git a/hal/audio_extn/sndmonitor.c b/hal/audio_extn/sndmonitor.c
index 9e460f0..7b3e0a0 100644
--- a/hal/audio_extn/sndmonitor.c
+++ b/hal/audio_extn/sndmonitor.c
@@ -224,6 +224,7 @@
(strncasecmp(card_id, "apq", 3) != 0) &&
(strncasecmp(card_id, "sa", 2) != 0) &&
(strncasecmp(card_id, "kona", 4) != 0) &&
+ (strncasecmp(card_id, "atoll", 5) != 0) &&
(strncasecmp(card_id, "lito", 4) != 0)) {
ALOGW("Skip over non-ADSP snd card %s", card_id);
continue;
diff --git a/hal/msm8974/hw_info.c b/hal/msm8974/hw_info.c
old mode 100755
new mode 100644
index 7dfa819..89b4ffc
--- a/hal/msm8974/hw_info.c
+++ b/hal/msm8974/hw_info.c
@@ -525,6 +525,12 @@
} else if (!strncmp(snd_card_name, "lito-mtp-snd-card",
sizeof("lito-mtp-snd-card"))) {
strlcpy(hw_info->name, "lito", sizeof(hw_info->name));
+ } else if (!strncmp(snd_card_name, "atoll-idp-snd-card",
+ sizeof("atoll-idp-snd-card"))) {
+ strlcpy(hw_info->name, "atoll", sizeof(hw_info->name));
+ } else if (!strncmp(snd_card_name, "atoll-wcd937x-snd-card",
+ sizeof("atoll-wcd937x-snd-card"))) {
+ strlcpy(hw_info->name, "atoll", sizeof(hw_info->name));
} else if (!strncmp(snd_card_name, "kona-qrd-snd-card",
sizeof("kona-qrd-snd-card"))) {
strlcpy(hw_info->name, "kona", sizeof(hw_info->name));
@@ -803,7 +809,8 @@
} else if (strstr(snd_card_name, "sda845")) {
ALOGV("SDA845 - variant soundcard");
update_hardware_info_sda845(hw_info, snd_card_name);
- } else if (strstr(snd_card_name, "kona") || strstr(snd_card_name, "lito")) {
+ } else if (strstr(snd_card_name, "kona") || strstr(snd_card_name, "lito")
+ || strstr(snd_card_name, "atoll")) {
ALOGV("KONA - variant soundcard");
update_hardware_info_kona(hw_info, snd_card_name);
} else if(strstr(snd_card_name, "sdm439")) {
diff --git a/hal/msm8974/platform.c b/hal/msm8974/platform.c
index 6e7bafd..fd9d06b 100644
--- a/hal/msm8974/platform.c
+++ b/hal/msm8974/platform.c
@@ -1670,7 +1670,11 @@
!strncmp(snd_card_name, "sm6150-wcd9375qrd-snd-card",
sizeof("sm6150-wcd9375qrd-snd-card")) ||
!strncmp(snd_card_name, "sm6150-wcd9375-snd-card",
- sizeof("sm6150-wcd9375-snd-card"))) {
+ sizeof("sm6150-wcd9375-snd-card")) ||
+ !strncmp(snd_card_name, "atoll-wcd937x-snd-card",
+ sizeof("atoll-wcd937x-snd-card")) ||
+ !strncmp(snd_card_name, "atoll-idp-snd-card",
+ sizeof("atoll-idp-snd-card"))) {
ALOGI("%s: snd_card_name: %s",__func__,snd_card_name);
my_data->is_internal_codec = true;
my_data->is_slimbus_interface = false;
@@ -3454,6 +3458,7 @@
if (!strncmp(snd_card_name, "sm6150", strlen("sm6150")) ||
!strncmp(snd_card_name, "kona", strlen("kona")) ||
!strncmp(snd_card_name, "lito", strlen("lito")) ||
+ !strncmp(snd_card_name, "atoll", strlen("atoll")) ||
!strncmp(snd_card_name, "trinket", strlen("trinket"))) {
my_data->current_backend_cfg[DEFAULT_CODEC_BACKEND].bitwidth_mixer_ctl =
strdup("WSA_CDC_DMA_RX_0 Format");
diff --git a/hal/msm8974/platform.h b/hal/msm8974/platform.h
index 3816f77..f638b44 100644
--- a/hal/msm8974/platform.h
+++ b/hal/msm8974/platform.h
@@ -667,7 +667,7 @@
#define FM_RX_VOLUME "PRI MI2S LOOPBACK Volume"
#elif defined (PLATFORM_MSM8996) || defined (PLATFORM_KONA)
#define FM_RX_VOLUME "Tert MI2S LOOPBACK Volume"
-#elif defined (PLATFORM_MSM8998) || defined (PLATFORM_SDM845) || defined (PLATFORM_MSMFALCON) || defined (PLATFORM_SDM710) || defined (PLATFORM_QCS605) || defined (PLATFORM_MSMNILE) || defined (PLATFORM_MSMSTEPPE) || defined (PLATFORM_QCS405) || defined (PLATFORM_TRINKET) || defined (PLATFORM_LITO)
+#elif defined (PLATFORM_MSM8998) || defined (PLATFORM_SDM845) || defined (PLATFORM_MSMFALCON) || defined (PLATFORM_SDM710) || defined (PLATFORM_QCS605) || defined (PLATFORM_MSMNILE) || defined (PLATFORM_MSMSTEPPE) || defined (PLATFORM_QCS405) || defined (PLATFORM_TRINKET) || defined (PLATFORM_LITO) || defined (PLATFORM_ATOLL)
#define FM_RX_VOLUME "SLIMBUS_8 LOOPBACK Volume"
#else
#define FM_RX_VOLUME "Internal FM RX Volume"