From patchwork Fri Mar 23 12:59:14 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hans Verkuil X-Patchwork-Id: 10304585 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 8942B60384 for ; Fri, 23 Mar 2018 12:59:31 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 79F4628E5F for ; Fri, 23 Mar 2018 12:59:31 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 6E86D28E61; Fri, 23 Mar 2018 12:59:31 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-4.2 required=2.0 tests=BAYES_00, RCVD_IN_DNSWL_MED autolearn=ham version=3.3.1 Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 3AB0828E5F for ; Fri, 23 Mar 2018 12:59:31 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 26A006E333; Fri, 23 Mar 2018 12:59:25 +0000 (UTC) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from lb2-smtp-cloud8.xs4all.net (lb2-smtp-cloud8.xs4all.net [194.109.24.25]) by gabe.freedesktop.org (Postfix) with ESMTPS id 19FE26E323 for ; Fri, 23 Mar 2018 12:59:22 +0000 (UTC) Received: from tschai.fritz.box ([212.251.195.8]) by smtp-cloud8.xs4all.net with ESMTPA id zMHse40C67OSrzMHxeR7qR; Fri, 23 Mar 2018 13:59:21 +0100 From: Hans Verkuil To: linux-media@vger.kernel.org Subject: [PATCHv2 2/3] drm: bridge: dw-hdmi: check the cec-disable property Date: Fri, 23 Mar 2018 13:59:14 +0100 Message-Id: <20180323125915.13986-3-hverkuil@xs4all.nl> X-Mailer: git-send-email 2.15.1 In-Reply-To: <20180323125915.13986-1-hverkuil@xs4all.nl> References: <20180323125915.13986-1-hverkuil@xs4all.nl> X-CMAE-Envelope: MS4wfP7K3041hcBdCykDfzVkkNlO2cJSLk7OPJVjpG0Xbmri6WqkHQ5yOoAysIr3EocAEPX+sJM0CTKmq8oPK5BflK1EV7kLuNOOr722iE5XvgfP6MJI91nS JG2N9gorFSeaXC/HaLk0Ty6Q3lqylMLROGUTuIb0Y/3bOYFv42/mso95dXW5DcrV9dN469KvFKoeJ234T4p4veJhfR7lfHf2BjhMll9JpUC6LLRySah3M8Us Py0C5I27Ed9YzxWHDOK2p9XV8a+2fFWaz1ZcSF1yiiDEWR1b/Dpc3S/xEm9SWB9T/JUtVNbpAKfm3aLHJUIcsM8ePUG16OXbUrY0JkGFedKtIjSiez+vgGha 0m7TJyf5 X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: linux-amlogic@lists.infradead.org, devicetree@vger.kernel.org, Hans Verkuil , dri-devel@lists.freedesktop.org, Neil Armstrong MIME-Version: 1.0 Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" X-Virus-Scanned: ClamAV using ClamSMTP 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 Reviewed-by: Neil Armstrong --- 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;