From: phh@phh.me (Pierre-Hugues Husson)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH 1/3] drm: bridge: synopsys/dw-hdmi: Enable cec clock
Date: Sat, 14 Oct 2017 00:53:35 +0200 [thread overview]
Message-ID: <20171013225337.5196-2-phh@phh.me> (raw)
In-Reply-To: <20171013225337.5196-1-phh@phh.me>
The documentation already mentions "cec" optional clock, but
currently the driver doesn't enable it.
Signed-off-by: Pierre-Hugues Husson <phh@phh.me>
---
drivers/gpu/drm/bridge/synopsys/dw-hdmi.c | 17 +++++++++++++++++
1 file changed, 17 insertions(+)
diff --git a/drivers/gpu/drm/bridge/synopsys/dw-hdmi.c b/drivers/gpu/drm/bridge/synopsys/dw-hdmi.c
index bf14214fa464..5007cdf43131 100644
--- a/drivers/gpu/drm/bridge/synopsys/dw-hdmi.c
+++ b/drivers/gpu/drm/bridge/synopsys/dw-hdmi.c
@@ -138,6 +138,7 @@ struct dw_hdmi {
struct device *dev;
struct clk *isfr_clk;
struct clk *iahb_clk;
+ struct clk *cec_clk;
struct dw_hdmi_i2c *i2c;
struct hdmi_data_info hdmi_data;
@@ -2382,6 +2383,18 @@ __dw_hdmi_probe(struct platform_device *pdev,
goto err_isfr;
}
+ hdmi->cec_clk = devm_clk_get(hdmi->dev, "cec");
+ if (IS_ERR(hdmi->cec_clk)) {
+ hdmi->cec_clk = NULL;
+ } else {
+ ret = clk_prepare_enable(hdmi->cec_clk);
+ if (ret) {
+ dev_err(hdmi->dev, "Cannot enable HDMI cec clock: %d\n",
+ ret);
+ goto err_res;
+ }
+ }
+
/* Product and revision IDs */
hdmi->version = (hdmi_readb(hdmi, HDMI_DESIGN_ID) << 8)
| (hdmi_readb(hdmi, HDMI_REVISION_ID) << 0);
@@ -2518,6 +2531,8 @@ __dw_hdmi_probe(struct platform_device *pdev,
cec_notifier_put(hdmi->cec_notifier);
clk_disable_unprepare(hdmi->iahb_clk);
+ if (hdmi->cec_clk)
+ clk_disable_unprepare(hdmi->cec_clk);
err_isfr:
clk_disable_unprepare(hdmi->isfr_clk);
err_res:
@@ -2541,6 +2556,8 @@ static void __dw_hdmi_remove(struct dw_hdmi *hdmi)
clk_disable_unprepare(hdmi->iahb_clk);
clk_disable_unprepare(hdmi->isfr_clk);
+ if (hdmi->cec_clk)
+ clk_disable_unprepare(hdmi->cec_clk);
if (hdmi->i2c)
i2c_del_adapter(&hdmi->i2c->adap);
--
2.14.1
next prev parent reply other threads:[~2017-10-13 22:53 UTC|newest]
Thread overview: 23+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-10-13 22:53 [PATCH 0/3] Enable CEC on rk3399 Pierre-Hugues Husson
2017-10-13 22:53 ` Pierre-Hugues Husson [this message]
2017-10-14 0:18 ` [PATCH 1/3] drm: bridge: synopsys/dw-hdmi: Enable cec clock Fabio Estevam
2017-10-14 13:21 ` Pierre-Hugues Husson
2017-10-14 13:41 ` Fabio Estevam
2017-10-14 8:16 ` Hans Verkuil
2017-10-20 7:25 ` Hans Verkuil
2017-10-20 8:12 ` Russell King - ARM Linux
2017-10-20 19:21 ` Pierre-Hugues Husson
2017-10-13 22:53 ` [PATCH 2/3] arm64: dts: rockchip: add the cec clk for dw-mipi-hdmi on rk3399 Pierre-Hugues Husson
2017-10-15 12:13 ` Heiko Stuebner
2017-10-13 22:53 ` [PATCH 3/3] arm64: dts: rockchip: enable cec pin for rk3399 firefly Pierre-Hugues Husson
2017-10-15 12:13 ` Heiko Stuebner
2017-10-14 8:23 ` [PATCH 0/3] Enable CEC on rk3399 Hans Verkuil
2017-10-14 13:14 ` Pierre-Hugues Husson
2017-10-14 14:52 ` Heiko Stuebner
2017-10-14 15:39 ` [PATCH] pinctrl: rockchip: Add iomux-route switching support for rk3288 Heiko Stuebner
2017-10-20 7:28 ` Hans Verkuil
2017-10-20 7:38 ` Heiko Stübner
2017-10-20 7:44 ` Hans Verkuil
2017-10-20 16:58 ` Heiko Stübner
2017-10-15 10:31 ` [PATCH 0/3] Enable CEC on rk3399 Hans Verkuil
2017-10-15 11:13 ` Heiko Stuebner
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=20171013225337.5196-2-phh@phh.me \
--to=phh@phh.me \
--cc=linux-arm-kernel@lists.infradead.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).