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: 10304593 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 1701E60386 for ; Fri, 23 Mar 2018 12:59:47 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 0636328E5E for ; Fri, 23 Mar 2018 12:59:47 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id ED12B28E60; Fri, 23 Mar 2018 12:59:46 +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=-1.9 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID autolearn=ham version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id A412428E5E for ; Fri, 23 Mar 2018 12:59:46 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:MIME-Version:Cc:List-Subscribe: List-Help:List-Post:List-Archive:List-Unsubscribe:List-Id:References: In-Reply-To:Message-Id:Date:Subject:To:From:Reply-To:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:List-Owner; bh=RnBuOyDOiivmZ4do3sCuwsTqFzEZnGYLmROXS9xD44Q=; b=ddY8bzWD+E/F+4ah+EHBaVlOEl 3PYC7pe1gDIv+JjxNp8tzZi8URsQjnn+yZLAKrerKJMQ605FrQgaOf2M4TyIoTmDiNBKOrbl9leB8 eVyczRD7ToEUTi1UMGj6lsOgExbJwKzmxdgC2BSmIaQclmxURRg+abDTKhA1UVGMgN4ULijcG+r+e Itt3UAZ+g66v7rC7Kporx+Fl2wNBFfDupMsW3WtQEKJmahvUkmyhJ5XUakp76a+jMRsaxV8fbM7fL vHaNjQIF5gNTg2fDaXwnDyixmOG0P9vVIr/UpcCWhqplSKtxn+ouQk/eHhcJ4hvFD35F1X/OS3RlZ bNeLu7iQ==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.90_1 #2 (Red Hat Linux)) id 1ezMIK-0006pI-CW; Fri, 23 Mar 2018 12:59:44 +0000 Received: from lb3-smtp-cloud8.xs4all.net ([194.109.24.29]) by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1ezMIE-0006iN-2v for linux-amlogic@lists.infradead.org; Fri, 23 Mar 2018 12:59:40 +0000 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-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20180323_055938_378528_8CF2C654 X-CRM114-Status: UNSURE ( 7.48 ) X-CRM114-Notice: Please train this message. X-BeenThere: linux-amlogic@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: 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 Sender: "linux-amlogic" Errors-To: linux-amlogic-bounces+patchwork-linux-amlogic=patchwork.kernel.org@lists.infradead.org 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;