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

Merge "asoc: Audio bringup changes for bengal"

Browse Source
This commit is contained in:
qctecmdr
2019-12-05 06:57:05 -08:00
committed by Gerrit - the friendly Code Review server
parent 7cbd8f97f1 696b14bfa2
commit fec5f13aea
4 changed files with 27 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
asoc/codecs/bolero/rx-macro.c
View File

@@ -3335,6 +3335,8 @@ static const struct snd_soc_dapm_route rx_audio_map[] = {
{"RX INT0_1 MIX1 INP0", "RX5", "RX_RX5"}, {"RX INT0_1 MIX1 INP0", "RX5", "RX_RX5"},
{"RX INT0_1 MIX1 INP0", "IIR0", "IIR0"}, {"RX INT0_1 MIX1 INP0", "IIR0", "IIR0"},
{"RX INT0_1 MIX1 INP0", "IIR1", "IIR1"}, {"RX INT0_1 MIX1 INP0", "IIR1", "IIR1"},
{"RX INT0_1 MIX1 INP0", "DEC0", "RX_TX DEC0_INP"},
{"RX INT0_1 MIX1 INP0", "DEC1", "RX_TX DEC1_INP"},
{"RX INT0_1 MIX1 INP1", "RX0", "RX_RX0"}, {"RX INT0_1 MIX1 INP1", "RX0", "RX_RX0"},
{"RX INT0_1 MIX1 INP1", "RX1", "RX_RX1"}, {"RX INT0_1 MIX1 INP1", "RX1", "RX_RX1"},
{"RX INT0_1 MIX1 INP1", "RX2", "RX_RX2"}, {"RX INT0_1 MIX1 INP1", "RX2", "RX_RX2"},
@@ -3343,6 +3345,8 @@ static const struct snd_soc_dapm_route rx_audio_map[] = {
{"RX INT0_1 MIX1 INP1", "RX5", "RX_RX5"}, {"RX INT0_1 MIX1 INP1", "RX5", "RX_RX5"},
{"RX INT0_1 MIX1 INP1", "IIR0", "IIR0"}, {"RX INT0_1 MIX1 INP1", "IIR0", "IIR0"},
{"RX INT0_1 MIX1 INP1", "IIR1", "IIR1"}, {"RX INT0_1 MIX1 INP1", "IIR1", "IIR1"},
{"RX INT0_1 MIX1 INP1", "DEC0", "RX_TX DEC0_INP"},
{"RX INT0_1 MIX1 INP1", "DEC1", "RX_TX DEC1_INP"},
{"RX INT0_1 MIX1 INP2", "RX0", "RX_RX0"}, {"RX INT0_1 MIX1 INP2", "RX0", "RX_RX0"},
{"RX INT0_1 MIX1 INP2", "RX1", "RX_RX1"}, {"RX INT0_1 MIX1 INP2", "RX1", "RX_RX1"},
{"RX INT0_1 MIX1 INP2", "RX2", "RX_RX2"}, {"RX INT0_1 MIX1 INP2", "RX2", "RX_RX2"},
@@ -3351,6 +3355,8 @@ static const struct snd_soc_dapm_route rx_audio_map[] = {
{"RX INT0_1 MIX1 INP2", "RX5", "RX_RX5"}, {"RX INT0_1 MIX1 INP2", "RX5", "RX_RX5"},
{"RX INT0_1 MIX1 INP2", "IIR0", "IIR0"}, {"RX INT0_1 MIX1 INP2", "IIR0", "IIR0"},
{"RX INT0_1 MIX1 INP2", "IIR1", "IIR1"}, {"RX INT0_1 MIX1 INP2", "IIR1", "IIR1"},
{"RX INT0_1 MIX1 INP2", "DEC0", "RX_TX DEC0_INP"},
{"RX INT0_1 MIX1 INP2", "DEC1", "RX_TX DEC1_INP"},
{"RX INT1_1 MIX1 INP0", "RX0", "RX_RX0"}, {"RX INT1_1 MIX1 INP0", "RX0", "RX_RX0"},
{"RX INT1_1 MIX1 INP0", "RX1", "RX_RX1"}, {"RX INT1_1 MIX1 INP0", "RX1", "RX_RX1"},
@@ -3360,6 +3366,8 @@ static const struct snd_soc_dapm_route rx_audio_map[] = {
{"RX INT1_1 MIX1 INP0", "RX5", "RX_RX5"}, {"RX INT1_1 MIX1 INP0", "RX5", "RX_RX5"},
{"RX INT1_1 MIX1 INP0", "IIR0", "IIR0"}, {"RX INT1_1 MIX1 INP0", "IIR0", "IIR0"},
{"RX INT1_1 MIX1 INP0", "IIR1", "IIR1"}, {"RX INT1_1 MIX1 INP0", "IIR1", "IIR1"},
{"RX INT1_1 MIX1 INP0", "DEC0", "RX_TX DEC0_INP"},
{"RX INT1_1 MIX1 INP0", "DEC1", "RX_TX DEC1_INP"},
{"RX INT1_1 MIX1 INP1", "RX0", "RX_RX0"}, {"RX INT1_1 MIX1 INP1", "RX0", "RX_RX0"},
{"RX INT1_1 MIX1 INP1", "RX1", "RX_RX1"}, {"RX INT1_1 MIX1 INP1", "RX1", "RX_RX1"},
{"RX INT1_1 MIX1 INP1", "RX2", "RX_RX2"}, {"RX INT1_1 MIX1 INP1", "RX2", "RX_RX2"},
@@ -3368,6 +3376,8 @@ static const struct snd_soc_dapm_route rx_audio_map[] = {
{"RX INT1_1 MIX1 INP1", "RX5", "RX_RX5"}, {"RX INT1_1 MIX1 INP1", "RX5", "RX_RX5"},
{"RX INT1_1 MIX1 INP1", "IIR0", "IIR0"}, {"RX INT1_1 MIX1 INP1", "IIR0", "IIR0"},
{"RX INT1_1 MIX1 INP1", "IIR1", "IIR1"}, {"RX INT1_1 MIX1 INP1", "IIR1", "IIR1"},
{"RX INT1_1 MIX1 INP1", "DEC0", "RX_TX DEC0_INP"},
{"RX INT1_1 MIX1 INP1", "DEC1", "RX_TX DEC1_INP"},
{"RX INT1_1 MIX1 INP2", "RX0", "RX_RX0"}, {"RX INT1_1 MIX1 INP2", "RX0", "RX_RX0"},
{"RX INT1_1 MIX1 INP2", "RX1", "RX_RX1"}, {"RX INT1_1 MIX1 INP2", "RX1", "RX_RX1"},
{"RX INT1_1 MIX1 INP2", "RX2", "RX_RX2"}, {"RX INT1_1 MIX1 INP2", "RX2", "RX_RX2"},
@@ -3376,6 +3386,8 @@ static const struct snd_soc_dapm_route rx_audio_map[] = {
{"RX INT1_1 MIX1 INP2", "RX5", "RX_RX5"}, {"RX INT1_1 MIX1 INP2", "RX5", "RX_RX5"},
{"RX INT1_1 MIX1 INP2", "IIR0", "IIR0"}, {"RX INT1_1 MIX1 INP2", "IIR0", "IIR0"},
{"RX INT1_1 MIX1 INP2", "IIR1", "IIR1"}, {"RX INT1_1 MIX1 INP2", "IIR1", "IIR1"},
{"RX INT1_1 MIX1 INP2", "DEC0", "RX_TX DEC0_INP"},
{"RX INT1_1 MIX1 INP2", "DEC1", "RX_TX DEC1_INP"},
{"RX INT2_1 MIX1 INP0", "RX0", "RX_RX0"}, {"RX INT2_1 MIX1 INP0", "RX0", "RX_RX0"},
{"RX INT2_1 MIX1 INP0", "RX1", "RX_RX1"}, {"RX INT2_1 MIX1 INP0", "RX1", "RX_RX1"},
@@ -3385,6 +3397,8 @@ static const struct snd_soc_dapm_route rx_audio_map[] = {
{"RX INT2_1 MIX1 INP0", "RX5", "RX_RX5"}, {"RX INT2_1 MIX1 INP0", "RX5", "RX_RX5"},
{"RX INT2_1 MIX1 INP0", "IIR0", "IIR0"}, {"RX INT2_1 MIX1 INP0", "IIR0", "IIR0"},
{"RX INT2_1 MIX1 INP0", "IIR1", "IIR1"}, {"RX INT2_1 MIX1 INP0", "IIR1", "IIR1"},
{"RX INT2_1 MIX1 INP0", "DEC0", "RX_TX DEC0_INP"},
{"RX INT2_1 MIX1 INP0", "DEC1", "RX_TX DEC1_INP"},
{"RX INT2_1 MIX1 INP1", "RX0", "RX_RX0"}, {"RX INT2_1 MIX1 INP1", "RX0", "RX_RX0"},
{"RX INT2_1 MIX1 INP1", "RX1", "RX_RX1"}, {"RX INT2_1 MIX1 INP1", "RX1", "RX_RX1"},
{"RX INT2_1 MIX1 INP1", "RX2", "RX_RX2"}, {"RX INT2_1 MIX1 INP1", "RX2", "RX_RX2"},
@@ -3393,6 +3407,8 @@ static const struct snd_soc_dapm_route rx_audio_map[] = {
{"RX INT2_1 MIX1 INP1", "RX5", "RX_RX5"}, {"RX INT2_1 MIX1 INP1", "RX5", "RX_RX5"},
{"RX INT2_1 MIX1 INP1", "IIR0", "IIR0"}, {"RX INT2_1 MIX1 INP1", "IIR0", "IIR0"},
{"RX INT2_1 MIX1 INP1", "IIR1", "IIR1"}, {"RX INT2_1 MIX1 INP1", "IIR1", "IIR1"},
{"RX INT2_1 MIX1 INP1", "DEC0", "RX_TX DEC0_INP"},
{"RX INT2_1 MIX1 INP1", "DEC1", "RX_TX DEC1_INP"},
{"RX INT2_1 MIX1 INP2", "RX0", "RX_RX0"}, {"RX INT2_1 MIX1 INP2", "RX0", "RX_RX0"},
{"RX INT2_1 MIX1 INP2", "RX1", "RX_RX1"}, {"RX INT2_1 MIX1 INP2", "RX1", "RX_RX1"},
{"RX INT2_1 MIX1 INP2", "RX2", "RX_RX2"}, {"RX INT2_1 MIX1 INP2", "RX2", "RX_RX2"},
@@ -3401,6 +3417,8 @@ static const struct snd_soc_dapm_route rx_audio_map[] = {
{"RX INT2_1 MIX1 INP2", "RX5", "RX_RX5"}, {"RX INT2_1 MIX1 INP2", "RX5", "RX_RX5"},
{"RX INT2_1 MIX1 INP2", "IIR0", "IIR0"}, {"RX INT2_1 MIX1 INP2", "IIR0", "IIR0"},
{"RX INT2_1 MIX1 INP2", "IIR1", "IIR1"}, {"RX INT2_1 MIX1 INP2", "IIR1", "IIR1"},
{"RX INT2_1 MIX1 INP2", "DEC0", "RX_TX DEC0_INP"},
{"RX INT2_1 MIX1 INP2", "DEC1", "RX_TX DEC1_INP"},
{"RX INT0_1 MIX1", NULL, "RX INT0_1 MIX1 INP0"}, {"RX INT0_1 MIX1", NULL, "RX INT0_1 MIX1 INP0"},
{"RX INT0_1 MIX1", NULL, "RX INT0_1 MIX1 INP1"}, {"RX INT0_1 MIX1", NULL, "RX INT0_1 MIX1 INP1"},

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

@@ -2845,10 +2845,10 @@ static int tx_macro_init(struct snd_soc_component *component)
if (tx_priv->version == BOLERO_VERSION_2_1) if (tx_priv->version == BOLERO_VERSION_2_1)
snd_soc_component_update_bits(component, snd_soc_component_update_bits(component,
BOLERO_CDC_VA_TOP_CSR_SWR_CTRL, 0xF0, 0xA0); BOLERO_CDC_VA_TOP_CSR_SWR_CTRL, 0x0F, 0x0A);
else if (tx_priv->version == BOLERO_VERSION_2_0) else if (tx_priv->version == BOLERO_VERSION_2_0)
snd_soc_component_update_bits(component, snd_soc_component_update_bits(component,
BOLERO_CDC_TX_TOP_CSR_SWR_CTRL, 0xF0, 0xA0); BOLERO_CDC_TX_TOP_CSR_SWR_CTRL, 0x0F, 0x0A);
return 0; return 0;
} }

1
asoc/codecs/wcd937x/internal.h
View File

@@ -133,6 +133,7 @@ enum {
WCD_BOLERO_EVT_RX_MUTE = 1, /* for RX mute/unmute */ WCD_BOLERO_EVT_RX_MUTE = 1, /* for RX mute/unmute */
WCD_BOLERO_EVT_IMPED_TRUE, /* for imped true */ WCD_BOLERO_EVT_IMPED_TRUE, /* for imped true */
WCD_BOLERO_EVT_IMPED_FALSE, /* for imped false */ WCD_BOLERO_EVT_IMPED_FALSE, /* for imped false */
WCD_BOLERO_EVT_RX_COMPANDER_SOFT_RST,
WCD_BOLERO_EVT_BCS_CLK_OFF, WCD_BOLERO_EVT_BCS_CLK_OFF,
}; };

9
soc/swr-mstr-ctrl.c
View File

@@ -2771,7 +2771,8 @@ static int swrm_runtime_resume(struct device *dev)
/* wait for hw enumeration to complete */ /* wait for hw enumeration to complete */
usleep_range(100, 105); usleep_range(100, 105);
if (!swrm_check_link_status(swrm, 0x1)) if (!swrm_check_link_status(swrm, 0x1))
goto exit; dev_dbg(dev, "%s:failed in connecting, ssr?\n",
__func__);
swrm_cmd_fifo_wr_cmd(swrm, 0x4, 0xF, 0x0, swrm_cmd_fifo_wr_cmd(swrm, 0x4, 0xF, 0x0,
SWRS_SCP_INT_STATUS_MASK_1); SWRS_SCP_INT_STATUS_MASK_1);
if (swrm->state == SWR_MSTR_SSR) { if (swrm->state == SWR_MSTR_SSR) {
@@ -2792,7 +2793,8 @@ static int swrm_runtime_resume(struct device *dev)
swrm->intr_mask); swrm->intr_mask);
usleep_range(100, 105); usleep_range(100, 105);
if (!swrm_check_link_status(swrm, 0x1)) if (!swrm_check_link_status(swrm, 0x1))
goto exit; dev_dbg(dev, "%s:failed in connecting, ssr?\n",
__func__);
} }
swrm->state = SWR_MSTR_UP; swrm->state = SWR_MSTR_UP;
} }
@@ -2886,7 +2888,8 @@ static int swrm_runtime_suspend(struct device *dev)
usleep_range(100, 105); usleep_range(100, 105);
} }
if (!swrm_check_link_status(swrm, 0x0)) if (!swrm_check_link_status(swrm, 0x0))
goto exit; dev_dbg(dev, "%s:failed in disconnecting, ssr?\n",
__func__);
ret = swrm_clk_request(swrm, false); ret = swrm_clk_request(swrm, false);
if (ret) { if (ret) {
dev_err(dev, "%s: swrmn clk failed\n", __func__); dev_err(dev, "%s: swrmn clk failed\n", __func__);