From patchwork Thu May 2 22:53:32 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Doug Anderson X-Patchwork-Id: 10927729 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 211DC1398 for ; Thu, 2 May 2019 22:54:34 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 094AF22F3E for ; Thu, 2 May 2019 22:54:34 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id EDB5F26E3C; Thu, 2 May 2019 22:54:33 +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=-5.2 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,MAILING_LIST_MULTI,RCVD_IN_DNSWL_MED 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 921E522F3E for ; Thu, 2 May 2019 22:54:33 +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:Cc:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version: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:In-Reply-To:References: List-Owner; bh=ZN0LhcMdrL1LKYSWe/qQBbnaJzarkEwFLY/QE1qlVjE=; b=VpHugkAayoKgBK W9hFloXvZc4ZwmSNvYybPt6EhUDJ+uWn5KIqSbCZOcqw8AFPEQLWSIRpa5LmRSMdakI089n3lMd3C XoP6ZnK8qEl5djDk89ul/yBlFBQERHTumOaBgKuJoS4RZhsY0AK8fVV4QVxUMGDb78lA2ZEZcNaTk 4p30DPxcFwVotVbY2CeVnz9U077UeQOXpumLjYxnqpvCw1uQOfRqicgAXLSIHMSFtIsqYueFxvTgf 4k+D+z1WmqHUwdMBQCHyUH4O71raibWC9XgWrlyqwagwvu7QzhCSLtqcxvVOY1X8IR4I7qP5LJrUf 9tWOS3F+R96J8XTPEfZw==; 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 1hMKay-00053u-IX; Thu, 02 May 2019 22:54:28 +0000 Received: from mail-pf1-x443.google.com ([2607:f8b0:4864:20::443]) by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1hMKau-00052a-U9 for linux-arm-kernel@lists.infradead.org; Thu, 02 May 2019 22:54:26 +0000 Received: by mail-pf1-x443.google.com with SMTP id 188so1849621pfd.8 for ; Thu, 02 May 2019 15:54:24 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=U2bbAFLYHg7BbnCqa8Z/3P6ZnGKzIwrgxFqmU0u6MtQ=; b=nvDXTTBkx6gM2GY6hocJXtXsnawL+o/xemGlJje4+eusDN2A0o97J9U5hlrR6RCeYY IaJiOv66CzjRFRG/86f/hhXlcSZ+ENN1Ls1spzYSyWL9Pe4VRgvlST5J0rYjN+wmNlBC i7F+im4W83ea6FPef3xVPExFEFv7Pdt/bcRcQ= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=U2bbAFLYHg7BbnCqa8Z/3P6ZnGKzIwrgxFqmU0u6MtQ=; b=sc5NcbXdDtSc7YlGF8aGhUX1jGDV5d694ArNPcEeIMngrlt3qegK9BbQvbAZ9iW/9Z NK+Ki/SN6qvZvjsfGTy18lI9qVYXz7A5G/UXFn/R20eOQ/DcDLfqIYsqCC/3gGtimrS8 w8KwIyF0MDJj4HpcVcxHwIR3ZosiYn2wLlHZTALJOO8aJoRGZYby9DMTHLZx3J0JqMAv vLCkkUVdN7W7QdIhpllz2bs76pLPsd5ZjdHR9OgvDWhX1fQsc+D5YT877UpXKw6m9Rcs g8fnFw9LPimWK6FFqnI36GUgnDCzKXfD+Ze24AkJdR7Ioz1eHyK5PLLNcEHu0fXgpikc Wvhg== X-Gm-Message-State: APjAAAXcE+6uukZYPe5a0euSyvXKByRkcLCJ5UWbBJvLhIkv+2j99q59 hzUp5BX3QRNWQyVJSi5W964UWw== X-Google-Smtp-Source: APXvYqwTNwDX8rXg0Agwu8rSnUQ7+u0qFbATbHXFLNSH3EgUqxCM+Vs9APjZJjt0fwjZRPzV6nerSA== X-Received: by 2002:a65:6688:: with SMTP id b8mr6519822pgw.81.1556837664123; Thu, 02 May 2019 15:54:24 -0700 (PDT) Received: from tictac2.mtv.corp.google.com ([2620:15c:202:1:24fa:e766:52c9:e3b2]) by smtp.gmail.com with ESMTPSA id v15sm264736pff.105.2019.05.02.15.54.22 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 02 May 2019 15:54:23 -0700 (PDT) From: Douglas Anderson To: Heiko Stuebner , Sandy Huang , Andrzej Hajda , Laurent Pinchart , Rob Herring Subject: [PATCH 1/5] dt-bindings: drm/bridge/synopsys: dw-hdmi: Add "unwedge" for ddc bus Date: Thu, 2 May 2019 15:53:32 -0700 Message-Id: <20190502225336.206885-1-dianders@chromium.org> X-Mailer: git-send-email 2.21.0.1020.gf2820cf01a-goog MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20190502_155424_998384_5BB9163E X-CRM114-Status: GOOD ( 13.35 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Mark Rutland , devicetree@vger.kernel.org, Neil Armstrong , David Airlie , Douglas Anderson , dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org, linux-rockchip@lists.infradead.org, mka@chromium.org, Sean Paul , Daniel Vetter , linux-arm-kernel@lists.infradead.org Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Virus-Scanned: ClamAV using ClamSMTP In certain situations it was seen that we could wedge up the DDC bus on the HDMI adapter on rk3288. The only way to unwedge was to mux one of the pins over to GPIO output-driven-low temporarily and then quickly mux back. Full details can be found in the patch ("drm/bridge/synopsys: dw-hdmi: Add "unwedge" for ddc bus"). Since unwedge requires remuxing the pins, we first need to add to the bindings so that we can specify what state the pins should be in for unwedging. Signed-off-by: Douglas Anderson Reviewed-by: Rob Herring --- .../bindings/display/rockchip/dw_hdmi-rockchip.txt | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/Documentation/devicetree/bindings/display/rockchip/dw_hdmi-rockchip.txt b/Documentation/devicetree/bindings/display/rockchip/dw_hdmi-rockchip.txt index 39143424a474..8346bac81f1c 100644 --- a/Documentation/devicetree/bindings/display/rockchip/dw_hdmi-rockchip.txt +++ b/Documentation/devicetree/bindings/display/rockchip/dw_hdmi-rockchip.txt @@ -38,6 +38,13 @@ Optional properties - phys: from general PHY binding: the phandle for the PHY device. - phy-names: Should be "hdmi" if phys references an external phy. +Optional pinctrl entry: +- If you have both a "unwedge" and "default" pinctrl entry, dw_hdmi + will switch to the unwedge pinctrl state for 10ms if it ever gets an + i2c timeout. It's intended that this unwedge pinctrl entry will + cause the SDA line to be driven low to work around a hardware + errata. + Example: hdmi: hdmi@ff980000 { From patchwork Thu May 2 22:53:34 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Doug Anderson X-Patchwork-Id: 10927737 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id A34111398 for ; Thu, 2 May 2019 22:54:47 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 901CF22F3E for ; Thu, 2 May 2019 22:54:47 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 8417026E3C; Thu, 2 May 2019 22:54:47 +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=-5.2 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,MAILING_LIST_MULTI,RCVD_IN_DNSWL_MED 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 3460422F3E for ; Thu, 2 May 2019 22:54:47 +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:Cc:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version: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=rtHaL+t7pQ1/qjhein2ijc8/euuG8TkvzFYJqv7ORhM=; b=K879sCW6r9Ro1K vu/1fEfWqrP4oin8Gy/n0OkNOls0eunmxK+6kiaModFxiO3Nlanb93unFa6r0e5iGDFo3Qtp33sSE 1/EqX7H73MeoowCQFYRN5IOlCJ3FQhJv4OluZRsYo7CK7kGtOpmiK+9vWrMFhLji4ID3UYfVtHj4Q e4eX2lkQL9N3XHSmOXdnGiXLwMY7PqcGyPEWBzFyhj5/4flgIki1rXQc6Z7PlS41qnKpPebWt4yfH KsH6D8Wvs9x568pLJFWfsHde+6iHPlr63VAKQJ+lzHX9p90CcTWZbLAowgJaXvkSy+t574BDeiQmL e9yfXGww9S/SAMq3tD3Q==; 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 1hMKbB-0005LG-D4; Thu, 02 May 2019 22:54:41 +0000 Received: from mail-pl1-x641.google.com ([2607:f8b0:4864:20::641]) by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1hMKax-00053R-78 for linux-arm-kernel@lists.infradead.org; Thu, 02 May 2019 22:54:28 +0000 Received: by mail-pl1-x641.google.com with SMTP id a59so1715381pla.5 for ; Thu, 02 May 2019 15:54:27 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=BCfT3guVZby54KoAuU06+BY6v/qUrN3VwEkT+0PJiPM=; b=myoH4NG/U3H7QRfzmXh4KXBkwHqlnBXLuw+YtDbLUP16dgiGTtAys0/bk3SYGDdI70 6K+XsQzwdrj70SZjh8KM5efvveW/76bJR9i09nnkUlZn/ZFw1ZqUNUvi7N6yAStsPwSx uiRq7YcNI6KCMxbDCNVDo5hZeJamSb50B5Czo= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=BCfT3guVZby54KoAuU06+BY6v/qUrN3VwEkT+0PJiPM=; b=Yqm4Igy2Mhm8vHtLntdPrnVkDEp7aeKtQAWaXyXuR9iG85h5viI0lJLP4xloNI1w9n kwzOsGuvyT9ezx/36viZPJDbsn0R0H9QCwM8RDqh3LQulq8FyZG5gWz8Uc9RyIlzEauW /OrpiUaz11NQucpiMRNAZwcWxrmKZ/y3Jl/4RgPxQgU4PbZu15PFCeYK/OInRFgiiugK V8wip/0URZNL5407NF7sYq1oiArROR3xgSvCECVIrixRxFGRAxsdyubnq6POCn0YMXxx P1p8dfeA+V6E7EvTdoiG+wBiQQZ9VYfSjeLHsFNxJADtxrwsg6w6YUuaVFbVW6RORfbg rQvQ== X-Gm-Message-State: APjAAAXlmkfqwnflT2OIWoHVIFlpwmoUChKTMMlm58ATvJay1czkvLZI e1RMRw8oaNsKW3leGk3KZ3ng5NY+7VQ= X-Google-Smtp-Source: APXvYqw7cw2KkNl8Nu4qGTRrZSO9BSZbc8Jug59xzytFinnS0nDNEMXcfMRtFwgbTp5rGb5QpsTCQQ== X-Received: by 2002:a17:902:1602:: with SMTP id g2mr6499886plg.325.1556837666467; Thu, 02 May 2019 15:54:26 -0700 (PDT) Received: from tictac2.mtv.corp.google.com ([2620:15c:202:1:24fa:e766:52c9:e3b2]) by smtp.gmail.com with ESMTPSA id v15sm264736pff.105.2019.05.02.15.54.25 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 02 May 2019 15:54:25 -0700 (PDT) From: Douglas Anderson To: Heiko Stuebner , Sandy Huang , Andrzej Hajda , Laurent Pinchart , Rob Herring Subject: [PATCH 3/5] ARM: dts: rockchip: Switch to builtin HDMI DDC bus on rk3288-veyron Date: Thu, 2 May 2019 15:53:34 -0700 Message-Id: <20190502225336.206885-3-dianders@chromium.org> X-Mailer: git-send-email 2.21.0.1020.gf2820cf01a-goog In-Reply-To: <20190502225336.206885-1-dianders@chromium.org> References: <20190502225336.206885-1-dianders@chromium.org> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20190502_155427_255548_5A9E3B73 X-CRM114-Status: GOOD ( 14.71 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Mark Rutland , devicetree@vger.kernel.org, Neil Armstrong , Douglas Anderson , linux-kernel@vger.kernel.org, linux-rockchip@lists.infradead.org, mka@chromium.org, Sean Paul , linux-arm-kernel@lists.infradead.org Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Virus-Scanned: ClamAV using ClamSMTP Downstream Chrome OS kernels use the builtin DDC bus from dw_hdmi on veyron. This is the only way to get them to negotiate HDCP. Although HDCP isn't currently all supported upstream, it still seems like it makes sense to use dw_hdmi's builtin I2C. Maybe eventually we can get HDCP negotiation working. Signed-off-by: Douglas Anderson Reviewed-by: Sean Paul --- arch/arm/boot/dts/rk3288-veyron.dtsi | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) diff --git a/arch/arm/boot/dts/rk3288-veyron.dtsi b/arch/arm/boot/dts/rk3288-veyron.dtsi index 1252522392c7..e1bee663d2c5 100644 --- a/arch/arm/boot/dts/rk3288-veyron.dtsi +++ b/arch/arm/boot/dts/rk3288-veyron.dtsi @@ -163,7 +163,8 @@ }; &hdmi { - ddc-i2c-bus = <&i2c5>; + pinctrl-names = "default"; + pinctrl-0 = <&hdmi_ddc>; status = "okay"; }; @@ -334,14 +335,6 @@ i2c-scl-rising-time-ns = <300>; /* 225ns measured */ }; -&i2c5 { - status = "okay"; - - clock-frequency = <100000>; - i2c-scl-falling-time-ns = <300>; - i2c-scl-rising-time-ns = <1000>; -}; - &io_domains { status = "okay"; From patchwork Thu May 2 22:53:35 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Doug Anderson X-Patchwork-Id: 10927739 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 62F32912 for ; Thu, 2 May 2019 22:54:55 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 4FF4026490 for ; Thu, 2 May 2019 22:54:55 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 41D5826D08; Thu, 2 May 2019 22:54:55 +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=-5.2 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,MAILING_LIST_MULTI,RCVD_IN_DNSWL_MED 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 E400526490 for ; Thu, 2 May 2019 22:54:54 +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:Cc:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version: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=RruPwQLacYxf2+d3jlQ+b6spQ+4bEr6Y+zpCkvATZXs=; b=eTlW+p0fCUkeOn ncXQOrai0BWZ1jOGOIBOIgKZ7SHDa577gpEvcaN5rRjxKo7ZEOob46aslbwcyo+SX9qE43he8sGk4 1sxV2DkfIas/AsQ+Vk9YupdVRNs2q3E0j46yaJEHMlRGujTvhMt8DLJHmE2IDlo0smUscCFAQlVpd ilf0iy5xWde3+4D4Py/Zz1jRQdBWoMe8DsdMSHU5q6xWdmw34oCXu79xrM+uLsP7X8QAII5JxDubY htzfGBHfGBC0yyeTxctAgpWaIhl+YEqSKhTA5og/Yn5EzZAIXwbWd/ZMWdzgflKhUmvKcUfkp6ndP 7m+5vMN1lMBn5GwBKwpA==; 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 1hMKbI-0005Yd-RW; Thu, 02 May 2019 22:54:48 +0000 Received: from mail-pl1-x641.google.com ([2607:f8b0:4864:20::641]) by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1hMKax-00053y-VV for linux-arm-kernel@lists.infradead.org; Thu, 02 May 2019 22:54:30 +0000 Received: by mail-pl1-x641.google.com with SMTP id b3so1702647plr.7 for ; Thu, 02 May 2019 15:54:27 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=P+ZPNiv5B5kytob2vOwdU5pZyvzNXPIUr8ZUKGFUcOY=; b=h0wYyVMluUVAdv1NwQOAAhlwteWpgYwW8HXhS8VG32Z7Lf9yxA4NuF5+A0czBvZzKv lJVcxHPaPYIKXirJmLKL7liFbEaF4geinpGCsaSD7+tuUJ31PO4yA9oJQyZ+bTMX2yqH davXBEyebjxtzyIeeIKbXwcoU9AzTCZef7yaI= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=P+ZPNiv5B5kytob2vOwdU5pZyvzNXPIUr8ZUKGFUcOY=; b=DrP0O45OvMk9uklU/lfLtt8Som+W93EUEseCOf0x63ih654WW/E4wOeTML778wIk8G Kg+Eme1pVAcvoV7q0rMLEO2mCbQZTnRuKgdUVU2lKWaFaQZWWsy7qko6kgBdxnDxh+tk 2eqqSryCozVNn0SQj8mdKXJAjpk7sWHb5Q2qrweOtun7WzUUrdBg58Di4e6Dxl+avQTi bX57E+P76EJBSE8bKTPVlmHZePFzbQ+DbU+FJEvCedpMEvMmi3iVuIiXuuxchRSEh1jv v7qweoni5mCj93ipj5YSBM5G+f11EhZtTvSG4Av0OESRG9lYA4XCrNOzumuZ4Gy9lcka IxJg== X-Gm-Message-State: APjAAAWnBZQgRaeQ1sy/zHfBm4gTDsrFYaQKTHYrWE3SofyrBUlPJecX tR3y52ZNPqQxG3qPzl60C7M5kw== X-Google-Smtp-Source: APXvYqzd5mafem3up8aafRaHi3Cdrlk1qdlgUPk4BmPnowawJNQiWJT3C7hEk3PNUfbliN1Sz4ERKQ== X-Received: by 2002:a17:902:8545:: with SMTP id d5mr6351215plo.198.1556837667556; Thu, 02 May 2019 15:54:27 -0700 (PDT) Received: from tictac2.mtv.corp.google.com ([2620:15c:202:1:24fa:e766:52c9:e3b2]) by smtp.gmail.com with ESMTPSA id v15sm264736pff.105.2019.05.02.15.54.26 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 02 May 2019 15:54:27 -0700 (PDT) From: Douglas Anderson To: Heiko Stuebner , Sandy Huang , Andrzej Hajda , Laurent Pinchart , Rob Herring Subject: [PATCH 4/5] ARM: dts: rockchip: Add unwedge pinctrl entries for dw_hdmi on rk3288 Date: Thu, 2 May 2019 15:53:35 -0700 Message-Id: <20190502225336.206885-4-dianders@chromium.org> X-Mailer: git-send-email 2.21.0.1020.gf2820cf01a-goog In-Reply-To: <20190502225336.206885-1-dianders@chromium.org> References: <20190502225336.206885-1-dianders@chromium.org> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20190502_155428_190407_C0F91EBA X-CRM114-Status: GOOD ( 13.53 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Mark Rutland , devicetree@vger.kernel.org, Neil Armstrong , Douglas Anderson , linux-kernel@vger.kernel.org, linux-rockchip@lists.infradead.org, mka@chromium.org, Sean Paul , linux-arm-kernel@lists.infradead.org Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Virus-Scanned: ClamAV using ClamSMTP This adds the "unwedge" pinctrl entries introduced by a recent dw_hdmi change that can unwedge the dw_hdmi i2c bus in some cases. It's expected that any boards using this would add: pinctrl-names = "default", "unwedge"; pinctrl-0 = <&hdmi_ddc>; pinctrl-1 = <&hdmi_ddc_unwedge>; Note that this isn't added by default because some boards may choose to mux i2c5 for their DDC bus (if that is more tested for them). Signed-off-by: Douglas Anderson Reviewed-by: Sean Paul --- arch/arm/boot/dts/rk3288.dtsi | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/arch/arm/boot/dts/rk3288.dtsi b/arch/arm/boot/dts/rk3288.dtsi index 74c9517c4f92..eebc04fa1e4d 100644 --- a/arch/arm/boot/dts/rk3288.dtsi +++ b/arch/arm/boot/dts/rk3288.dtsi @@ -1545,6 +1545,15 @@ rockchip,pins = <7 RK_PC3 2 &pcfg_pull_none>, <7 RK_PC4 2 &pcfg_pull_none>; }; + + hdmi_ddc_unwedge: hdmi-ddc-unwedge { + rockchip,pins = <7 RK_PC3 RK_FUNC_GPIO &pcfg_output_low>, + <7 RK_PC4 2 &pcfg_pull_none>; + }; + }; + + pcfg_output_low: pcfg-output-low { + output-low; }; pcfg_pull_up: pcfg-pull-up { From patchwork Thu May 2 22:53:36 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Doug Anderson X-Patchwork-Id: 10927745 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 7D00A1398 for ; Thu, 2 May 2019 22:55:18 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 6B06B22BF1 for ; Thu, 2 May 2019 22:55:18 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 5E97026CFF; Thu, 2 May 2019 22:55:18 +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=-5.2 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,MAILING_LIST_MULTI,RCVD_IN_DNSWL_MED 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 15A2622BF1 for ; Thu, 2 May 2019 22:55:18 +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:Cc:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version: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=+IHr/T6DSDwd1zs6reiVGU1mXo7rP1plfQ/XkoetsD0=; b=n+XVEAX3t0zBh5 r2lPmXOC9BSC26ZPiDZqZ7hBIVCwd6nmklRhTmq3bMVYQF2uvLt1k0CE/D104CPGUUGeXd97elUhN FjsJU5HkB8U/+Ydj6ZhsB2Bgp2NviLWpgTA/U0+ZAgaL0sQjKEkGkxuMB5F/drNBHRCZ1Iba6q23d hOGzVafh1xS/oVlkErdq0EGuZbMImN0pjHgZ6jRijGF75fIKeqDxGMGwYXWndeakTH1fAcITtNivQ 4AYS71Q6EYGmpRO/Ds5+UYwhIswgHOcECWJYhwwvJ2yPSDKsNDZix+ElDHBaea2xAFtTZD0UP5apv 09KZW77eemtLCTlqYbrg==; 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 1hMKbf-0006Xc-Qf; Thu, 02 May 2019 22:55:11 +0000 Received: from mail-pf1-x443.google.com ([2607:f8b0:4864:20::443]) by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1hMKaz-00055s-Bq for linux-arm-kernel@lists.infradead.org; Thu, 02 May 2019 22:54:33 +0000 Received: by mail-pf1-x443.google.com with SMTP id j11so1833913pff.13 for ; Thu, 02 May 2019 15:54:29 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=CT2YSqm9uY9lqkZxGu6xlzES7pBl2nIZjVIbCk84sRc=; b=VgR98wkKNANONfnbGrr9lcgFpOWUbpb8QW082Rc0rd/NK6ECJCvh6hOqvAFNGLwSuu a8kF9gsAk1gebx8VNGwe5TlF2czJn/t03cJrXt1krC8478dvOLahHngkZ6ZhXYl2ShXg ySGidUHXGZuJTt2LfafwCVBx7w9d6c5+uFKhw= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=CT2YSqm9uY9lqkZxGu6xlzES7pBl2nIZjVIbCk84sRc=; b=udPSMM5GipyFqA4PhUv/gJIYiX6A/kk8YVhl7obOoHW42boovgDgjpsyxvvNGZYUEx LP83bLsKz5Vh25EgsRLhhmwoj/ex08DDm5PEWKSpH4Pu2xyA54EK6y9JE4Oc8J+BzB9d 01g0fTdysKQ3t6QIM75QZ/nNop5cKilINVbtS1Lm22EtTWHImty1rcd2t7tEB5v/txhG gsddHzYrAKJdEt6G7lVz3W0+r3NV493rewCNjdqPNz+9n+ojAjyW9oHyDok8BlHscqUD v1eFs8rZrFmxYg6K53QiKha5NvE4Ra7h/yocvZTyYQgtbJODScot0RQPDXVvlLAgKjwq RtjQ== X-Gm-Message-State: APjAAAVb7haSNvt7T1RNGPGkHjaG+mvRknfdyIvTTACY94HYkhV5smDg As3xAjVpRDf2eCNo0gRhBjT5kQ== X-Google-Smtp-Source: APXvYqzTiOjbZQBE1y3q6em7X3hoV/eO9e264Ryqoxbr49JQ0+yN737erpxGaSnUtNHQVlpHiZsYFQ== X-Received: by 2002:a62:164f:: with SMTP id 76mr7040966pfw.172.1556837668900; Thu, 02 May 2019 15:54:28 -0700 (PDT) Received: from tictac2.mtv.corp.google.com ([2620:15c:202:1:24fa:e766:52c9:e3b2]) by smtp.gmail.com with ESMTPSA id v15sm264736pff.105.2019.05.02.15.54.27 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 02 May 2019 15:54:28 -0700 (PDT) From: Douglas Anderson To: Heiko Stuebner , Sandy Huang , Andrzej Hajda , Laurent Pinchart , Rob Herring Subject: [PATCH 5/5] ARM: dts: rockchip: Add HDMI i2c unwedging for rk3288-veyron Date: Thu, 2 May 2019 15:53:36 -0700 Message-Id: <20190502225336.206885-5-dianders@chromium.org> X-Mailer: git-send-email 2.21.0.1020.gf2820cf01a-goog In-Reply-To: <20190502225336.206885-1-dianders@chromium.org> References: <20190502225336.206885-1-dianders@chromium.org> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20190502_155429_614180_723A4C1D X-CRM114-Status: GOOD ( 14.05 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Mark Rutland , devicetree@vger.kernel.org, Neil Armstrong , Douglas Anderson , linux-kernel@vger.kernel.org, linux-rockchip@lists.infradead.org, mka@chromium.org, Sean Paul , linux-arm-kernel@lists.infradead.org Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Virus-Scanned: ClamAV using ClamSMTP Veyron uses the builtin i2c controller that's part of dw-hdmi. Hook up the unwedging feature. Signed-off-by: Douglas Anderson Reviewed-by: Sean Paul --- arch/arm/boot/dts/rk3288-veyron.dtsi | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/arch/arm/boot/dts/rk3288-veyron.dtsi b/arch/arm/boot/dts/rk3288-veyron.dtsi index e1bee663d2c5..340b276b6333 100644 --- a/arch/arm/boot/dts/rk3288-veyron.dtsi +++ b/arch/arm/boot/dts/rk3288-veyron.dtsi @@ -163,8 +163,9 @@ }; &hdmi { - pinctrl-names = "default"; + pinctrl-names = "default", "unwedge"; pinctrl-0 = <&hdmi_ddc>; + pinctrl-1 = <&hdmi_ddc_unwedge>; status = "okay"; };