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

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

Merge "msmnile_au: audio bring-up changes on auto platform"

parents 37129999 4d6f7700

configs/msmnile_au/audio_platform_info.xml

+67 −59
Original line number Diff line number Diff line
@@ -26,22 +26,25 @@ 
<!-- IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.                          -->

<audio_platform_info>

    <acdb_ids>

        <device name="SND_DEVICE_OUT_SPEAKER" acdb_id="15"/>

        <device name="SND_DEVICE_OUT_SPEAKER_REVERSE" acdb_id="15"/>

        <device name="SND_DEVICE_OUT_SPEAKER_PROTECTED" acdb_id="124"/>

        <device name="SND_DEVICE_IN_VOICE_REC_QMIC_FLUENCE" acdb_id="131"/>

        <device name="SND_DEVICE_IN_VOICE_REC_TMIC" acdb_id="131"/>

        <device name="SND_DEVICE_IN_VOICE_REC_DMIC_FLUENCE" acdb_id="132"/>

        <device name="SND_DEVICE_OUT_VOICE_SPEAKER_2_PROTECTED" acdb_id="150"/>

        <device name="SND_DEVICE_OUT_VOICE_SPEAKER_2_PROTECTED_VBAT" acdb_id="150"/>

        <device name="SND_DEVICE_IN_CAPTURE_VI_FEEDBACK_MONO_1" acdb_id="151"/>

        <device name="SND_DEVICE_IN_CAPTURE_VI_FEEDBACK_MONO_2" acdb_id="152"/>

        <device name="SND_DEVICE_IN_UNPROCESSED_USB_HEADSET_MIC" acdb_id="133"/>

        <device name="SND_DEVICE_IN_UNPROCESSED_MIC" acdb_id="143"/>

        <device name="SND_DEVICE_IN_UNPROCESSED_STEREO_MIC" acdb_id="144"/>

        <device name="SND_DEVICE_IN_UNPROCESSED_THREE_MIC" acdb_id="145"/>

        <device name="SND_DEVICE_IN_UNPROCESSED_QUAD_MIC" acdb_id="146"/>

        <device name="SND_DEVICE_IN_UNPROCESSED_HEADSET_MIC" acdb_id="147"/>

        <device name="SND_DEVICE_OUT_HANDSET" acdb_id="41"/>

        <device name="SND_DEVICE_OUT_SPEAKER" acdb_id="41"/>

        <device name="SND_DEVICE_OUT_HEADPHONES" acdb_id="41"/>

        <device name="SND_DEVICE_OUT_BT_SCO" acdb_id="94"/>

        <device name="SND_DEVICE_OUT_BT_SCO_WB" acdb_id="94"/>

        <device name="SND_DEVICE_OUT_BT_A2DP" acdb_id="41"/>

        <device name="SND_DEVICE_OUT_VOICE_HANDSET" acdb_id="94"/>

        <device name="SND_DEVICE_OUT_VOICE_SPEAKER" acdb_id="94"/>

        <device name="SND_DEVICE_IN_HANDSET_MIC" acdb_id="11"/>

        <device name="SND_DEVICE_IN_SPEAKER_MIC" acdb_id="11"/>

        <device name="SND_DEVICE_IN_HEADSET_MIC" acdb_id="11"/>

        <device name="SND_DEVICE_IN_VOICE_SPEAKER_MIC" acdb_id="95"/>

        <device name="SND_DEVICE_IN_VOICE_HEADSET_MIC" acdb_id="95"/>

        <device name="SND_DEVICE_IN_BT_SCO_MIC" acdb_id="95"/>

        <device name="SND_DEVICE_IN_BT_SCO_MIC_WB" acdb_id="95"/>

        <device name="SND_DEVICE_IN_HANDSET_DMIC" acdb_id="80"/>

        <device name="SND_DEVICE_IN_SPEAKER_DMIC" acdb_id="80"/>

        <device name="SND_DEVICE_IN_QUAD_MIC" acdb_id="47"/>

        <device name="SND_DEVICE_IN_HANDSET_QMIC" acdb_id="47"/>

    </acdb_ids>



    <module_ids>
@@ -66,36 +69,39 @@ 
    <bit_width_configs>

        <device name="SND_DEVICE_OUT_SPEAKER" bit_width="24"/>

    </bit_width_configs>



    <pcm_ids>

        <usecase name="USECASE_AUDIO_PLAYBACK_LOW_LATENCY" type="out" id="13"/>

        <usecase name="USECASE_AUDIO_PLAYBACK_OFFLOAD" type="out" id="8"/>

        <usecase name="USECASE_AUDIO_PLAYBACK_OFFLOAD2" type="out" id="15"/>

        <usecase name="USECASE_AUDIO_PLAYBACK_OFFLOAD3" type="out" id="16"/>

        <usecase name="USECASE_AUDIO_PLAYBACK_OFFLOAD4" type="out" id="28"/>

        <usecase name="USECASE_AUDIO_PLAYBACK_OFFLOAD5" type="out" id="29"/>

        <usecase name="USECASE_AUDIO_PLAYBACK_OFFLOAD6" type="out" id="30"/>

        <usecase name="USECASE_AUDIO_PLAYBACK_OFFLOAD7" type="out" id="31"/>

        <usecase name="USECASE_AUDIO_PLAYBACK_OFFLOAD8" type="out" id="32"/>

        <usecase name="USECASE_AUDIO_PLAYBACK_LOW_LATENCY" type="out" id="9"/>

        <usecase name="USECASE_AUDIO_PLAYBACK_DEEP_BUFFER" type="out" id="0"/>

        <usecase name="USECASE_AUDIO_PLAYBACK_OFFLOAD" type="out" id="7"/>

        <usecase name="USECASE_AUDIO_PLAYBACK_OFFLOAD2" type="out" id="11"/>

        <usecase name="USECASE_AUDIO_PLAYBACK_OFFLOAD3" type="out" id="12"/>

        <usecase name="USECASE_AUDIO_PLAYBACK_OFFLOAD4" type="out" id="21"/>

        <usecase name="USECASE_AUDIO_PLAYBACK_OFFLOAD5" type="out" id="22"/>

        <usecase name="USECASE_AUDIO_PLAYBACK_OFFLOAD6" type="out" id="23"/>

        <usecase name="USECASE_AUDIO_PLAYBACK_OFFLOAD7" type="out" id="24"/>

        <usecase name="USECASE_AUDIO_PLAYBACK_OFFLOAD8" type="out" id="25"/>

        <usecase name="USECASE_VOICEMMODE1_CALL" type="in" id="2"/>

        <usecase name="USECASE_VOICEMMODE1_CALL" type="out" id="2"/>

        <usecase name="USECASE_VOICEMMODE2_CALL" type="in" id="19"/>

        <usecase name="USECASE_VOICEMMODE2_CALL" type="out" id="19"/>

        <usecase name="USECASE_VOICEMMODE2_CALL" type="in" id="15"/>

        <usecase name="USECASE_VOICEMMODE2_CALL" type="out" id="15"/>

        <usecase name="USECASE_VOWLAN_CALL" type="in" id="-1"/>

        <usecase name="USECASE_VOWLAN_CALL" type="out" id="-1"/>

        <usecase name="USECASE_AUDIO_PLAYBACK_FM" type="out" id="5"/>

        <usecase name="USECASE_AUDIO_PLAYBACK_FM" type="in" id="34"/>

        <usecase name="USECASE_AUDIO_SPKR_CALIB_RX" type="out" id="5"/>

        <usecase name="USECASE_AUDIO_SPKR_CALIB_TX" type="in" id="35"/>

        <usecase name="USECASE_AUDIO_PLAYBACK_AFE_PROXY" type="out" id="6"/>

        <usecase name="USECASE_AUDIO_RECORD_AFE_PROXY" type="in" id="7"/>

        <usecase name="USECASE_AUDIO_RECORD_LOW_LATENCY" type="in" id="17" />

        <usecase name="USECASE_AUDIO_PLAYBACK_ULL" type="out" id="17" />

        <usecase name="USECASE_AUDIO_PLAYBACK_EXT_DISP_SILENCE" type="out" id="27" />

        <usecase name="USECASE_AUDIO_PLAYBACK_VOIP" type="out" id="16" />

        <usecase name="USECASE_AUDIO_RECORD_VOIP" type="in" id="16" />

        <usecase name="USECASE_AUDIO_PLAYBACK_MMAP" type="out" id="33" />

        <usecase name="USECASE_AUDIO_RECORD_MMAP" type="in" id="33" />

        <usecase name="USECASE_AUDIO_PLAYBACK_AFE_PROXY" type="out" id="5"/>

        <usecase name="USECASE_AUDIO_RECORD_AFE_PROXY" type="in" id="6"/>

        <usecase name="USECASE_AUDIO_RECORD_LOW_LATENCY" type="in" id="13" />

        <usecase name="USECASE_AUDIO_PLAYBACK_ULL" type="out" id="13" />

        <usecase name="USECASE_AUDIO_PLAYBACK_VOIP" type="out" id="12" />

        <usecase name="USECASE_AUDIO_RECORD_VOIP" type="in" id="12" />

        <usecase name="USECASE_AUDIO_PLAYBACK_MMAP" type="out" id="28" />

        <usecase name="USECASE_AUDIO_RECORD_MMAP" type="in" id="28" />

        <usecase name="USECASE_AUDIO_RECORD" type="in" id="0" />

        <usecase name="USECASE_AUDIO_HFP_SCO" type="in" id="29" />

        <usecase name="USECASE_AUDIO_HFP_SCO" type="out" id="29" />

        <usecase name="USECASE_AUDIO_HFP_SCO_WB" type="in" id="29" />

        <usecase name="USECASE_AUDIO_HFP_SCO_WB" type="out" id="29" />

    </pcm_ids>



    <config_params>

        <param key="spkr_1_tz_name" value="wsatz.13"/>

        <param key="spkr_2_tz_name" value="wsatz.14"/>
@@ -111,6 +117,7 @@ 
        <!-- In the below value string, the value indicates sidetone gain in dB -->

        <param key="usb_sidetone_gain" value="35"/>

    </config_params>



    <gain_db_to_level_mapping>

        <gain_level_map db="-59" level="5"/>

        <gain_level_map db="-17.4" level="4"/>
@@ -118,26 +125,27 @@ 
        <gain_level_map db="-10.2" level="2"/>

        <gain_level_map db="0" level="1"/>

    </gain_db_to_level_mapping>



    <backend_names>

        <device name="SND_DEVICE_OUT_HEADPHONES" backend="headphones" interface="SLIMBUS_6_RX"/>

        <device name="SND_DEVICE_OUT_BT_SCO_WB" backend="bt-sco-wb" interface="SLIMBUS_7_RX"/>

        <device name="SND_DEVICE_OUT_BT_SCO" backend="bt-sco" interface="SLIMBUS_7_RX"/>

        <device name="SND_DEVICE_OUT_BT_A2DP" backend="bt-a2dp" interface="SLIMBUS_7_RX"/>

        <device name="SND_DEVICE_OUT_LINE" backend="headphones" interface="SLIMBUS_6_RX"/>

        <device name="SND_DEVICE_OUT_ANC_HEADSET" backend="headphones" interface="SLIMBUS_6_RX"/>

        <device name="SND_DEVICE_OUT_ANC_FB_HEADSET" backend="headphones" interface="SLIMBUS_6_RX"/>

        <device name="SND_DEVICE_OUT_SPEAKER_AND_HEADPHONES" backend="speaker-and-headphones" interface="SLIMBUS_0_RX-and-SLIMBUS_6_RX"/>

        <device name="SND_DEVICE_OUT_SPEAKER_AND_LINE" backend="speaker-and-headphones" interface="SLIMBUS_0_RX-and-SLIMBUS_6_RX"/>

        <device name="SND_DEVICE_OUT_SPEAKER_AND_ANC_HEADSET" backend="speaker-and-headphones" interface="SLIMBUS_0_RX-and-SLIMBUS_6_RX"/>

        <device name="SND_DEVICE_OUT_SPEAKER_AND_ANC_FB_HEADSET" backend="speaker-and-headphones" interface="SLIMBUS_0_RX-and-SLIMBUS_6_RX"/>

        <device name="SND_DEVICE_OUT_VOICE_HEADPHONES" backend="headphones" interface="SLIMBUS_6_RX"/>

        <device name="SND_DEVICE_OUT_VOICE_ANC_HEADSET" backend="headphones" interface="SLIMBUS_6_RX"/>

        <device name="SND_DEVICE_OUT_VOICE_ANC_FB_HEADSET" backend="headphones" interface="SLIMBUS_6_RX"/>

        <device name="SND_DEVICE_OUT_VOICE_LINE" backend="headphones" interface="SLIMBUS_6_RX"/>

        <device name="SND_DEVICE_OUT_VOICE_TTY_FULL_HEADPHONES" backend="headphones" interface="SLIMBUS_6_RX"/>

        <device name="SND_DEVICE_OUT_VOICE_TTY_VCO_HEADPHONES" backend="headphones" interface="SLIMBUS_6_RX"/>

        <device name="SND_DEVICE_OUT_SPEAKER_AND_BT_SCO" backend="speaker-and-bt-sco" interface="SLIMBUS_0_RX-and-SLIMBUS_7_RX"/>

        <device name="SND_DEVICE_OUT_SPEAKER_AND_BT_SCO_WB" backend="speaker-and-bt-sco-wb" interface="SLIMBUS_0_RX-and-SLIMBUS_7_RX"/>

        <device name="SND_DEVICE_OUT_HANDSET" interface="TERT_TDM_RX_0"/>

        <device name="SND_DEVICE_OUT_SPEAKER" interface="TERT_TDM_RX_0"/>

        <device name="SND_DEVICE_OUT_HEADPHONES" interface="TERT_TDM_RX_0"/>

        <device name="SND_DEVICE_OUT_BT_SCO" interface="TERT_TDM_RX_2"/>

        <device name="SND_DEVICE_OUT_BT_SCO_WB" interface="TERT_TDM_RX_2"/>

        <device name="SND_DEVICE_OUT_BT_A2DP" interface="TERT_TDM_RX_0"/>

        <device name="SND_DEVICE_OUT_VOICE_HANDSET" interface="TERT_TDM_RX_2"/>

        <device name="SND_DEVICE_OUT_VOICE_SPEAKER" interface="TERT_TDM_RX_2"/>

        <device name="SND_DEVICE_IN_HANDSET_MIC" interface="TERT_TDM_TX_0"/>

        <device name="SND_DEVICE_IN_SPEAKER_MIC" interface="TERT_TDM_TX_0"/>

        <device name="SND_DEVICE_IN_HEADSET_MIC" interface="TERT_TDM_TX_0"/>

        <device name="SND_DEVICE_IN_VOICE_SPEAKER_MIC" interface="TERT_TDM_TX_0"/>

        <device name="SND_DEVICE_IN_VOICE_HEADSET_MIC" interface="TERT_TDM_TX_0"/>

        <device name="SND_DEVICE_IN_BT_SCO_MIC" interface="TERT_TDM_TX_0"/>

        <device name="SND_DEVICE_IN_BT_SCO_MIC_WB" interface="TERT_TDM_TX_0"/>

        <device name="SND_DEVICE_IN_HANDSET_DMIC" interface="TERT_TDM_TX_0"/>

        <device name="SND_DEVICE_IN_SPEAKER_DMIC" interface="TERT_TDM_TX_0"/>

        <device name="SND_DEVICE_IN_QUAD_MIC" interface="TERT_TDM_TX_0"/>

        <device name="SND_DEVICE_IN_HANDSET_QMIC" interface="TERT_TDM_TX_0"/>

    </backend_names>

</audio_platform_info>

configs/msmnile_au/mixer_paths_tavil.xml→configs/msmnile_au/mixer_paths_adp.xml

+154 −72

File changed and moved.

Preview size limit exceeded, changes collapsed.

configs/msmnile_au/mixer_paths_pahu.xml→configs/msmnile_au/mixer_paths_custom.xml

+355 −91

File changed and moved.

Preview size limit exceeded, changes collapsed.

configs/msmnile_au/msmnile_au.mk

+13 −2
Original line number Diff line number Diff line
@@ -73,14 +73,14 @@ DEVICE_PACKAGE_OVERLAYS += hardware/qcom/audio/configs/common/overlay 
PRODUCT_COPY_FILES += \

    hardware/qcom/audio/configs/msmnile_au/audio_output_policy.conf:$(TARGET_COPY_OUT_VENDOR)/etc/audio_output_policy.conf \

    hardware/qcom/audio/configs/msmnile_au/audio_effects.conf:$(TARGET_COPY_OUT_VENDOR)/etc/audio_effects.conf \

    hardware/qcom/audio/configs/msmnile_au/mixer_paths_tavil.xml:$(TARGET_COPY_OUT_VENDOR)/etc/mixer_paths_tavil.xml \

    hardware/qcom/audio/configs/msmnile_au/mixer_paths_adp.xml:$(TARGET_COPY_OUT_VENDOR)/etc/mixer_paths_adp.xml \

    hardware/qcom/audio/configs/msmnile_au/audio_tuning_mixer_tavil.txt:$(TARGET_COPY_OUT_VENDOR)/etc/audio_tuning_mixer_tavil.txt \

    hardware/qcom/audio/configs/msmnile_au/audio_tuning_mixer.txt:$(TARGET_COPY_OUT_VENDOR)/etc/audio_tuning_mixer.txt \

    hardware/qcom/audio/configs/msmnile_au/sound_trigger_mixer_paths_wcd9340.xml:$(TARGET_COPY_OUT_VENDOR)/etc/sound_trigger_mixer_paths_wcd9340.xml \

    hardware/qcom/audio/configs/msmnile_au/sound_trigger_platform_info.xml:$(TARGET_COPY_OUT_VENDOR)/etc/sound_trigger_platform_info.xml \

    hardware/qcom/audio/configs/msmnile_au/graphite_ipc_platform_info.xml:$(TARGET_COPY_OUT_VENDOR)/etc/graphite_ipc_platform_info.xml \

    hardware/qcom/audio/configs/msmnile_au/audio_platform_info.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio_platform_info.xml \

    hardware/qcom/audio/configs/msmnile_au/mixer_paths_pahu.xml:$(TARGET_COPY_OUT_VENDOR)/etc/mixer_paths_pahu.xml \

    hardware/qcom/audio/configs/msmnile_au/mixer_paths_custom.xml:$(TARGET_COPY_OUT_VENDOR)/etc/mixer_paths_custom.xml \

    hardware/qcom/audio/configs/msmnile_au/sound_trigger_mixer_paths.xml:$(TARGET_COPY_OUT_VENDOR)/etc/sound_trigger_mixer_paths.xml



#XML Audio configuration files
@@ -228,3 +228,14 @@ PRODUCT_PACKAGES += \ 
    android.hardware.audio@2.0-impl \

    android.hardware.audio.effect@2.0-impl \

    android.hardware.soundtrigger@2.0-impl



PRODUCT_PROPERTY_OVERRIDES += \

persist.audio.calfile0=/vendor/etc/acdbdata/adsp_avs_config.acdb\

persist.audio.calfile1=/vendor/etc/acdbdata/ADP/Bluetooth_cal.acdb\

persist.audio.calfile2=/vendor/etc/acdbdata/ADP/Codec_cal.acdb\

persist.audio.calfile3=/vendor/etc/acdbdata/ADP/General_cal.acdb\

persist.audio.calfile4=/vendor/etc/acdbdata/ADP/Global_cal.acdb\

persist.audio.calfile5=/vendor/etc/acdbdata/ADP/Handset_cal.acdb\

persist.audio.calfile6=/vendor/etc/acdbdata/ADP/Hdmi_cal.acdb\

persist.audio.calfile7=/vendor/etc/acdbdata/ADP/Headset_cal.acdb\

persist.audio.calfile8=/vendor/etc/acdbdata/ADP/Speaker_cal.acdb

hal/msm8974/hw_info.c

+14 −1
Original line number Diff line number Diff line
@@ -470,6 +470,18 @@ static void update_hardware_info_msmnile(struct hardware_info *hw_info, const c 
    } else if (strstr(snd_card_name, "pahu")) {

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

        hw_info->is_stereo_spkr = false;

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

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

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

        hw_info->snd_devices = (snd_device_t *)auto_variant_devices;

        hw_info->num_snd_devices = ARRAY_SIZE(auto_variant_devices);

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

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

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

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

        hw_info->snd_devices = (snd_device_t *)auto_variant_devices;

        hw_info->num_snd_devices = ARRAY_SIZE(auto_variant_devices);

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

    } else {

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

    }
@@ -648,7 +660,8 @@ void *hw_info_init(const char *snd_card_name) 
    } else if (strstr(snd_card_name, "sdx")) {

        ALOGV("SDX - variant soundcard");

        update_hardware_info_sdx(hw_info, snd_card_name);

    } else if (strstr(snd_card_name, "pahu") || strstr(snd_card_name, "tavil")) {

    } else if (strstr(snd_card_name, "pahu") || strstr(snd_card_name, "tavil") ||

            strstr(snd_card_name, "sa8155")) {

        ALOGV("MSMNILE - variant soundcard");

        update_hardware_info_msmnile(hw_info, snd_card_name);

    } else {