samsung-sm8650/android_kernel_samsung_sm8650-modules
1
0
Vork 0
Code Kwesties Pull-aanvragen Actions Packages Projecten Publicaties Wiki Activiteit

Revert "Revert "Revert "ASoC: bolero: check clock source before clock switch"""

Bladeren bron 
This reverts commit bdb29e89ea.

Change-Id: Ie82e94c86cb063ec9cc45695f4df9b0e5f842217
This commit is contained in:
Salendarsingh Gaud
2020-09-13 12:41:54 +05:30
bovenliggende 48dd09c650
commit 5d69def3cf
4 gewijzigde bestanden met toevoegingen van 3 en 126 verwijderingen
Download Patch-bestand Download Diff-bestand Expand all files Collapse all files

31
asoc/codecs/bolero/tx-macro.c
Bestand weergeven

@@ -2848,36 +2848,6 @@ static int tx_macro_clk_div_get(struct snd_soc_component *component)
return tx_priv->dmic_clk_div;
}
static int tx_macro_clk_switch(struct snd_soc_component *component, int clk_src)
{
struct device *tx_dev = NULL;
struct tx_macro_priv *tx_priv = NULL;
int ret = 0;
if (!component)
return -EINVAL;
tx_dev = bolero_get_device_ptr(component->dev, TX_MACRO);
if (!tx_dev) {
dev_err(component->dev,
"%s: null device for macro!\n", __func__);
return -EINVAL;
}
tx_priv = dev_get_drvdata(tx_dev);
if (!tx_priv) {
dev_err(component->dev,
"%s: priv is null for macro!\n", __func__);
return -EINVAL;
}
if (tx_priv->swr_ctrl_data) {
ret = swrm_wcd_notify(
tx_priv->swr_ctrl_data[0].tx_swr_pdev,
SWR_REQ_CLK_SWITCH, &clk_src);
}
return ret;
}
static int tx_macro_core_vote(void *handle, bool enable)
{
struct tx_macro_priv *tx_priv = (struct tx_macro_priv *) handle;
@@ -3361,7 +3331,6 @@ static void tx_macro_init_ops(struct macro_ops *ops,
ops->reg_wake_irq = tx_macro_reg_wake_irq;
ops->set_port_map = tx_macro_set_port_map;
ops->clk_div_get = tx_macro_clk_div_get;
ops->clk_switch = tx_macro_clk_switch;
ops->reg_evt_listener = tx_macro_register_event_listener;
ops->clk_enable = __tx_macro_mclk_enable;
}