Merge "ASoC: audio-ext-clk: enable pinctrl after clock enable" (5b8e7a4a) · Commits · e / devices / android_kernel_fairphone_FP3

sound/soc/codecs/audio-ext-clk-up.c

+9 −9

Original line number	Diff line number	Diff line
		@@ -177,6 +177,15 @@ static int audio_ext_lpass_mclk_prepare(struct clk_hw *hw)
		struct pinctrl_info *pnctrl_info = &audio_lpass_mclk->pnctrl_info;
		int ret;

		lpass_mclk.enable = 1;
		ret = afe_set_lpass_clock_v2(AFE_PORT_ID_PRIMARY_MI2S_RX,
		&lpass_mclk);
		if (ret < 0) {
		pr_err("%s afe_set_digital_codec_core_clock failed\n",
		__func__);
		return ret;
		}

		if (pnctrl_info->pinctrl) {
		ret = pinctrl_select_state(pnctrl_info->pinctrl,
		pnctrl_info->active);
		@@ -187,15 +196,6 @@ static int audio_ext_lpass_mclk_prepare(struct clk_hw *hw)
		}
		}

		lpass_mclk.enable = 1;
		ret = afe_set_lpass_clock_v2(AFE_PORT_ID_PRIMARY_MI2S_RX,
		&lpass_mclk);
		if (ret < 0) {
		pr_err("%s afe_set_digital_codec_core_clock failed\n",
		__func__);
		return ret;
		}

		if (pnctrl_info->base)
		iowrite32(1, pnctrl_info->base);
		return 0;