From patchwork Mon Apr 11 20:01:41 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stefan Wahren X-Patchwork-Id: 12809574 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id BEE52C433EF for ; Mon, 11 Apr 2022 20:04:28 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:Cc:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=DFRiJsFOR5yB2AV2aBDtCih+9xFxdQoplA3twmPRSuw=; b=wACtbMK/VypuwP CsWjpZ1MyEtcxNEx/Y2bU6+IaSrBCX02sNXZQIc7HIZekSGA6t9rAQp8PgnZzuGT3P1klNnWUl17N TcNS5BczULD1bcshoWQeLMsRGw3szOUwwqiaukFncEbqNsNpcBOMtv5MRIVGraeHTKH6pr/RZ2Hg9 Koj+KvWjltQqaebp56696lwMq0J+O5rzbX+V1JDdVJPNtUA9hJCcjLHrRnIjz9+mtgaNrMfIQHtn3 S0MZxHo3ngPisadD6qHBk3V+yDbKlm36+hHpvY+t1X930XHCgtNSe8LhjaMyWYGoEd4vx8UXnbnhA DkXueyts77jnGyqRJDAA==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1ne0Fw-00AOmL-J8; Mon, 11 Apr 2022 20:03:24 +0000 Received: from mout.kundenserver.de ([217.72.192.74]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1ne0Ew-00AOOx-H0; Mon, 11 Apr 2022 20:02:24 +0000 Received: from localhost.localdomain ([37.4.249.94]) by mrelayeu.kundenserver.de (mreue108 [212.227.15.183]) with ESMTPSA (Nemesis) id 1MuUrM-1nw5Nv0g8g-00rZ0y; Mon, 11 Apr 2022 22:02:05 +0200 From: Stefan Wahren To: Florian Fainelli , Ray Jui , Scott Branden , Rob Herring , Krzysztof Kozlowski Cc: bcm-kernel-feedback-list@broadcom.com, Nicolas Saenz Julienne , Linus Walleij , devicetree@vger.kernel.org, linux-rpi-kernel@lists.infradead.org, linux-arm-kernel@lists.infradead.org, Stefan Wahren , Phil Elwell Subject: [PATCH 4/6] ARM: dts: bcm2835-rpi-b: Fix GPIO line names Date: Mon, 11 Apr 2022 22:01:41 +0200 Message-Id: <20220411200143.4876-5-stefan.wahren@i2se.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220411200143.4876-1-stefan.wahren@i2se.com> References: <20220411200143.4876-1-stefan.wahren@i2se.com> MIME-Version: 1.0 X-Provags-ID: V03:K1:HJgaSy8A+0EDxH1dGCmk+rvbQzMnAKboKGPyiaH9iFU+ISdqomx CLcl6MPhKpUYTaU3mHvm//0aVNAxNsWeVVM4H5OpT6e4YeJXhMF+MPs5QTTTbQIsOty1jC6 2M5NlF+oQw1Od+hhMM/c3QoegIzhguvcn/z/z3DKwm2wC5BF5rnZ1tGTXLF95xEfPlJW/pB tZQFW9N8au25Bg/ZVGg+w== X-UI-Out-Filterresults: notjunk:1;V03:K0:Kf/XypCv7s0=:2dlY304k799dC+PYg9B2M2 oUh2BSfhVpWu/Zvzo1WAUK/fU6xSYzofyX8qef+ZkgsoUTzo7hDbUGeIFWkNnErvPbwtGi3dA PXUtvONU1pX5ge+wEyI47THfcuc57fN1S71Q4DNPDKPx2toB/T5gs6I3wAoewMpzDPjqJbgh0 jLa5CII+1LOmdROZYHLLtnDcQMk25Bx7rNI76yH+OSR2AqgkgrDFmalYHsQEXQloFvaIa90Wp D79xKrAXso/W5aVh20ruo7kVOeRTROdydX9luT6AbCot2ytpIxwMBjspv0cIGwzRiShOSXtgM mwwuhYxJyC5ges07mrjMTnp1dp7Iblu/ipj/QVYLvmSv89zPtLqhYvfj+q4u+P3w3OpJZxsYu LUBwXgEucx4/3qSlsar343hcHViSIKWz43Rm6AXaKgtkE7WMGHwCz8Vo85nABFxMngHYgk8Q0 ymYvvXm+XtmTGd2hBDFgSq5LXiIKzQrmMnKua3yHZDlAPmFvt8uFZAjDu3QlKeNiCf0JcjWMC tRgS4SS6wEJbqTXh7CsYlcmUJfEa5cV1KZt14V889Pp/9Or6J50OwJUxCIH6JhcjnQDD2Q9Y7 SNoO1ldaBHV75YR0j39uMVx8zKmSAbTKD2yQnniRwd/pDcD7GlQ6xmMmfhyVMD9uxDk8busyZ t3ie2YGlYY+wX13RLSEzmZ9EJLZJcMDzb4DAHfRqQ8Hgo6fH1Em1dUR4GZVMtZGI2kZpg5YIa DZXkknYmV38kjUs/ X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20220411_130222_881568_2FC1B0AF X-CRM114-Status: GOOD ( 10.72 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org Recently this has been fixed in the vendor tree, so upstream this. Fixes: 731b26a6ac17 ("ARM: bcm2835: Add names for the Raspberry Pi GPIO lines") Signed-off-by: Phil Elwell Signed-off-by: Stefan Wahren --- arch/arm/boot/dts/bcm2835-rpi-b.dts | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/arch/arm/boot/dts/bcm2835-rpi-b.dts b/arch/arm/boot/dts/bcm2835-rpi-b.dts index 1b63d6b19750..25d87212cefd 100644 --- a/arch/arm/boot/dts/bcm2835-rpi-b.dts +++ b/arch/arm/boot/dts/bcm2835-rpi-b.dts @@ -53,18 +53,17 @@ &gpio { "GPIO18", "NC", /* GPIO19 */ "NC", /* GPIO20 */ - "GPIO21", + "CAM_GPIO0", "GPIO22", "GPIO23", "GPIO24", "GPIO25", "NC", /* GPIO26 */ - "CAM_GPIO0", - /* Binary number representing build/revision */ - "CONFIG0", - "CONFIG1", - "CONFIG2", - "CONFIG3", + "GPIO27", + "GPIO28", + "GPIO29", + "GPIO30", + "GPIO31", "NC", /* GPIO32 */ "NC", /* GPIO33 */ "NC", /* GPIO34 */