diff mbox series

[v2,3/3] drm/bridge: sii902x: make audio mclk optional

Message ID 1563811560-29589-4-git-send-email-olivier.moysan@st.com (mailing list archive)
State Mainlined
Commit 6b72c7a98bd631533c4f4ab293c8082abbb42601
Headers show
Series drm/bridge: sii902x: fix audio mclk management | expand

Commit Message

Olivier MOYSAN July 22, 2019, 4:06 p.m. UTC 
The master clock on i2s bus is not mandatory,
as sii902X internal PLL can be used instead.
Make use of mclk optional.

Signed-off-by: Olivier Moysan <olivier.moysan@st.com>
Reviewed-by: Jyri Sarha <jsarha@ti.com>
Acked-by: Andrzej Hajda <a.hajda@samsung.com>
---
 drivers/gpu/drm/bridge/sii902x.c | 19 ++++++++++---------
 1 file changed, 10 insertions(+), 9 deletions(-)

Comments

Benjamin Gaignard July 25, 2019, 10:06 a.m. UTC | #1 
Le lun. 22 juil. 2019 à 18:06, Olivier Moysan <olivier.moysan@st.com> a écrit :
>
> The master clock on i2s bus is not mandatory,
> as sii902X internal PLL can be used instead.
> Make use of mclk optional.

Applied on drm-misc-next.
Thanks,
Benjamin

>
> Signed-off-by: Olivier Moysan <olivier.moysan@st.com>
> Reviewed-by: Jyri Sarha <jsarha@ti.com>
> Acked-by: Andrzej Hajda <a.hajda@samsung.com>
> ---
>  drivers/gpu/drm/bridge/sii902x.c | 19 ++++++++++---------
>  1 file changed, 10 insertions(+), 9 deletions(-)
>
> diff --git a/drivers/gpu/drm/bridge/sii902x.c b/drivers/gpu/drm/bridge/sii902x.c
> index 962931c20efe..a323815aa9b6 100644
> --- a/drivers/gpu/drm/bridge/sii902x.c
> +++ b/drivers/gpu/drm/bridge/sii902x.c
> @@ -568,13 +568,14 @@ static int sii902x_audio_hw_params(struct device *dev, void *data,
>                 return ret;
>         }
>
> -       mclk_rate = clk_get_rate(sii902x->audio.mclk);
> -
> -       ret = sii902x_select_mclk_div(&i2s_config_reg, params->sample_rate,
> -                                     mclk_rate);
> -       if (mclk_rate != ret * params->sample_rate)
> -               dev_dbg(dev, "Inaccurate reference clock (%ld/%d != %u)\n",
> -                       mclk_rate, ret, params->sample_rate);
> +       if (sii902x->audio.mclk) {
> +               mclk_rate = clk_get_rate(sii902x->audio.mclk);
> +               ret = sii902x_select_mclk_div(&i2s_config_reg,
> +                                             params->sample_rate, mclk_rate);
> +               if (mclk_rate != ret * params->sample_rate)
> +                       dev_dbg(dev, "Inaccurate reference clock (%ld/%d != %u)\n",
> +                               mclk_rate, ret, params->sample_rate);
> +       }
>
>         mutex_lock(&sii902x->mutex);
>
> @@ -751,11 +752,11 @@ static int sii902x_audio_codec_init(struct sii902x *sii902x,
>                 sii902x->audio.i2s_fifo_sequence[i] |= audio_fifo_id[i] |
>                         i2s_lane_id[lanes[i]] | SII902X_TPI_I2S_FIFO_ENABLE;
>
> -       sii902x->audio.mclk = devm_clk_get(dev, "mclk");
> +       sii902x->audio.mclk = devm_clk_get_optional(dev, "mclk");
>         if (IS_ERR(sii902x->audio.mclk)) {
>                 dev_err(dev, "%s: No clock (audio mclk) found: %ld\n",
>                         __func__, PTR_ERR(sii902x->audio.mclk));
> -               return 0;
> +               return PTR_ERR(sii902x->audio.mclk);
>         }
>
>         sii902x->audio.pdev = platform_device_register_data(
> --
> 2.7.4
>
> _______________________________________________
> dri-devel mailing list
> dri-devel@lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/dri-devel
diff mbox series

Patch

diff --git a/drivers/gpu/drm/bridge/sii902x.c b/drivers/gpu/drm/bridge/sii902x.c
index 962931c20efe..a323815aa9b6 100644
--- a/drivers/gpu/drm/bridge/sii902x.c
+++ b/drivers/gpu/drm/bridge/sii902x.c
@@ -568,13 +568,14 @@  static int sii902x_audio_hw_params(struct device *dev, void *data,
 		return ret;
 	}
 
-	mclk_rate = clk_get_rate(sii902x->audio.mclk);
-
-	ret = sii902x_select_mclk_div(&i2s_config_reg, params->sample_rate,
-				      mclk_rate);
-	if (mclk_rate != ret * params->sample_rate)
-		dev_dbg(dev, "Inaccurate reference clock (%ld/%d != %u)\n",
-			mclk_rate, ret, params->sample_rate);
+	if (sii902x->audio.mclk) {
+		mclk_rate = clk_get_rate(sii902x->audio.mclk);
+		ret = sii902x_select_mclk_div(&i2s_config_reg,
+					      params->sample_rate, mclk_rate);
+		if (mclk_rate != ret * params->sample_rate)
+			dev_dbg(dev, "Inaccurate reference clock (%ld/%d != %u)\n",
+				mclk_rate, ret, params->sample_rate);
+	}
 
 	mutex_lock(&sii902x->mutex);
 
@@ -751,11 +752,11 @@  static int sii902x_audio_codec_init(struct sii902x *sii902x,
 		sii902x->audio.i2s_fifo_sequence[i] |= audio_fifo_id[i] |
 			i2s_lane_id[lanes[i]] |	SII902X_TPI_I2S_FIFO_ENABLE;
 
-	sii902x->audio.mclk = devm_clk_get(dev, "mclk");
+	sii902x->audio.mclk = devm_clk_get_optional(dev, "mclk");
 	if (IS_ERR(sii902x->audio.mclk)) {
 		dev_err(dev, "%s: No clock (audio mclk) found: %ld\n",
 			__func__, PTR_ERR(sii902x->audio.mclk));
-		return 0;
+		return PTR_ERR(sii902x->audio.mclk);
 	}
 
 	sii902x->audio.pdev = platform_device_register_data(