From patchwork Mon Mar 19 11:43:44 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hans Verkuil X-Patchwork-Id: 10292229 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 5586F602C2 for ; Mon, 19 Mar 2018 11:44:27 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 41CDD2922F for ; Mon, 19 Mar 2018 11:44:27 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 35DD129231; Mon, 19 Mar 2018 11:44:27 +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 A8B5D2922F for ; Mon, 19 Mar 2018 11:44:26 +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=gDkTpPRF4T4Yj4qAV6yhMa8bWoFVFACWDmXuTQDzPuU=; b=GgyyhCIpPL1CZ3C9DgqEcobUef H6YT2TqX8M5iKfo/ZFjIZs6jFnJn1XxL6D/lyzIQdmlU8y48ndqv0vAaeCBl1GuXWBONvc02YjyGH 6hQvl2smwc7HTkThHdDnb+ZNmTrVfOtB7iOXJAbEK8jTE2g1HEYuAOrgXbOnsCWYylWRr4FDTSK1V rEyuVHY08P+jx2scIlv1TzlXAWbeQ43Xo9a0r1Fk4t+C1pnVJzybhrhcREq3Kyrubll2+Y+pfK46C MbGvQhVQ4UUPy2Agr96QTOsk/RLw/MZZ+lU0XSsyzPlBUYUZSSRxFRZDFPj1tZDE5ab5X+61zIf1+ 3edGIEzA==; 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 1extDD-0001Nq-0n; Mon, 19 Mar 2018 11:44:23 +0000 Received: from lb2-smtp-cloud9.xs4all.net ([194.109.24.26]) by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1extCy-0001DZ-1b for linux-amlogic@lists.infradead.org; Mon, 19 Mar 2018 11:44:11 +0000 Received: from tschai.fritz.box ([212.251.195.8]) by smtp-cloud9.xs4all.net with ESMTPA id xtCbebxWOAB0wxtCiemn1l; Mon, 19 Mar 2018 12:43:52 +0100 From: Hans Verkuil To: linux-media@vger.kernel.org Subject: [PATCH 2/3] drm: bridge: dw-hdmi: check the cec-disable property Date: Mon, 19 Mar 2018 12:43:44 +0100 Message-Id: <20180319114345.29837-3-hverkuil@xs4all.nl> X-Mailer: git-send-email 2.15.1 In-Reply-To: <20180319114345.29837-1-hverkuil@xs4all.nl> References: <20180319114345.29837-1-hverkuil@xs4all.nl> X-CMAE-Envelope: MS4wfH7LhkRdAh7Vzyh22N9yOMnf6AQGVRvgmQjD8yWdYYvNnk08L5lqC8X66jm0nU3X0YnADS4JwEgab8lf4FObdmuWk4WxpwQjF60UoRjAdqDWIjXkd77l lvBM7F+fbuXXiTYTo5y+gIPjWSSP8vRkLH8MlN40dRlbB8zzy2OuU2Zlp0+rysq9myPJUELvGJrtw7fiugApSjcM4hOIbWSkw6nFUU5KDNvizW700rZvOABY SW2Djp/EJHiohJKqvyG0g8XtngKiZkD5yNfmOnKTf2aOb8woVs2iF+6U4x4dMuTE9vGnFs9r2zOGSLyQLn8fUnSR8nCWI4QHvaeLxiUrrWy7mj3F002I/YF2 a/ZgciA2 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20180319_044408_359037_DEDBA235 X-CRM114-Status: UNSURE ( 9.11 ) 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;