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

Commit 07f96d11 authored by Thierry Strudel's avatar Thierry Strudel
Browse files

audio: add sm8150 into support platform list 



Bug: 113969703
Test: build pass
Change-Id: Ic0e99aa9bd25790920f9cc13e42c0bd2de815fe6
Signed-off-by: default avatarRobert Lee <lerobert@google.com>
Signed-off-by: default avatarThierry Strudel <tstrudel@google.com>
parent 509f0a7c

Android.mk

+1 −1
Original line number Diff line number Diff line 
# TODO:  Find a better way to separate build configs for ADP vs non-ADP devices

ifneq ($(TARGET_BOARD_AUTO),true)

  ifneq ($(filter msm8960 msm8226 msm8x26 msm8x84 msm8084 msm8992 msm8994 msm8996 msm8909 msm8952 msm8998 sdm845 sdm710,$(TARGET_BOARD_PLATFORM)),)

  ifneq ($(filter msm8960 msm8226 msm8x26 msm8x84 msm8084 msm8992 msm8994 msm8996 msm8909 msm8952 msm8998 sdm845 sdm710 sm8150,$(TARGET_BOARD_PLATFORM)),)



    MY_LOCAL_PATH := $(call my-dir)

hal/Android.mk

+8 −1
Original line number Diff line number Diff line
@@ -10,7 +10,7 @@ AUDIO_PLATFORM := $(TARGET_BOARD_PLATFORM) 
ifneq ($(filter msm8960,$(TARGET_BOARD_PLATFORM)),)

  LOCAL_CFLAGS += -DMAX_TARGET_SPECIFIC_CHANNEL_CNT="2"

endif

ifneq ($(filter msm8974 msm8226 msm8084 msm8992 msm8994 msm8996 msm8998 sdm845 sdm710,$(TARGET_BOARD_PLATFORM)),)

ifneq ($(filter msm8974 msm8226 msm8084 msm8992 msm8994 msm8996 msm8998 sdm845 sdm710 sm8150,$(TARGET_BOARD_PLATFORM)),)

  # B-family platform uses msm8974 code base

  AUDIO_PLATFORM = msm8974

ifneq ($(filter msm8974,$(TARGET_BOARD_PLATFORM)),)
@@ -62,6 +62,13 @@ ifneq ($(filter sdm710,$(TARGET_BOARD_PLATFORM)),) 
  LOCAL_CFLAGS += -DINCALL_STEREO_CAPTURE_ENABLED

  MULTIPLE_HW_VARIANTS_ENABLED := true

endif

ifneq ($(filter sm8150,$(TARGET_BOARD_PLATFORM)),)

  LOCAL_CFLAGS := -DPLATFORM_SM8150

  LOCAL_CFLAGS += -DMAX_TARGET_SPECIFIC_CHANNEL_CNT="4"

  LOCAL_CFLAGS += -DINCALL_MUSIC_ENABLED

  LOCAL_CFLAGS += -DINCALL_STEREO_CAPTURE_ENABLED

  MULTIPLE_HW_VARIANTS_ENABLED := true

endif

endif



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

hal/msm8974/platform.c

+6 −6
Original line number Diff line number Diff line
@@ -30,7 +30,7 @@ 
#include "platform.h"

#include "audio_extn.h"

#include <linux/msm_audio.h>

#if defined (PLATFORM_MSM8996) || (PLATFORM_MSM8998) || (PLATFORM_SDM845) || (PLATFORM_SDM710)

#if defined (PLATFORM_MSM8996) || (PLATFORM_MSM8998) || (PLATFORM_SDM845) || (PLATFORM_SDM710) || (PLATFORM_SM8150)

#include <sound/devdep_params.h>

#endif
@@ -143,7 +143,7 @@ struct platform_data { 
    bool speaker_lr_swap;



    void *acdb_handle;

#if defined (PLATFORM_MSM8994) || (PLATFORM_MSM8996) || (PLATFORM_MSM8998) || (PLATFORM_SDM845) || (PLATFORM_SDM710)

#if defined (PLATFORM_MSM8994) || (PLATFORM_MSM8996) || (PLATFORM_MSM8998) || (PLATFORM_SDM845) || (PLATFORM_SDM710) || (PLATFORM_SM8150)

    acdb_init_v2_cvd_t acdb_init;

#elif defined (PLATFORM_MSM8084)

    acdb_init_v2_t acdb_init;
@@ -773,7 +773,7 @@ static const char *get_operator_specific_device_mixer_path(snd_device_t snd_devi 


inline bool platform_supports_app_type_cfg()

{

#if defined (PLATFORM_MSM8998) || (PLATFORM_SDM845) || (PLATFORM_SDM710)

#if defined (PLATFORM_MSM8998) || (PLATFORM_SDM845) || (PLATFORM_SDM710) || (PLATFORM_SM8150)

    return true;

#else

    return false;
@@ -1379,7 +1379,7 @@ static int platform_acdb_init(void *platform) 
        return 0;

    }



#if defined (PLATFORM_MSM8994) || (PLATFORM_MSM8996) || (PLATFORM_MSM8998) || (PLATFORM_SDM845) || (PLATFORM_SDM710)

#if defined (PLATFORM_MSM8994) || (PLATFORM_MSM8996) || (PLATFORM_MSM8998) || (PLATFORM_SDM845) || (PLATFORM_SDM710) || (PLATFORM_SM8150)

    char *cvd_version = calloc(1, MAX_CVD_VERSION_STRING_SIZE);

    if (!cvd_version)

        ALOGE("failed to allocate cvd_version");
@@ -1748,7 +1748,7 @@ void *platform_init(struct audio_device *adev) 
        configure_flicker_sensor_input(adev->mixer);

#endif



#if defined (PLATFORM_MSM8994) || (PLATFORM_MSM8996) || (PLATFORM_MSM8998) || (PLATFORM_SDM845) || (PLATFORM_SDM710)

#if defined (PLATFORM_MSM8994) || (PLATFORM_MSM8996) || (PLATFORM_MSM8998) || (PLATFORM_SDM845) || (PLATFORM_SDM710) || (PLATFORM_SM8150)

        acdb_init_v2_cvd_t acdb_init_local;

        acdb_init_local = (acdb_init_v2_cvd_t)dlsym(my_data->acdb_handle,

                                              "acdb_loader_init_v2");
@@ -4540,7 +4540,7 @@ int platform_set_sidetone(struct audio_device *adev, 
int platform_get_mmap_data_fd(void *platform __unused, int fe_dev __unused, int dir __unused,

                              int *fd __unused, uint32_t *size __unused)

{

#if defined (PLATFORM_MSM8996) || (PLATFORM_MSM8998) || (PLATFORM_SDM845) || (PLATFORM_SDM710)

#if defined (PLATFORM_MSM8996) || (PLATFORM_MSM8998) || (PLATFORM_SDM845) || (PLATFORM_SDM710) || (PLATFORM_SM8150)

    struct platform_data *my_data = (struct platform_data *)platform;

    struct audio_device *adev = my_data->adev;

    int hw_fd = -1;

post_proc/Android.mk

+2 −2
Original line number Diff line number Diff line 
ifneq ($(filter msm8974 msm8226 msm8084 msm8992 msm8994 msm8996 msm8909 msm8998 sdm845 sdm710,$(TARGET_BOARD_PLATFORM)),)

ifneq ($(filter msm8974 msm8226 msm8084 msm8992 msm8994 msm8996 msm8909 msm8998 sdm845 sdm710 sm8150,$(TARGET_BOARD_PLATFORM)),)



LOCAL_PATH:= $(call my-dir)
@@ -43,7 +43,7 @@ endif 


################################################################################



ifneq ($(filter msm8992 msm8994 msm8996 msm8909 msm8998 sdm845 sdm710,$(TARGET_BOARD_PLATFORM)),)

ifneq ($(filter msm8992 msm8994 msm8996 msm8909 msm8998 sdm845 sdm710 sm8150,$(TARGET_BOARD_PLATFORM)),)



include $(CLEAR_VARS)