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

Commit bba1bee2 authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "audio: make sure audio hal compile for qcs605"

parents c4c174c0 5accc8d0

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 msm8952 msm8937 thorium msm8953 msmgold msm8998 sdm660 sdm845 sdm670 apq8098_latv,$(TARGET_BOARD_PLATFORM)),)

ifneq ($(filter mpq8092 msm8960 msm8226 msm8x26 msm8610 msm8974 msm8x74 apq8084 msm8916 msm8994 msm8992 msm8909 msm8996 msm8952 msm8937 thorium msm8953 msmgold msm8998 sdm660 sdm845 sdm670 apq8098_latv qcs605,$(TARGET_BOARD_PLATFORM)),)



MY_LOCAL_PATH := $(call my-dir)

hal/Android.mk

+5 −2
Original line number Diff line number Diff line
@@ -8,7 +8,7 @@ LOCAL_ARM_MODE := arm 


AUDIO_PLATFORM := $(TARGET_BOARD_PLATFORM)



ifneq ($(filter msm8974 msm8226 msm8610 apq8084 msm8994 msm8992 msm8996 msm8998 apq8098_latv sdm845 sdm670,$(TARGET_BOARD_PLATFORM)),)

ifneq ($(filter msm8974 msm8226 msm8610 apq8084 msm8994 msm8992 msm8996 msm8998 apq8098_latv sdm845 sdm670 qcs605,$(TARGET_BOARD_PLATFORM)),)

  # B-family platform uses msm8974 code base

  AUDIO_PLATFORM = msm8974

  MULTIPLE_HW_VARIANTS_ENABLED := true
@@ -39,6 +39,9 @@ endif 
ifneq ($(filter sdm670,$(TARGET_BOARD_PLATFORM)),)

  LOCAL_CFLAGS := -DPLATFORM_SDM670

endif

ifneq ($(filter qcs605,$(TARGET_BOARD_PLATFORM)),)

  LOCAL_CFLAGS := -DPLATFORM_QCS605

endif

endif



ifneq ($(filter msm8916 msm8909 msm8952 msm8937 thorium msm8953 msmgold sdm660,$(TARGET_BOARD_PLATFORM)),)
@@ -65,7 +68,7 @@ LOCAL_SRC_FILES += audio_extn/audio_extn.c \ 
LOCAL_C_INCLUDES += $(TARGET_OUT_INTERMEDIATES)/KERNEL_OBJ/usr/include

LOCAL_C_INCLUDES += $(TARGET_OUT_INTERMEDIATES)/KERNEL_OBJ/usr/techpack/audio/include

LOCAL_ADDITIONAL_DEPENDENCIES += $(TARGET_OUT_INTERMEDIATES)/KERNEL_OBJ/usr

ifneq ($(filter sdm670,$(TARGET_BOARD_PLATFORM)),)

ifneq ($(filter sdm670 qcs605,$(TARGET_BOARD_PLATFORM)),)

  LOCAL_C_INCLUDES += $(TARGET_OUT_INTERMEDIATES)/vendor/qcom/opensource/audio-kernel/include

  LOCAL_ADDITIONAL_DEPENDENCIES += $(BOARD_VENDOR_KERNEL_MODULES)

endif

hal/audio_extn/hfp.c

+1 −1
Original line number Diff line number Diff line
@@ -55,7 +55,7 @@ IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.*/ 
#define HFP_RX_VOLUME     "SEC AUXPCM LOOPBACK Volume"

#elif defined PLATFORM_MSM8996

#define HFP_RX_VOLUME     "PRI AUXPCM LOOPBACK Volume"

#elif defined (PLATFORM_MSM8998) || defined (PLATFORM_MSMFALCON) || defined (PLATFORM_SDM845) || defined (PLATFORM_SDM670)

#elif defined (PLATFORM_MSM8998) || defined (PLATFORM_MSMFALCON) || defined (PLATFORM_SDM845) || defined (PLATFORM_SDM670) || defined (PLATFORM_QCS605)

#define HFP_RX_VOLUME     "SLIMBUS_7 LOOPBACK Volume"

#else

#define HFP_RX_VOLUME     "Internal HFP RX Volume"

hal/msm8974/platform.c

+2 −2
Original line number Diff line number Diff line
@@ -77,7 +77,7 @@ 
#endif



#include <linux/msm_audio.h>

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

#if defined (PLATFORM_MSM8998) || (PLATFORM_SDM845) || (PLATFORM_SDM670) || defined (PLATFORM_QCS605)

#include <sound/devdep_params.h>

#endif
@@ -7640,7 +7640,7 @@ int platform_get_supported_sampling_rate_on_hdmi(uint32_t stream_sr) 
    return sample_rate;

}



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

#if defined (PLATFORM_MSM8998) || (PLATFORM_SDM845) || (PLATFORM_SDM670) || defined (PLATFORM_QCS605)

int platform_get_mmap_data_fd(void *platform, int fe_dev, int dir, int *fd,

                              uint32_t *size)

{

hal/msm8974/platform.h

+3 −3
Original line number Diff line number Diff line
@@ -362,11 +362,11 @@ enum { 
#define PLAYBACK_OFFLOAD_DEVICE 9



// Direct_PCM

#if defined (PLATFORM_MSM8994) || defined (PLATFORM_MSM8996) || defined (PLATFORM_APQ8084) || defined (PLATFORM_MSM8998) || defined (PLATFORM_SDM845) || defined (PLATFORM_SDM670)

#if defined (PLATFORM_MSM8994) || defined (PLATFORM_MSM8996) || defined (PLATFORM_APQ8084) || defined (PLATFORM_MSM8998) || defined (PLATFORM_SDM845) || defined (PLATFORM_SDM670) ||defined (PLATFORM_QCS605)

#define PLAYBACK_OFFLOAD_DEVICE2 17

#endif



#if defined (PLATFORM_APQ8084) || defined (PLATFORM_MSM8996) || defined (PLATFORM_MSM8998) || defined (PLATFORM_SDM845) || defined (PLATFORM_SDM670)

#if defined (PLATFORM_APQ8084) || defined (PLATFORM_MSM8996) || defined (PLATFORM_MSM8998) || defined (PLATFORM_SDM845) || defined (PLATFORM_SDM670) || defined(PLATFORM_QCS605)

#define PLAYBACK_OFFLOAD_DEVICE3 18

#define PLAYBACK_OFFLOAD_DEVICE4 34

#define PLAYBACK_OFFLOAD_DEVICE5 35
@@ -491,7 +491,7 @@ enum { 
#define FM_RX_VOLUME "PRI MI2S LOOPBACK Volume"

#elif PLATFORM_MSM8996

#define FM_RX_VOLUME "Tert MI2S LOOPBACK Volume"

#elif defined (PLATFORM_MSM8998) || defined (PLATFORM_SDM845) || defined (PLATFORM_MSMFALCON) || defined (PLATFORM_SDM670)

#elif defined (PLATFORM_MSM8998) || defined (PLATFORM_SDM845) || defined (PLATFORM_MSMFALCON) || defined (PLATFORM_SDM670) || defined (PLATFORM_QCS605)

#define FM_RX_VOLUME "SLIMBUS_8 LOOPBACK Volume"

#else

#define FM_RX_VOLUME "Internal FM RX Volume"