if (ret)
return ret;
- if (p_tdm->chipinfo && (!p_tdm->chipinfo->no_mclkpad_ctrl)) {
- ret = aml_tdm_set_clk_pad(p_tdm);
- if (ret)
- return ret;
- }
-
/* Must enabe channel number for VAD */
if ((substream->stream == SNDRV_PCM_STREAM_CAPTURE)
&& (vad_tdm_is_running(p_tdm->id)))
}
}
+ if (p_tdm->chipinfo && (!p_tdm->chipinfo->no_mclkpad_ctrl)) {
+ ret = aml_tdm_set_clk_pad(p_tdm);
+ if (ret)
+ dev_warn_once(&pdev->dev, "clk_pad set failed\n");
+ }
+
/* complete mclk for tdm */
if (get_meson_cpu_version(MESON_CPU_VERSION_LVL_MINOR) == 0xa)
meson_clk_measure((1<<16) | 0x67);
struct aml_audio_controller *actrl,
int index, int force_oe, int oe_val)
{
- unsigned int reg, offset;
-
- offset = EE_AUDIO_TDMOUT_B_CTRL0 - EE_AUDIO_TDMOUT_A_CTRL0;
- reg = EE_AUDIO_TDMOUT_A_CTRL0 + offset * index;
-
if (force_oe) {
- offset = EE_AUDIO_TDMOUT_B_CTRL2 - EE_AUDIO_TDMOUT_A_CTRL2;
- reg = EE_AUDIO_TDMOUT_A_CTRL2 + offset * index;
+ unsigned int reg, offset;
+
+ offset = EE_AUDIO_TDMOUT_B_CTRL0 - EE_AUDIO_TDMOUT_A_CTRL0;
+ reg = EE_AUDIO_TDMOUT_A_CTRL0 + offset * index;
aml_audiobus_update_bits(actrl, reg, 0xf << 24, force_oe << 24);
struct aml_audio_controller *actrl,
int index, int force_oe, int oe_val)
{
- unsigned int reg, offset;
-
if (force_oe) {
+ unsigned int reg, offset;
+
offset = EE_AUDIO_TDMOUT_B_CTRL2 - EE_AUDIO_TDMOUT_A_CTRL2;
reg = EE_AUDIO_TDMOUT_A_CTRL2 + offset * index;