samsung-sm8650/android_kernel_samsung_sm8650-modules
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "bolero: tx-macro: Fix link status not connected issue due to clk not enabled"

Browse Source
This commit is contained in:
qctecmdr
2021-05-25 20:42:48 -07:00
committed by Gerrit - the friendly Code Review server
parent 57fa62e292 c5698c8a0b
commit f98485fa87
1 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
asoc/codecs/bolero/tx-macro.c
View File

@@ -2722,6 +2722,7 @@ static int tx_macro_tx_va_mclk_enable(struct tx_macro_priv *tx_priv,
} }
bolero_clk_rsc_fs_gen_request(tx_priv->dev, bolero_clk_rsc_fs_gen_request(tx_priv->dev,
true); true);
mutex_lock(&tx_priv->mclk_lock);
if (tx_priv->tx_mclk_users == 0) { if (tx_priv->tx_mclk_users == 0) {
regmap_update_bits(regmap, regmap_update_bits(regmap,
BOLERO_CDC_TX_TOP_CSR_FREQ_MCLK, BOLERO_CDC_TX_TOP_CSR_FREQ_MCLK,
@@ -2734,6 +2735,7 @@ static int tx_macro_tx_va_mclk_enable(struct tx_macro_priv *tx_priv,
0x01, 0x01); 0x01, 0x01);
} }
tx_priv->tx_mclk_users++; tx_priv->tx_mclk_users++;
mutex_unlock(&tx_priv->mclk_lock);
} }
if (tx_priv->swr_clk_users == 0) { if (tx_priv->swr_clk_users == 0) {
dev_dbg(tx_priv->dev, "%s: reset_swr: %d\n", dev_dbg(tx_priv->dev, "%s: reset_swr: %d\n",
@@ -2778,10 +2780,12 @@ static int tx_macro_tx_va_mclk_enable(struct tx_macro_priv *tx_priv,
if (clk_type == TX_MCLK) if (clk_type == TX_MCLK)
tx_macro_mclk_enable(tx_priv, 0); tx_macro_mclk_enable(tx_priv, 0);
if (clk_type == VA_MCLK) { if (clk_type == VA_MCLK) {
mutex_lock(&tx_priv->mclk_lock);
if (tx_priv->tx_mclk_users <= 0) { if (tx_priv->tx_mclk_users <= 0) {
dev_err(tx_priv->dev, "%s: clock already disabled\n", dev_err(tx_priv->dev, "%s: clock already disabled\n",
__func__); __func__);
tx_priv->tx_mclk_users = 0; tx_priv->tx_mclk_users = 0;
mutex_unlock(&tx_priv->mclk_lock);
goto tx_clk; goto tx_clk;
} }
tx_priv->tx_mclk_users--; tx_priv->tx_mclk_users--;
@@ -2793,7 +2797,7 @@ static int tx_macro_tx_va_mclk_enable(struct tx_macro_priv *tx_priv,
BOLERO_CDC_TX_CLK_RST_CTRL_MCLK_CONTROL, BOLERO_CDC_TX_CLK_RST_CTRL_MCLK_CONTROL,
0x01, 0x00); 0x01, 0x00);
} }
mutex_unlock(&tx_priv->mclk_lock);
bolero_clk_rsc_fs_gen_request(tx_priv->dev, bolero_clk_rsc_fs_gen_request(tx_priv->dev,
false); false);
ret = bolero_clk_rsc_request_clock(tx_priv->dev, ret = bolero_clk_rsc_request_clock(tx_priv->dev,