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

Commit 09ecbd9b authored by Satya Krishna Pindiproli's avatar Satya Krishna Pindiproli Committed by Gerrit - the friendly Code Review server
Browse files

configs: sdm660: update mixer controls for HFP for SDM660 

Update mixer controls for HFP client for all variants of SDM660.
Also add HFP PCM device ID as a config param and change device IDs
related to speaker protection in respective platform_info.xml files
based on the updated values in kernel.

CRs-Fixed: 1117322
Change-Id: Ief158585a0f9f8fcfccb8b261d37ceba0088df29
parent 7d7f9826

configs/sdm660/audio_platform_info.xml

+4 −1
Original line number Diff line number Diff line
@@ -54,18 +54,21 @@ 
        <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_SPKR_CALIB_TX" type="in" id="40"/>

        <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_HFP_SCO" type="in" id="12" />

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

    </pcm_ids>

    <config_params>

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

        <param key="spkr_2_tz_name" value="wsatz.12"/>

        <param key="true_32_bit" value="true"/>

        <param key="native_audio_mode" value="true"/>

        <param key="hfp_pcm_dev_id" value="39"/>

    </config_params>

    <acdb_ids>

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

configs/sdm660/audio_platform_info_extcodec.xml

+5 −2
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="ISO-8859-1"?>

<!-- Copyright (c) 2014, 2016, The Linux Foundation. All rights reserved.   -->

<!-- Copyright (c) 2014, 2016-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 -->
@@ -58,12 +58,14 @@ 
        <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_SPKR_CALIB_TX" type="in" id="37"/>

        <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_HFP_SCO" type="in" id="35" />

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

    </pcm_ids>

    <config_params>

        <param key="spkr_1_tz_name" value="wsatz.13"/>
@@ -76,6 +78,7 @@ 
        <param key="true_32_bit" value="true"/>

        <!-- In the below value string, the value indicates sidetone gain in dB -->

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

        <param key="hfp_pcm_dev_id" value="36"/>

    </config_params>

    <gain_db_to_level_mapping>

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

configs/sdm660/mixer_paths.xml

+2 −1
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="ISO-8859-1"?>

<!-- Copyright (c) 2015-2016, The Linux Foundation. All rights reserved.         -->

<!-- Copyright (c) 2015-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 -->
@@ -159,6 +159,7 @@ 
    <!-- HFP start -->

    <ctl name="HFP_SLIM7_UL_HL Switch" value="0" />

    <ctl name="INT4_MI2S_RX Port Mixer SLIM_7_TX" value="0" />

    <ctl name="INT0_MI2S_RX Port Mixer SLIM_7_TX" value="0" />

    <!-- HFP end -->

    <!-- echo reference -->

    <ctl name="AUDIO_REF_EC_UL1 MUX" value="None" />

configs/sdm660/mixer_paths_mtp.xml

+2 −1
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="ISO-8859-1"?>

<!-- Copyright (c) 2015-2016, The Linux Foundation. All rights reserved.         -->

<!-- Copyright (c) 2015-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 -->
@@ -159,6 +159,7 @@ 
    <!-- HFP start -->

    <ctl name="HFP_SLIM7_UL_HL Switch" value="0" />

    <ctl name="INT4_MI2S_RX Port Mixer SLIM_7_TX" value="0" />

    <ctl name="INT0_MI2S_RX Port Mixer SLIM_7_TX" value="0" />

    <!-- HFP end -->

    <!-- echo reference -->

    <ctl name="AUDIO_REF_EC_UL1 MUX" value="None" />

configs/sdm660/mixer_paths_skus.xml

+7 −6
Original line number Diff line number Diff line
@@ -374,8 +374,9 @@ 
    <ctl name= "RX INT3_1 NATIVE MUX" value="OFF" />

    <ctl name= "RX INT4_1 NATIVE MUX" value="OFF" />

    <!-- HFP start -->

    <ctl name="HFP_PRI_AUX_UL_HL Switch" value="0" />

    <ctl name="HFP_SLIM7_UL_HL Switch" value="0" />

    <ctl name="SLIMBUS_0_RX Port Mixer SLIM_7_TX" value="0" />

    <ctl name="SLIMBUS_6_RX Port Mixer SLIM_7_TX" value="0" />

    <!-- HFP end -->

    <!-- echo reference -->

    <ctl name="AUDIO_REF_EC_UL1 MUX" value="None" />
@@ -1563,7 +1564,7 @@ 
    </path>



    <path name="hfp-sco">

        <ctl name="HFP_PRI_AUX_UL_HL Switch" value="1" />

        <ctl name="HFP_SLIM7_UL_HL Switch" value="1" />

        <ctl name="SLIMBUS_0_RX Port Mixer SLIM_7_TX" value="1" />

        <ctl name="SLIMBUS_7_RX Audio Mixer MultiMedia6" value="1" />

        <ctl name="MultiMedia6 Mixer SLIM_0_TX" value="1" />
@@ -1571,9 +1572,9 @@ 
   </path>



    <path name="hfp-sco headphones">

        <ctl name="HFP_PRI_AUX_UL_HL Switch" value="1" />

        <ctl name="SLIMBUS_6_RX Port Mixer AUX_PCM_UL_TX" value="1" />

        <ctl name="AUX_PCM_RX Audio Mixer MultiMedia6" value="1" />

        <ctl name="HFP_SLIM7_UL_HL Switch" value="1" />

        <ctl name="SLIMBUS_6_RX Port Mixer SLIM_7_TX" value="1" />

        <ctl name="SLIMBUS_7_RX Audio Mixer MultiMedia6" value="1" />

        <ctl name="MultiMedia6 Mixer SLIM_0_TX" value="1" />

        <ctl name="SLIMBUS6_DL_HL Switch" value="1" />

    </path>
@@ -1584,7 +1585,7 @@ 
   </path>



    <path name="hfp-sco-wb headphones">

        <ctl name="AUX PCM SampleRate" value="KHZ_16" />

        <ctl name="BT SampleRate" value="KHZ_16" />

        <path name="hfp-sco headphones" />

    </path>