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

Commit e3e3492e authored by qctecmdr's avatar qctecmdr Committed by Gerrit - the friendly Code Review server
Browse files

Merge "hal: Add initial definition for holi"

parents e7708150 ccc996e8

hal/Android.mk

+6 −1
Original line number Diff line number Diff line
@@ -70,7 +70,7 @@ ifneq ($(filter msmnile sdmshrike,$(TARGET_BOARD_PLATFORM)),) 
  LOCAL_CFLAGS += -DINCALL_MUSIC_ENABLED

  LOCAL_CFLAGS += -DINCALL_STEREO_CAPTURE_ENABLED

endif

ifneq ($(filter kona lahaina holi,$(TARGET_BOARD_PLATFORM)),)

ifneq ($(filter kona lahaina,$(TARGET_BOARD_PLATFORM)),)

  LOCAL_CFLAGS := -DPLATFORM_KONA

  LOCAL_CFLAGS += -DMAX_TARGET_SPECIFIC_CHANNEL_CNT="4"

  LOCAL_CFLAGS += -DINCALL_STEREO_CAPTURE_ENABLED
@@ -88,6 +88,11 @@ ifneq ($(filter lito,$(TARGET_BOARD_PLATFORM)),) 
  LOCAL_CFLAGS += -DMAX_TARGET_SPECIFIC_CHANNEL_CNT="4"

  LOCAL_CFLAGS += -DINCALL_STEREO_CAPTURE_ENABLED

endif

ifneq ($(filter holi,$(TARGET_BOARD_PLATFORM)),)

  LOCAL_CFLAGS := -DPLATFORM_HOLI

  LOCAL_CFLAGS += -DMAX_TARGET_SPECIFIC_CHANNEL_CNT="4"

  LOCAL_CFLAGS += -DINCALL_STEREO_CAPTURE_ENABLED

endif

ifneq ($(filter bengal,$(TARGET_BOARD_PLATFORM)),)

  LOCAL_CFLAGS := -DPLATFORM_BENGAL

  LOCAL_CFLAGS += -DMAX_TARGET_SPECIFIC_CHANNEL_CNT="4"

hal/msm8974/platform.c

+4 −2
Original line number Diff line number Diff line
@@ -78,7 +78,8 @@ 
    defined (PLATFORM_KONA) || defined (PLATFORM_MSMSTEPPE) || \

    defined (PLATFORM_QCS405) || defined (PLATFORM_TRINKET) || \

    defined (PLATFORM_LITO) || defined (PLATFORM_MSMFALCON) || \

    defined (PLATFORM_ATOLL) || defined (PLATFORM_BENGAL)

    defined (PLATFORM_ATOLL) || defined (PLATFORM_BENGAL) || \

    defined (PLATFORM_HOLI)









#include <sound/devdep_params.h>









#endif








@@ -12252,7 +12253,8 @@ int platform_get_supported_copp_sampling_rate(uint32_t stream_sr)







    defined (PLATFORM_KONA) || defined (PLATFORM_MSMSTEPPE) || \









    defined (PLATFORM_QCS405) || defined (PLATFORM_TRINKET) || \









    defined (PLATFORM_LITO) || defined (PLATFORM_MSMFALCON) || \









    defined (PLATFORM_ATOLL) || defined (PLATFORM_BENGAL)









    defined (PLATFORM_ATOLL) || defined (PLATFORM_BENGAL) || \









    defined (PLATFORM_HOLI)









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









                              uint32_t *size)









{

























hal/msm8974/platform.h



+6
−4






























Original line number
Diff line number
Diff line







@@ -482,7 +482,7 @@ enum {







#define INCALL_MUSIC_UPLINK2_PCM_DEVICE 34









#elif PLATFORM_MSMNILE









#define INCALL_MUSIC_UPLINK2_PCM_DEVICE 27









#elif PLATFORM_KONA









#elif PLATFORM_KONA || PLATFORM_HOLI









#define INCALL_MUSIC_UPLINK2_PCM_DEVICE 23









#else









#define INCALL_MUSIC_UPLINK2_PCM_DEVICE 35








@@ -509,7 +509,8 @@ enum {







    defined (PLATFORM_MSMNILE) || defined (PLATFORM_KONA) || \









    defined (PLATFORM_MSMSTEPPE) || defined (PLATFORM_QCS405) || \









    defined (PLATFORM_TRINKET) || defined (PLATFORM_LITO) || \









    defined (PLATFORM_ATOLL) || defined (PLATFORM_BENGAL)









    defined (PLATFORM_ATOLL) || defined (PLATFORM_BENGAL) || \









    defined (PLATFORM_HOLI)









#define PLAYBACK_OFFLOAD_DEVICE2 17









#elif defined (PLATFORM_MSMFALCON) || defined (PLATFORM_MSM8937) || \









      defined (PLATFORM_MSM8953)








@@ -524,7 +525,8 @@ enum {







    defined (PLATFORM_QCS405) || defined (PLATFORM_TRINKET) || \









    defined (PLATFORM_LITO) || defined (PLATFORM_MSMFALCON) || \









    defined (PLATFORM_MSM8937) || defined (PLATFORM_ATOLL) || \









    defined (PLATFORM_BENGAL) || defined (PLATFORM_MSM8953)









    defined (PLATFORM_BENGAL) || defined (PLATFORM_MSM8953) || \









    defined (PLATFORM_HOLI)









#define PLAYBACK_OFFLOAD_DEVICE3 18









#define PLAYBACK_OFFLOAD_DEVICE4 34









#define PLAYBACK_OFFLOAD_DEVICE5 35








@@ -693,7 +695,7 @@ enum {







#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) || defined (PLATFORM_ATOLL) ||defined (PLATFORM_BENGAL)









#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) ||defined (PLATFORM_BENGAL) ||    defined (PLATFORM_HOLI)









#define FM_RX_VOLUME "SLIMBUS_8 LOOPBACK Volume"









#else









#define FM_RX_VOLUME "Internal FM RX Volume"