lisa/android_kernel_xiaomi_sm8350
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "ASoC: wcd: set analog gain mode to manual when compander is off"

Browse Source
This commit is contained in:
Linux Build Service Account 2017-11-16 02:19:12 -08:00 committed by Gerrit - the friendly Code Review server
commit 4eaf88bd5e
4 changed files with 23 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
asoc/codecs/sdm660_cdc/msm-analog-cdc.c
View File

@ -2574,6 +2574,18 @@ static int msm_anlg_cdc_codec_enable_micbias(struct snd_soc_dapm_widget *w,
return 0;
}
static void set_compander_mode(void *handle, int val)
{
struct sdm660_cdc_priv *handle_cdc = handle;
struct snd_soc_codec *codec = handle_cdc->codec;
if (get_codec_version(handle_cdc) >= DIANGU) {
snd_soc_update_bits(codec,
MSM89XX_PMIC_ANALOG_RX_COM_BIAS_DAC,
0x08, val);
};
}
static void update_clkdiv(void *handle, int val)
{
struct sdm660_cdc_priv *handle_cdc = handle;
@ -4607,6 +4619,7 @@ static int msm_anlg_cdc_probe(struct platform_device *pdev)
BLOCKING_INIT_NOTIFIER_HEAD(&sdm660_cdc->notifier_mbhc);
sdm660_cdc->dig_plat_data.handle = (void *) sdm660_cdc;
sdm660_cdc->dig_plat_data.set_compander_mode = set_compander_mode;
sdm660_cdc->dig_plat_data.update_clkdiv = update_clkdiv;
sdm660_cdc->dig_plat_data.get_cdc_version = get_cdc_version;
sdm660_cdc->dig_plat_data.register_notifier =

1
asoc/codecs/sdm660_cdc/msm-analog-cdc.h
View File

@ -168,6 +168,7 @@ struct msm_dig_ctrl_data {
struct msm_dig_ctrl_platform_data {
void *handle;
void (*set_compander_mode)(void *handle, int val);
void (*update_clkdiv)(void *handle, int val);
int (*get_cdc_version)(void *handle);
int (*register_notifier)(void *handle,

7
asoc/codecs/sdm660_cdc/msm-digital-cdc.c
View File

@ -231,6 +231,12 @@ static int msm_dig_cdc_codec_config_compander(struct snd_soc_codec *codec,
}
if (SND_SOC_DAPM_EVENT_ON(event)) {
/* compander is not enabled */
if (!dig_cdc->comp_enabled[interp_n]) {
dig_cdc->set_compander_mode(dig_cdc->handle, 0x00);
return 0;
};
dig_cdc->set_compander_mode(dig_cdc->handle, 0x08);
/* Enable Compander Clock */
snd_soc_update_bits(codec,
MSM89XX_CDC_CORE_COMP0_B2_CTL, 0x0F, 0x09);
@ -2080,6 +2086,7 @@ static int msm_dig_cdc_probe(struct platform_device *pdev)
msm_dig_cdc->dig_base, &msm_digital_regmap_config);
msm_dig_cdc->update_clkdiv = pdata->update_clkdiv;
msm_dig_cdc->set_compander_mode = pdata->set_compander_mode;
msm_dig_cdc->get_cdc_version = pdata->get_cdc_version;
msm_dig_cdc->handle = pdata->handle;
msm_dig_cdc->register_notifier = pdata->register_notifier;

2
asoc/codecs/sdm660_cdc/msm-digital-cdc.h
View File

@ -55,6 +55,7 @@ struct msm_dig_priv {
u32 mute_mask;
int dapm_bias_off;
void *handle;
void (*set_compander_mode)(void *handle, int val);
void (*update_clkdiv)(void *handle, int val);
int (*get_cdc_version)(void *handle);
int (*register_notifier)(void *handle,
@ -65,6 +66,7 @@ struct msm_dig_priv {
struct dig_ctrl_platform_data {
void *handle;
void (*set_compander_mode)(void *handle, int val);
void (*update_clkdiv)(void *handle, int val);
int (*get_cdc_version)(void *handle);
int (*register_notifier)(void *handle,