A-Team_Digital_Solutions/android_kernel_motorola_sm6375
Watch
2
0
Fork
You've already forked android_kernel_motorola_sm6375
 0
mirror of https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git synced 2026-10-25 22:23:14 -04:00
Code Issues Projects Releases Packages Wiki Activity

modules: cspl: add mixer to switch Rx port for factory

Browse source 
Olson factory SW runs headset test over SLIMBus Rx5 on tinymix interface
but kernel driver can't control Cirrus SE module correctly since Rx port
is different with default case, which is SLIMBus Rx1.

As long as factory SW uses tinymix instead of AudioHAL interface, factory
should switch Rx port to control Cirrus SE module correctly.

Change-Id: I71111f30abc58d45ae8bcd4d0398b2e9dfa71d5b
Signed-off-by: Yoon (Seungyoon) Lee <w22905@motorola.com>
Reviewed-on: https://gerrit.mot.com/1284255
SME-Granted: SME Approvals Granted
SLTApproved: Slta Waiver
Tested-by: Jira Key
Reviewed-by: Seungyoon Lee <yoon@motorola.com>
Submit-Approved: Jira Key
This commit is contained in:
Yoon (Seungyoon) Lee 2018-12-17 13:53:25 -06:00 • committed by Seungyoon Lee
commit e50396c203
1 changed files with 36 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

38
sound/soc/codecs/msm-cirrus-playback.c
View file

@ -42,7 +42,7 @@ static int cirrus_ff_load_conf_sel;
static int cirrus_ff_delta_sel;
static int cirrus_ff_chan_swap_sel;
static int cirrus_ff_chan_swap_dur;
static int cirrus_ff_port = AFE_PORT_ID_SLIMBUS_MULTI_CHAN_0_RX;
static int cirrus_ff_port;
static int crus_se_usecase_dt_count;
static const char *crus_se_usecase_dt_text[MAX_TUNING_CONFIGS];
@ -683,6 +683,36 @@ static int msm_crus_chan_swap_dur_get(struct snd_kcontrol *kcontrol,
return 0;
}
static int msm_crus_se_rx_port(struct snd_kcontrol *kcontrol,
struct snd_ctl_elem_value *ucontrol)
{
int crus_set = ucontrol->value.integer.value[0];
pr_debug("Starting Cirrus SE RX Port function call\n");
if ((crus_set < 0) || (crus_set > AFE_PORT_ID_INVALID)) {
pr_err("%s: ignore the value out of range (%d)\n",
__func__, crus_set);
return 0;
}
pr_debug("%s: Received %d, change AFE Rx port from %d to %d\n",
__func__, crus_set, cirrus_ff_port, crus_set);
cirrus_ff_port = crus_set;
return 0;
}
static int msm_crus_se_rx_port_get(struct snd_kcontrol *kcontrol,
struct snd_ctl_elem_value *ucontrol)
{
pr_debug("Starting Cirrus SE RX Port Get function call\n");
ucontrol->value.integer.value[0] = cirrus_ff_port;
return 0;
}
static int msm_crus_se_usecase_index_get(struct snd_kcontrol *kcontrol,
struct snd_ctl_elem_value *ucontrol)
{
@ -739,6 +769,8 @@ static const struct snd_kcontrol_new crus_mixer_controls[] = {
SOC_SINGLE_EXT("Cirrus SE Channel Swap Duration", SND_SOC_NOPM, 0,
MAX_CHAN_SWAP_SAMPLES, 0, msm_crus_chan_swap_dur_get,
msm_crus_chan_swap_dur),
SOC_SINGLE_EXT("Cirrus SE Rx Port", SND_SOC_NOPM, 0,
AFE_PORT_ID_INVALID, 0, msm_crus_se_rx_port_get, msm_crus_se_rx_port),
SOC_SINGLE_MULTI_EXT("Cirrus SE Audio Index", SND_SOC_NOPM, 0,
0xFFFF, 0, 4, msm_crus_se_usecase_index_get, NULL),
};
@ -955,8 +987,10 @@ static int msm_cirrus_playback_probe(struct platform_device *pdev)
"afe-port-id", 0, &ff_port_id);
if (rc >= 0) {
cirrus_ff_port = ff_port_id;
pr_info("CRUS_SE: cirrus_ff_port = 0x%x", cirrus_ff_port);
} else {
cirrus_ff_port = AFE_PORT_ID_SLIMBUS_MULTI_CHAN_0_RX;
}
pr_info("CRUS_SE: cirrus_ff_port = 0x%x", cirrus_ff_port);
return 0;
}