From: Hans Verkuil <hverkuil@xs4all.nl>
To: linux-media@vger.kernel.org
Cc: linux-amlogic@lists.infradead.org, devicetree@vger.kernel.org,
Hans Verkuil <hans.verkuil@cisco.com>,
dri-devel@lists.freedesktop.org,
Neil Armstrong <narmstrong@baylibre.com>
Subject: [PATCHv2 2/3] drm: bridge: dw-hdmi: check the cec-disable property
Date: Fri, 23 Mar 2018 13:59:14 +0100 [thread overview]
Message-ID: <20180323125915.13986-3-hverkuil@xs4all.nl> (raw)
In-Reply-To: <20180323125915.13986-1-hverkuil@xs4all.nl>
From: Hans Verkuil <hans.verkuil@cisco.com>
If the cec-disable property was set, then disable the DW CEC
controller. This is needed for boards that have their own
CEC controller.
Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com>
Reviewed-by: Neil Armstrong <narmstrong@baylibre.com>
---
drivers/gpu/drm/bridge/synopsys/dw-hdmi.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/drivers/gpu/drm/bridge/synopsys/dw-hdmi.c b/drivers/gpu/drm/bridge/synopsys/dw-hdmi.c
index a38db40ce990..597220e40541 100644
--- a/drivers/gpu/drm/bridge/synopsys/dw-hdmi.c
+++ b/drivers/gpu/drm/bridge/synopsys/dw-hdmi.c
@@ -2508,7 +2508,8 @@ __dw_hdmi_probe(struct platform_device *pdev,
hdmi->audio = platform_device_register_full(&pdevinfo);
}
- if (config0 & HDMI_CONFIG0_CEC) {
+ if ((config0 & HDMI_CONFIG0_CEC) &&
+ !of_property_read_bool(np, "cec-disable")) {
cec.hdmi = hdmi;
cec.ops = &dw_hdmi_cec_ops;
cec.irq = irq;
--
2.15.1
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel
next prev parent reply other threads:[~2018-03-23 12:59 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-03-23 12:59 [PATCHv2 0/3] dw-hdmi: add property to disable CEC Hans Verkuil
2018-03-23 12:59 ` [PATCHv2 1/3] dt-bindings: display: dw_hdmi.txt: add cec-disable property Hans Verkuil
2018-03-26 22:25 ` Rob Herring
2018-04-03 8:27 ` Hans Verkuil
2018-06-29 7:17 ` Neil Armstrong
2018-07-02 9:02 ` Hans Verkuil
2018-03-23 12:59 ` Hans Verkuil [this message]
2018-03-23 12:59 ` [PATCHv2 3/3] arm64: dts: meson-gx.dtsi: add cec-disable Hans Verkuil
2018-03-24 11:00 ` [PATCHv2 0/3] dw-hdmi: add property to disable CEC Martin Blumenstingl
2018-03-24 13:41 ` Neil Armstrong
2018-03-24 14:25 ` Martin Blumenstingl
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=20180323125915.13986-3-hverkuil@xs4all.nl \
--to=hverkuil@xs4all.nl \
--cc=devicetree@vger.kernel.org \
--cc=dri-devel@lists.freedesktop.org \
--cc=hans.verkuil@cisco.com \
--cc=linux-amlogic@lists.infradead.org \
--cc=linux-media@vger.kernel.org \
--cc=narmstrong@baylibre.com \
/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).