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: 10292215 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 E1770605B4 for ; Mon, 19 Mar 2018 11:43:58 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id CF2432922F for ; Mon, 19 Mar 2018 11:43:58 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id C401129232; Mon, 19 Mar 2018 11:43:58 +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 8A45529234 for ; Mon, 19 Mar 2018 11:43:58 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id A26036E502; Mon, 19 Mar 2018 11:43:57 +0000 (UTC) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from lb3-smtp-cloud9.xs4all.net (lb3-smtp-cloud9.xs4all.net [194.109.24.30]) by gabe.freedesktop.org (Postfix) with ESMTPS id 477606E4FB for ; Mon, 19 Mar 2018 11:43:53 +0000 (UTC) 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-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;