samsung-sm8650/android_kernel_samsung_sm8650-modules
1
0
派生 0
代码 工单 合并请求 工作流 软件包 项目 发布 百科 活动

audio-kernel: asoc : Upgrade asoc to support 5.10 kernel

浏览代码 
Change-Id: Ia54112cfbde418d66b9314d4ba731928aa057558
Signed-off-by: Jyotirmoi Sarma <jyosarma@codeaurora.org>
这个提交包含在：
Jyotirmoi Sarma
2020-11-26 14:43:13 +05:30
提交者 Gerrit - the friendly Code Review server
父节点 9fc4437cd8
当前提交 a3d8911945
共修改 21 个文件，包含 166 行新增和 176 行删除
下载 Patch 文件 下载 Diff 文件 展开所有文件 折叠所有文件

26
asoc/codecs/wcd937x/wcd937x-mbhc.c
查看文件

@@ -200,7 +200,7 @@ static void wcd937x_mbhc_clk_setup(struct snd_soc_component *component,
static int wcd937x_mbhc_btn_to_num(struct snd_soc_component *component)
{
return snd_soc_component_read32(component, WCD937X_ANA_MBHC_RESULT_3) &
return snd_soc_component_read(component, WCD937X_ANA_MBHC_RESULT_3) &
0x7;
}
@@ -268,7 +268,7 @@ static bool wcd937x_mbhc_micb_en_status(struct wcd_mbhc *mbhc, int micb_num)
u8 val = 0;
if (micb_num == MIC_BIAS_2) {
val = ((snd_soc_component_read32(mbhc->component,
val = ((snd_soc_component_read(mbhc->component,
WCD937X_ANA_MICB2) & 0xC0)
>> 6);
if (val == 0x01)
@@ -279,7 +279,7 @@ static bool wcd937x_mbhc_micb_en_status(struct wcd_mbhc *mbhc, int micb_num)
static bool wcd937x_mbhc_hph_pa_on_status(struct snd_soc_component *component)
{
return (snd_soc_component_read32(component, WCD937X_ANA_HPH) & 0xC0) ?
return (snd_soc_component_read(component, WCD937X_ANA_HPH) & 0xC0) ?
true : false;
}
@@ -485,10 +485,10 @@ static inline void wcd937x_wcd_mbhc_qfuse_cal(
int q1_cal;
if (*z_val < (WCD937X_ZDET_VAL_400/1000))
q1 = snd_soc_component_read32(component,
q1 = snd_soc_component_read(component,
WCD937X_DIGITAL_EFUSE_REG_23 + (2 * flag_l_r));
else
q1 = snd_soc_component_read32(component,
q1 = snd_soc_component_read(component,
WCD937X_DIGITAL_EFUSE_REG_24 + (2 * flag_l_r));
if (q1 & 0x80)
q1_cal = (10000 - ((q1 & 0x7F) * 25));
@@ -524,14 +524,14 @@ static void wcd937x_wcd_mbhc_calc_impedance(struct wcd_mbhc *mbhc, uint32_t *zl,
WCD_MBHC_RSC_ASSERT_LOCKED(mbhc);
reg0 = snd_soc_component_read32(component, WCD937X_ANA_MBHC_BTN5);
reg1 = snd_soc_component_read32(component, WCD937X_ANA_MBHC_BTN6);
reg2 = snd_soc_component_read32(component, WCD937X_ANA_MBHC_BTN7);
reg3 = snd_soc_component_read32(component, WCD937X_MBHC_CTL_CLK);
reg4 = snd_soc_component_read32(component,
reg0 = snd_soc_component_read(component, WCD937X_ANA_MBHC_BTN5);
reg1 = snd_soc_component_read(component, WCD937X_ANA_MBHC_BTN6);
reg2 = snd_soc_component_read(component, WCD937X_ANA_MBHC_BTN7);
reg3 = snd_soc_component_read(component, WCD937X_MBHC_CTL_CLK);
reg4 = snd_soc_component_read(component,
WCD937X_MBHC_NEW_ZDET_ANA_CTL);
if (snd_soc_component_read32(component, WCD937X_ANA_MBHC_ELECT) &
if (snd_soc_component_read(component, WCD937X_ANA_MBHC_ELECT) &
0x80) {
is_fsm_disable = true;
regmap_update_bits(wcd937x->regmap,
@@ -786,13 +786,13 @@ static bool wcd937x_mbhc_get_moisture_status(struct wcd_mbhc *mbhc)
/* If moisture_en is already enabled, then skip to plug type
* detection.
*/
if ((snd_soc_component_read32(component, WCD937X_MBHC_NEW_CTL_2) &
if ((snd_soc_component_read(component, WCD937X_MBHC_NEW_CTL_2) &
0x0C))
goto done;
wcd937x_mbhc_moisture_detect_en(mbhc, true);
/* Read moisture comparator status */
ret = ((snd_soc_component_read32(component, WCD937X_MBHC_NEW_FSM_STATUS)
ret = ((snd_soc_component_read(component, WCD937X_MBHC_NEW_FSM_STATUS)
& 0x20) ? 0 : 1);
done: