From mboxrd@z Thu Jan 1 00:00:00 1970 From: narmstrong@baylibre.com (Neil Armstrong) Date: Mon, 19 Mar 2018 14:11:39 +0100 Subject: [PATCH 2/3] drm: bridge: dw-hdmi: check the cec-disable property In-Reply-To: <20180319114345.29837-3-hverkuil@xs4all.nl> References: <20180319114345.29837-1-hverkuil@xs4all.nl> <20180319114345.29837-3-hverkuil@xs4all.nl> Message-ID: <7ec5ea06-92ab-59e6-898c-57b3e5cdf83d@baylibre.com> To: linus-amlogic@lists.infradead.org List-Id: linus-amlogic.lists.infradead.org On 19/03/2018 12:43, Hans Verkuil wrote: > From: Hans Verkuil > > 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 > --- > 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; > I suspected the bit was off for the Amlogic GX SoCs, I was wrong... Reviewed-by: Neil Armstrong