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

Commit 0afc9239 authored by Xiaoyu Ye's avatar Xiaoyu Ye
Browse files

hal: Add audio support for msmskunk 

Add audio support for msmskunk.

CRs-Fixed: 2011757
Change-Id: Ide76df039065e35e0ef0d49a4e044145967a3089
parent 4322f152

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,$(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 msmskunk,$(TARGET_BOARD_PLATFORM)),)



MY_LOCAL_PATH := $(call my-dir)

hal/Android.mk

+4 −1
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,$(TARGET_BOARD_PLATFORM)),)

ifneq ($(filter msm8974 msm8226 msm8610 apq8084 msm8994 msm8992 msm8996 msm8998 msmskunk,$(TARGET_BOARD_PLATFORM)),)

  # B-family platform uses msm8974 code base

  AUDIO_PLATFORM = msm8974

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

  LOCAL_CFLAGS := -DPLATFORM_MSM8998

endif

ifneq ($(filter msmskunk,$(TARGET_BOARD_PLATFORM)),)

  LOCAL_CFLAGS := -DPLATFORM_MSMSKUNK

endif

endif



ifneq ($(filter msm8916 msm8909 msm8952 msm8937 thorium msm8953 msmgold sdm660,$(TARGET_BOARD_PLATFORM)),)

hal/audio_extn/hfp.c

+1 −1
Original line number Diff line number Diff line
@@ -49,7 +49,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)

#elif defined (PLATFORM_MSM8998) || defined (PLATFORM_MSMFALCON) || defined (PLATFORM_MSMSKUNK)

#define HFP_RX_VOLUME     "SLIMBUS_7 LOOPBACK Volume"

#else

#define HFP_RX_VOLUME     "Internal HFP RX Volume"

hal/msm8974/hw_info.c

+9 −1
Original line number Diff line number Diff line 
/*

 * Copyright (c) 2013-2016, The Linux Foundation. All rights reserved.

 * Copyright (c) 2013-2017, The Linux Foundation. All rights reserved.

 *

 * Redistribution and use in source and binary forms, with or without

 * modification, are permitted provided that the following conditions are
@@ -347,6 +347,11 @@ static void update_hardware_info_msm8998(struct hardware_info *hw_info, const c 
    }

}



static void  update_hardware_info_sdm845(struct hardware_info *hw_info __unused, const char *snd_card_name __unused)

{

        ALOGW("%s: Not a sdm845 device", __func__);

}



static void  update_hardware_info_8974(struct hardware_info *hw_info, const char *snd_card_name)

{

    if (!strcmp(snd_card_name, "msm8974-taiko-mtp-snd-card")) {
@@ -479,6 +484,9 @@ void *hw_info_init(const char *snd_card_name) 
    } else if(strstr(snd_card_name, "msm8998")) {

        ALOGV("MSM8998 - variant soundcard");

        update_hardware_info_msm8998(hw_info, snd_card_name);

    } else if(strstr(snd_card_name, "sdm845")) {

        ALOGV("SDM845 - variant soundcard");

        update_hardware_info_sdm845(hw_info, snd_card_name);

    } else {

        ALOGE("%s: Unsupported target %s:",__func__, snd_card_name);

        free(hw_info);

hal/msm8974/platform.h

+1 −1
Original line number Diff line number Diff line
@@ -434,7 +434,7 @@ enum { 
#define FM_RX_VOLUME "PRI MI2S LOOPBACK Volume"

#elif PLATFORM_MSM8996

#define FM_RX_VOLUME "Tert MI2S LOOPBACK Volume"

#elif PLATFORM_MSM8998

#elif defined (PLATFORM_MSM8998) || defined (PLATFORM_MSMSKUNK)

#define FM_RX_VOLUME "SLIMBUS_8 LOOPBACK Volume"

#else

#define FM_RX_VOLUME "Internal FM RX Volume"