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

Merge "ASoC: add support to configure TDM dai clk attribute and clk freq"

Bladeren bron
This commit is contained in:
Linux Build Service Account
2017-09-20 17:55:26 -07:00
gecommit door Gerrit - the friendly Code Review server
bovenliggende 24f165a616 2b6adc8ba1
commit e2c3eee3ae
1 gewijzigde bestanden met toevoegingen van 54 en 0 verwijderingen
Download Patch-bestand Download Diff-bestand Expand all files Collapse all files

54
asoc/msm-dai-q6-v2.c
Bestand weergeven

@@ -5138,6 +5138,25 @@ static int msm_dai_tdm_q6_probe(struct platform_device *pdev)
dev_dbg(&pdev->dev, "%s: Clk Rate from DT file %d\n",
__func__, tdm_clk_set.clk_freq_in_hz);
/* initialize static tdm clk attribute to default value */
tdm_clk_set.clk_attri = Q6AFE_LPASS_CLK_ATTRIBUTE_INVERT_COUPLE_NO;
/* extract tdm clk attribute into static */
if (of_find_property(pdev->dev.of_node,
"qcom,msm-cpudai-tdm-clk-attribute", NULL)) {
rc = of_property_read_u16(pdev->dev.of_node,
"qcom,msm-cpudai-tdm-clk-attribute",
&tdm_clk_set.clk_attri);
if (rc) {
dev_err(&pdev->dev, "%s: value for clk attribute not found %s\n",
__func__, "qcom,msm-cpudai-tdm-clk-attribute");
goto rtn;
}
dev_dbg(&pdev->dev, "%s: clk attribute from DT file %d\n",
__func__, tdm_clk_set.clk_attri);
} else
dev_dbg(&pdev->dev, "%s: clk attribute not found\n", __func__);
/* extract tdm clk src master/slave info into static */
rc = of_property_read_u32(pdev->dev.of_node,
"qcom,msm-cpudai-tdm-clk-internal",
@@ -6214,6 +6233,40 @@ static int msm_dai_q6_tdm_set_tdm_slot(struct snd_soc_dai *dai,
return rc;
}
static int msm_dai_q6_tdm_set_sysclk(struct snd_soc_dai *dai,
int clk_id, unsigned int freq, int dir)
{
struct msm_dai_q6_tdm_dai_data *dai_data =
dev_get_drvdata(dai->dev);
switch (dai->id) {
case AFE_PORT_ID_QUATERNARY_TDM_RX:
case AFE_PORT_ID_QUATERNARY_TDM_RX_1:
case AFE_PORT_ID_QUATERNARY_TDM_RX_2:
case AFE_PORT_ID_QUATERNARY_TDM_RX_3:
case AFE_PORT_ID_QUATERNARY_TDM_RX_4:
case AFE_PORT_ID_QUATERNARY_TDM_RX_5:
case AFE_PORT_ID_QUATERNARY_TDM_RX_6:
case AFE_PORT_ID_QUATERNARY_TDM_RX_7:
case AFE_PORT_ID_QUATERNARY_TDM_TX:
case AFE_PORT_ID_QUATERNARY_TDM_TX_1:
case AFE_PORT_ID_QUATERNARY_TDM_TX_2:
case AFE_PORT_ID_QUATERNARY_TDM_TX_3:
case AFE_PORT_ID_QUATERNARY_TDM_TX_4:
case AFE_PORT_ID_QUATERNARY_TDM_TX_5:
case AFE_PORT_ID_QUATERNARY_TDM_TX_6:
case AFE_PORT_ID_QUATERNARY_TDM_TX_7:
dai_data->clk_set.clk_freq_in_hz = freq;
break;
default:
return -EINVAL;
}
dev_dbg(dai->dev, "%s: dai id = 0x%x, group clk_freq = %d\n",
__func__, dai->id, freq);
return 0;
}
static int msm_dai_q6_tdm_set_channel_map(struct snd_soc_dai *dai,
unsigned int tx_num, unsigned int *tx_slot,
unsigned int rx_num, unsigned int *rx_slot)
@@ -6643,6 +6696,7 @@ static struct snd_soc_dai_ops msm_dai_q6_tdm_ops = {
.hw_params = msm_dai_q6_tdm_hw_params,
.set_tdm_slot = msm_dai_q6_tdm_set_tdm_slot,
.set_channel_map = msm_dai_q6_tdm_set_channel_map,
.set_sysclk = msm_dai_q6_tdm_set_sysclk,
.shutdown = msm_dai_q6_tdm_shutdown,
};