mirror of
https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git
synced 2026-10-09 13:49:24 -04:00
Merge "asoc : enable mclk after ssr for talos"
This commit is contained in:
commit
1ff3e5bc1f
1 changed files with 17 additions and 2 deletions
|
|
@ -143,6 +143,8 @@ static const char *const tdm_gpio_phandle[] = {"qcom,pri-tdm-gpios",
|
|||
|
||||
static const char *const mclk_gpio_phandle[] = { "qcom,internal-mclk2-gpios" };
|
||||
|
||||
static bool mclk_enable_status = false;
|
||||
|
||||
enum {
|
||||
TDM_0 = 0,
|
||||
TDM_1,
|
||||
|
|
@ -4253,7 +4255,7 @@ static int msm_pinctrl_init(struct platform_device *pdev, enum pinctrl_mode mode
|
|||
ret = -EIO;
|
||||
goto err;
|
||||
}
|
||||
|
||||
mclk_enable_status = true;
|
||||
ret = pinctrl_select_state(pinctrl_info->pinctrl, pinctrl_info->active);
|
||||
if (ret != 0) {
|
||||
pr_err("%s: set pin state to active failed with %d\n",
|
||||
|
|
@ -7567,7 +7569,7 @@ static int sa6155_ssr_enable(struct device *dev, void *data)
|
|||
{
|
||||
struct platform_device *pdev = to_platform_device(dev);
|
||||
struct snd_soc_card *card = platform_get_drvdata(pdev);
|
||||
int ret = 0;
|
||||
int ret = 0, i;
|
||||
|
||||
if (!card) {
|
||||
dev_err(dev, "%s: card is NULL\n", __func__);
|
||||
|
|
@ -7575,6 +7577,19 @@ static int sa6155_ssr_enable(struct device *dev, void *data)
|
|||
goto err;
|
||||
}
|
||||
|
||||
if (mclk_enable_status == true) {
|
||||
for (i = 0; i < MCLK_MAX; i++) {
|
||||
ret = afe_set_lpass_clock_v2(AFE_PORT_ID_TDM_PORT_RANGE_START,
|
||||
&internal_mclk[i]);
|
||||
if (ret < 0) {
|
||||
pr_err("%s: afe lpass clock failed to enable clock, err:%d\n",
|
||||
__func__, ret);
|
||||
ret = -EIO;
|
||||
goto err;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
dev_info(dev, "%s: setting snd_card to ONLINE\n", __func__);
|
||||
#if IS_ENABLED(CONFIG_AUDIO_QGKI)
|
||||
snd_soc_card_change_online_state(card, 1);
|
||||
|
|
|
|||
Loading…
Reference in a new issue