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

Commit 0d28b4a9 authored by Naresh Tanniru's avatar Naresh Tanniru
Browse files

hal: 8952 hal bringup 

- Add support for 8952 build varient

- Add support for 8952 sound card detection

Change-Id: Ia18de3417f4ff95e01a2257185911765e7a021ec
parent c2224fd7

Android.mk

+1 −1
Original line number Diff line number Diff line 
ifneq ($(filter mpq8092 msm8960 msm8226 msm8x26 msm8610 msm8974 msm8x74 apq8084 msm8916 msm8994 msm8992 msm8909 msm8996,$(TARGET_BOARD_PLATFORM)),)

ifneq ($(filter mpq8092 msm8960 msm8226 msm8x26 msm8610 msm8974 msm8x74 apq8084 msm8916 msm8994 msm8992 msm8909 msm8996 msm8952,$(TARGET_BOARD_PLATFORM)),)



MY_LOCAL_PATH := $(call my-dir)

hal/Android.mk

+1 −1
Original line number Diff line number Diff line
@@ -32,7 +32,7 @@ ifneq ($(filter msm8996,$(TARGET_BOARD_PLATFORM)),) 
endif

endif



ifneq ($(filter msm8916 msm8909,$(TARGET_BOARD_PLATFORM)),)

ifneq ($(filter msm8916 msm8909 msm8952,$(TARGET_BOARD_PLATFORM)),)

  AUDIO_PLATFORM = msm8916

  MULTIPLE_HW_VARIANTS_ENABLED := true

  LOCAL_CFLAGS := -DPLATFORM_MSM8916

hal/msm8916/hw_info.c

+20 −2
Original line number Diff line number Diff line
@@ -216,8 +216,26 @@ static void update_hardware_info_8x16(struct hardware_info *hw_info, const char 
        hw_info->snd_devices = NULL;

        hw_info->num_snd_devices = 0;

        strlcpy(hw_info->dev_extn, "", sizeof(hw_info->dev_extn));

    }  else if (!strcmp(snd_card_name, "msm8952-snd-card")) {

        strlcpy(hw_info->type, "", sizeof(hw_info->type));

        strlcpy(hw_info->name, "msm8952", sizeof(hw_info->name));

        hw_info->snd_devices = NULL;

        hw_info->num_snd_devices = 0;

        strlcpy(hw_info->dev_extn, "", sizeof(hw_info->dev_extn));

    } else if (!strcmp(snd_card_name, "msm8952-snd-card-mtp")) {

        strlcpy(hw_info->type, "", sizeof(hw_info->type));

        strlcpy(hw_info->name, "msm8952", sizeof(hw_info->name));

        hw_info->snd_devices = NULL;

        hw_info->num_snd_devices = 0;

        strlcpy(hw_info->dev_extn, "", sizeof(hw_info->dev_extn));

    } else if (!strcmp(snd_card_name, "msm8952-tomtom-snd-card")) {

        strlcpy(hw_info->type, "", sizeof(hw_info->type));

        strlcpy(hw_info->name, "msm8952", sizeof(hw_info->name));

        hw_info->snd_devices = NULL;

        hw_info->num_snd_devices = 0;

        strlcpy(hw_info->dev_extn, "", sizeof(hw_info->dev_extn));

    } else {

        ALOGW("%s: Not an  8x16/8939/8909 device", __func__);

        ALOGW("%s: Not an  8x16/8939/8909/8952 device", __func__);

    }

}
@@ -232,7 +250,7 @@ void *hw_info_init(const char *snd_card_name) 
    }



    if (strstr(snd_card_name, "msm8x16") || strstr(snd_card_name, "msm8939") ||

        strstr(snd_card_name, "msm8909")) {

        strstr(snd_card_name, "msm8909") || strstr(snd_card_name, "msm8952")) {

        ALOGV("8x16 - variant soundcard");

        update_hardware_info_8x16(hw_info, snd_card_name);

    } else {

hal/msm8916/platform.c

+15 −0
Original line number Diff line number Diff line
@@ -789,6 +789,21 @@ static void query_platform(const char *snd_card_name, 
        msm_device_to_be_id = msm_device_to_be_id_internal_codec;

        msm_be_id_array_len  =

            sizeof(msm_device_to_be_id_external_codec) / sizeof(msm_device_to_be_id_internal_codec[0]);

    } else if (!strncmp(snd_card_name, "msm8952-snd-card-mtp",

                 sizeof("msm8952-snd-card-mtpmsm8952-snd-card-mtp"))) {

        strlcpy(mixer_xml_path, MIXER_XML_PATH_MTP,

                sizeof(MIXER_XML_PATH_MTP));

        msm_device_to_be_id = msm_device_to_be_id_internal_codec;

        msm_be_id_array_len  =

            sizeof(msm_device_to_be_id_internal_codec) / sizeof(msm_device_to_be_id_internal_codec[0]);

    }  else if (!strncmp(snd_card_name, "msm8952-tomtom-snd-card",

                 sizeof("msm8952-tomtom-snd-card"))) {

        strlcpy(mixer_xml_path, MIXER_XML_PATH_WCD9330,

                sizeof(MIXER_XML_PATH_WCD9330));

        msm_device_to_be_id = msm_device_to_be_id_external_codec;

        msm_be_id_array_len  =

            sizeof(msm_device_to_be_id_external_codec) / sizeof(msm_device_to_be_id_external_codec[0]);



    } else {

        strlcpy(mixer_xml_path, MIXER_XML_PATH,

                sizeof(MIXER_XML_PATH));

hal/msm8916/platform.h

+0 −12
Original line number Diff line number Diff line
@@ -219,17 +219,6 @@ enum { 
#define PLAYBACK_OFFLOAD_DEVICE 9



#ifdef MULTIPLE_OFFLOAD_ENABLED

#ifdef PLATFORM_APQ8084

#define PLAYBACK_OFFLOAD_DEVICE2 17

#define PLAYBACK_OFFLOAD_DEVICE3 18

#define PLAYBACK_OFFLOAD_DEVICE4 34

#define PLAYBACK_OFFLOAD_DEVICE5 35

#define PLAYBACK_OFFLOAD_DEVICE6 36

#define PLAYBACK_OFFLOAD_DEVICE7 37

#define PLAYBACK_OFFLOAD_DEVICE8 38

#define PLAYBACK_OFFLOAD_DEVICE9 39

#endif

#if defined (PLATFORM_MSM8994)

#define PLAYBACK_OFFLOAD_DEVICE2 17

#define PLAYBACK_OFFLOAD_DEVICE3 18

#define PLAYBACK_OFFLOAD_DEVICE4 37
@@ -239,7 +228,6 @@ enum { 
#define PLAYBACK_OFFLOAD_DEVICE8 41

#define PLAYBACK_OFFLOAD_DEVICE9 42

#endif

#endif



#define COMPRESS_VOIP_CALL_PCM_DEVICE 3