Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0b79d7db authored by Faiz Nabi Kuchay's avatar Faiz Nabi Kuchay Committed by Aditya Bavanari
Browse files

hal: Add snd card support for atoll target 

Add snd card support for all variants of
atoll target.

Change-Id: If6e21efa9c74925c19900f539eed0f2cc9bd4534
parent 274c95af

hal/Android.mk

+1 −0
Original line number Diff line number Diff line
@@ -92,6 +92,7 @@ endif 
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

hal/audio_extn/hfp.c

+1 −1
Original line number Diff line number Diff line
@@ -66,7 +66,7 @@ IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.*/ 
      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"

hal/audio_extn/sndmonitor.c

+1 −0
Original line number Diff line number Diff line
@@ -224,6 +224,7 @@ static int enum_sndcards() 
            (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;

hal/msm8974/hw_info.c

100755 → 100644
+8 −1
Original line number Diff line number Diff line
@@ -525,6 +525,12 @@ static void update_hardware_info_kona( 
    } 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 @@ void *hw_info_init(const char *snd_card_name) 
    } 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")) {

hal/msm8974/platform.c

+6 −1
Original line number Diff line number Diff line
@@ -1670,7 +1670,11 @@ static void update_codec_type_and_interface(struct platform_data * my_data, 
         !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 @@ acdb_init_fail: 
        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");