From: Benjamin Gaignard <benjamin.gaignard@linaro.org>
To: Olivier Moysan <olivier.moysan@st.com>
Cc: Mark Rutland <mark.rutland@arm.com>,
devicetree@vger.kernel.org, jernej.skrabec@siol.net,
Benjamin GAIGNARD <benjamin.gaignard@st.com>,
Jonas Karlman <jonas@kwiboo.se>, David Airlie <airlied@linux.ie>,
Neil Armstrong <narmstrong@baylibre.com>,
Jyri Sarha <jsarha@ti.com>,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
ML dri-devel <dri-devel@lists.freedesktop.org>,
Andrzej Hajda <a.hajda@samsung.com>,
Rob Herring <robh+dt@kernel.org>,
Laurent Pinchart <Laurent.pinchart@ideasonboard.com>,
Daniel Vetter <daniel@ffwll.ch>,
linux-stm32@st-md-mailman.stormreply.com,
Linux ARM <linux-arm-kernel@lists.infradead.org>,
Alexandre Torgue <alexandre.torgue@st.com>
Subject: Re: [PATCH v2 3/3] drm/bridge: sii902x: make audio mclk optional
Date: Thu, 25 Jul 2019 12:06:10 +0200 [thread overview]
Message-ID: <CA+M3ks6ZRrLAa=xMPi5UfdLEzMCBCjeovUei2O9m8V4PW3bh-Q@mail.gmail.com> (raw)
In-Reply-To: <1563811560-29589-4-git-send-email-olivier.moysan@st.com>
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
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
prev parent reply other threads:[~2019-07-25 10:07 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-07-22 16:05 [PATCH v2 0/3] drm/bridge: sii902x: fix audio mclk management Olivier Moysan
2019-07-22 16:05 ` [PATCH v2 1/3] drm/bridge: sii902x: fix missing reference to mclk clock Olivier Moysan
2019-07-25 10:05 ` Benjamin Gaignard
2019-07-22 16:05 ` [PATCH v2 2/3] dt-bindings: display: sii902x: Change audio mclk binding Olivier Moysan
2019-07-25 10:05 ` Benjamin Gaignard
2019-07-22 16:06 ` [PATCH v2 3/3] drm/bridge: sii902x: make audio mclk optional Olivier Moysan
2019-07-25 10:06 ` Benjamin Gaignard [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to='CA+M3ks6ZRrLAa=xMPi5UfdLEzMCBCjeovUei2O9m8V4PW3bh-Q@mail.gmail.com' \
--to=benjamin.gaignard@linaro.org \
--cc=Laurent.pinchart@ideasonboard.com \
--cc=a.hajda@samsung.com \
--cc=airlied@linux.ie \
--cc=alexandre.torgue@st.com \
--cc=benjamin.gaignard@st.com \
--cc=daniel@ffwll.ch \
--cc=devicetree@vger.kernel.org \
--cc=dri-devel@lists.freedesktop.org \
--cc=jernej.skrabec@siol.net \
--cc=jonas@kwiboo.se \
--cc=jsarha@ti.com \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-stm32@st-md-mailman.stormreply.com \
--cc=mark.rutland@arm.com \
--cc=narmstrong@baylibre.com \
--cc=olivier.moysan@st.com \
--cc=robh+dt@kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).