From patchwork Mon Apr 11 20:01:38 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stefan Wahren X-Patchwork-Id: 12809573 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 27802C433F5 for ; Mon, 11 Apr 2022 20:04:16 +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=o3CgL9tifH5SgQkHU22uM1ap4nbP/2s0+GQtL7LPb0g=; b=Rho1YVA1G6O6ko GUiOThOLALMhK1Dc6b5J+t1PPKDxQ2nJXX0yYRYISd7JcFvc07acn8SmsIvHPS9WtkLeeVp3Wax5/ WtBSnaF9y6MzjToVOin6C81Z0PsiVd/ANG78tpJrf4fKHaFbSVezE5UhiZ3bl3qeF+QUNQEsp6onn l/TOoUojsMhwBEE7a+0nH+ngxrA1/poKiTZ7vpI+47FfTj0OLfePoBXLyNQ/K0IvS59cKEU1eEEn1 iN5pjVKw5sTXT/sGv2d5U7D/rWSg01Dtsnhy05YqznTZhHOUWwN4/yYCs7zbmND3XIHt2is8lcRer cJHIIztoJrMq5/qlAo0Q==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1ne0Fk-00AOgP-CM; Mon, 11 Apr 2022 20:03:12 +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-00AOOw-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 1Mf0FY-1oBQMz3Fd4-00gVLs; Mon, 11 Apr 2022 22:02:03 +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, Phil Elwell , Stefan Wahren Subject: [PATCH 1/6] ARM: dts: bcm2835-rpi-zero-w: Fix GPIO line name for Wifi/BT Date: Mon, 11 Apr 2022 22:01:38 +0200 Message-Id: <20220411200143.4876-2-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:arPepFxzH6bl3/vxHF/8avQYm2SM48dVWsl95QrFPqm80fhxp1V EaQngWzFK8BzTKlk6fCMqyMPJLCm/pfl5HsMExpva2yxpmi8ALBKi1sAmQ8K5vwid/DvEvJ ytJHsjKK9rJ1iRIrcye5Axbl1weF2yL63Af8Rfg9DFevRKpNTupD4q1ZfLVwlcoTPIGL7bB gqFGFszHDqLS61jRXaqLw== X-UI-Out-Filterresults: notjunk:1;V03:K0:LL0iyvUglYY=:vCfhzOsWu/XhL2Yn6Tuqh3 Qd+TFW1AfDmIljZWJYFN+26JaA/6bVZJcXqUmYjDVgob/K3OVEJ2h3PYYmmRNlnHHNT+Rarld T7wi6aSPSBTS3xoViW/SDNphlXXw5gTB7HRw41gqxH7JyCCO3dvnV3lP5eYzt5uQmJ6in2DLC q5SiL5OK4IRH2srn1GP9MxRDu4guOoPuu7lLegkRboEweELHvxAa7l5wfl/46RNGTkrEYz4IV yHQQ/aPYknhTLc+iwrtdxvh+LaFr6uBVO4mA1crGA5dq9PYt2wfdOtKcIG05krIDAEGC7IhTi z0qmhnrqTS6aUVF2nNHaoRp5iAXsQPls0yRjM7pA9wwrA3L2FDQTpZSCX896Qx+FahuI6giH6 1tp+F4RriibP+8ojDfKTGQ+nIxWw8VCOu93Qoo+1JyMdr8v15uyCvNvzxrS8qFTdy8e8SAtV9 TeA753BJrOi165Cs5KrBCXPwEh4VGGrZgqRH9+wITaTVH1kHsHJQlz2fyhtjVjkSZ6mG8a+sV 1RtREQ45OFV+Ifl1EnWoe3m8ObhJJbO+hUTnqGEpkZq5ueGC7kcqsZoDz4FCj+3ifKmXQx81i KM9XpFix40+bWN7G6t1Q5tXxDUaBDu8jEpcFx3BfXN/o8q6kvcCdmcd/J9A2D8Vq0YklxVqZT zxEHUOMaG3MR6hoPCXMe2rmMgmsQZkfNpo436li0raOtTDRzn1cK5t5un6RdG9JeaKwNIbpws 1DmBluBX7jVQsYxz X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20220411_130222_886703_BCFA3EAB X-CRM114-Status: GOOD ( 11.39 ) 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 From: Phil Elwell The GPIOs 30 to 39 are connected to the Cypress CYW43438 (Wifi/BT). So fix the GPIO line names accordingly. Fixes: 2c7c040c73e9 ("ARM: dts: bcm2835: Add Raspberry Pi Zero W") Signed-off-by: Phil Elwell Signed-off-by: Stefan Wahren --- arch/arm/boot/dts/bcm2835-rpi-zero-w.dts | 22 ++++++++++++---------- 1 file changed, 12 insertions(+), 10 deletions(-) diff --git a/arch/arm/boot/dts/bcm2835-rpi-zero-w.dts b/arch/arm/boot/dts/bcm2835-rpi-zero-w.dts index 243236bc1e00..8b043ab62dc8 100644 --- a/arch/arm/boot/dts/bcm2835-rpi-zero-w.dts +++ b/arch/arm/boot/dts/bcm2835-rpi-zero-w.dts @@ -74,16 +74,18 @@ &gpio { "GPIO27", "SDA0", "SCL0", - "NC", /* GPIO30 */ - "NC", /* GPIO31 */ - "NC", /* GPIO32 */ - "NC", /* GPIO33 */ - "NC", /* GPIO34 */ - "NC", /* GPIO35 */ - "NC", /* GPIO36 */ - "NC", /* GPIO37 */ - "NC", /* GPIO38 */ - "NC", /* GPIO39 */ + /* Used by BT module */ + "CTS0", + "RTS0", + "TXD0", + "RXD0", + /* Used by Wifi */ + "SD1_CLK", + "SD1_CMD", + "SD1_DATA0", + "SD1_DATA1", + "SD1_DATA2", + "SD1_DATA3", "CAM_GPIO1", /* GPIO40 */ "WL_ON", /* GPIO41 */ "NC", /* GPIO42 */ From patchwork Mon Apr 11 20:01:39 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stefan Wahren X-Patchwork-Id: 12809570 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 F1DB3C433FE for ; Mon, 11 Apr 2022 20:03:49 +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=/RU3oiuh04Ntf3C/xKdgJpCU8jmkEsiIgaasGeE8phg=; b=uFC8F/c/rVs7pV KVOyXKhHIqm8A4OXavcoB8k+wdYdtlfxo4fdhNGN2Tg7wL0iTAyGgKeE1XrE/mJZ4ub5LheveGEzl 8cs3dYf77ZkMrxGvTq11jBnQrQMmOS4wwpo9DhSJKtSWeyBTFwI206psqhBtztWRq1plVLG0kiCz9 +rYygpijr0z0qvhUlxW5V70K6XOL4VshXx3Yvlteg/XD/+OV+vBnpfbZjrM2EjNHZf6NHKSB/xMRr uX2wwB/rlkNtdh6TOX7+l1szTptwmzkuTr2ER+HGUmJXi9yPLrCjl1pZ4lZFka06dj7/qm959msK+ xzWdWM1UeB/v/Z8CnvvA==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1ne0FG-00AOWG-61; Mon, 11 Apr 2022 20:02:42 +0000 Received: from mout.kundenserver.de ([212.227.17.10]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1ne0Es-00AOOv-3c; Mon, 11 Apr 2022 20:02:22 +0000 Received: from localhost.localdomain ([37.4.249.94]) by mrelayeu.kundenserver.de (mreue108 [212.227.15.183]) with ESMTPSA (Nemesis) id 1N5G5b-1o3XtR10vV-011Dux; Mon, 11 Apr 2022 22:02:04 +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, Phil Elwell , Stefan Wahren Subject: [PATCH 2/6] ARM: dts: bcm2837-rpi-cm3-io3: Fix GPIO line names for SMPS I2C Date: Mon, 11 Apr 2022 22:01:39 +0200 Message-Id: <20220411200143.4876-3-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:+Y2/h/UhOpq7zYmlchxGscteFLKGnVlEUPDN5aV1Pl/fzeE96+0 e6e2ToX75dZG9iVS03J4a1tl0G4iVDJbNeoZSyq2JUOC9a/RN20Ks/OX5KjEsQUCE9JWNqG 44vTKpagC23Oq8pQvnasOAWdM9SxVq/9cXQvaKvuZ2p6JfubxbRlzJ/NgLaN3eTIWrb5Cl3 XjxFGNsphSUrc+nJe0R4g== X-UI-Out-Filterresults: notjunk:1;V03:K0:5Tj3V+sfIq8=:KucHuiyyqXZ0GFsYpFU6KE YIpAWcY54zn58ll/byYKfFQBN6HDsRFNsMrEeJZtuG3ijRc4CgsV3Ax9yg/qgQHFybeCehp06 4FlmhAas/8BowU+NLLvsl6w312HYCNsSF9Ypah4A0D29lV8by5kOLp2tTQ+Mndq0oPIUaGFYi 6fZADjcFCZ6ky+U9ufBDoT9sFuuoKJPRsdYMr6DFE1ut+oN4MnfWfzVRxTfztwjHx0oL+y81g vIm+IxBS2c+3kybrbjUlPF8L+UtAGsWLDmuVJyF17XdrC/Es4bkdawtQ6VsljouuN5IV+IUKa l29JCn3RJWUmuyPpUJ69bzev+BqDodENvK03GJc8WAgIplt5ho6nd3Pik+heFXsuoVfVyG4ml JgTNcVSCIZ8GPqCQRyZJ57xrLR5lItlpJMLV1KP4Z0uYYcyLhLNHzyUXCqa5D6CiA5gX2HMCE mffQjUZ7wsBYr8dueU0zgA5AQpI5q7oQJebOaEZGL5jj3iX/Sbt3HDWFZxn0sIuB5wYwb7z0W 2O4Af00cBJgHML5rw+qRnv4RxkJ97rhYSnFE7oPcTKSr8lNXoLtuLI9yAHRmK9HeG5Jmq49gB 6uj5VDFTb/VgKsCXdGeKe7EzQkyj4mUuynx6Ag/lbFWBBRgIy4bf6Ax+6rMskD5zybkn9N87L FpZLReFuQg90dE4fpXrFgq0C6k+0QymNOR9xttweLCV686dMwNWhk4LB/jcJC9elF7qspqkww lnavyWNurWMG340R X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20220411_130218_548090_7CFB262F X-CRM114-Status: GOOD ( 12.00 ) 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 From: Phil Elwell The GPIOs 46 & 47 are already used for a I2C interface to a SMPS. So fix the GPIO line names accordingly. Fixes: a54fe8a6cf66 ("ARM: dts: add Raspberry Pi Compute Module 3 and IO board") Signed-off-by: Phil Elwell Signed-off-by: Stefan Wahren --- arch/arm/boot/dts/bcm2837-rpi-cm3-io3.dts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/arch/arm/boot/dts/bcm2837-rpi-cm3-io3.dts b/arch/arm/boot/dts/bcm2837-rpi-cm3-io3.dts index 588d9411ceb6..3dfce4312dfc 100644 --- a/arch/arm/boot/dts/bcm2837-rpi-cm3-io3.dts +++ b/arch/arm/boot/dts/bcm2837-rpi-cm3-io3.dts @@ -63,8 +63,8 @@ &gpio { "GPIO43", "GPIO44", "GPIO45", - "GPIO46", - "GPIO47", + "SMPS_SCL", + "SMPS_SDA", /* Used by eMMC */ "SD_CLK_R", "SD_CMD_R", From patchwork Mon Apr 11 20:01:40 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stefan Wahren X-Patchwork-Id: 12809568 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 EE084C433EF for ; Mon, 11 Apr 2022 20:03:38 +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=tpnF1Gk4lP77CMrcLWHJ24HX1i+w2SoHrg+qvssJX+s=; b=gOVBnvBNq2PC0m ku16DpUGgxHmUry/ZSdkEHARz7iVaK7e2ZurseqUZk0GkS3RGcRAFdLfjqsovb94hyR/Uxq1Sgs3f efsthiopsJSGx8bISxuze+Hyp3iykBwD2d/NBIQtBP3444Vi+/1c8ohRlUv993k79cX7zoRK8aCxX Ri8VUJxZhyEo54WfPoihNxVXoCgtmwYHpvg56mBvmUoMN7t3Q0gqC+psG79l57aFbCHFgrmRp1IHZ iYz9fPFLHvFg0dbvbYHH21CclpY0rCWzmEmuMbyOOUhM4q3hQfQbEwBqXuj4K6+OmEZ/6YJlK4wn4 BxYP3jo80XT23z2kemPw==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1ne0F7-00AOTF-5P; Mon, 11 Apr 2022 20:02:33 +0000 Received: from mout.kundenserver.de ([212.227.17.10]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1ne0Es-00AOOr-3f; Mon, 11 Apr 2022 20:02:21 +0000 Received: from localhost.localdomain ([37.4.249.94]) by mrelayeu.kundenserver.de (mreue108 [212.227.15.183]) with ESMTPSA (Nemesis) id 1N8XLj-1o0G6P2vXV-014XJ5; Mon, 11 Apr 2022 22:02:04 +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, Phil Elwell , Stefan Wahren Subject: [PATCH 3/6] ARM: dts: bcm2837-rpi-3-b-plus: Fix GPIO line name of power LED Date: Mon, 11 Apr 2022 22:01:40 +0200 Message-Id: <20220411200143.4876-4-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:ZCHLLXUIKg4bqQR6jWljmHMjyMhXdWmz/I9yYD3589SFZ2uHunH 8GMxp7MOX5XdEdhd7KMH2hONgBjNTA71mLB98GK391syMrizd/TVenpM2tmcgBMbArRiq8J BS5l/UGLCrLsSED33/dYEGYxIt6RC4vBUml1XJ47utgrUBb3zDe/8XNZMP2Zi/+/+rM9Ijq H4FyQxOu32gW/n+Jqu7+g== X-UI-Out-Filterresults: notjunk:1;V03:K0:GGs8j0FKpVY=:8aP1dwZAscSf5YXOOmZqYp fz5x3/Vm65y234t9jd8D0BNyqok8W3nhJg31y1OMT4ZJj/oPAb05E0qL173DGbv2OtLYCHK1A Bvxu5NG0nGDV08q58tIo9AZJqOKR2Wp9GdzCzJ7zJg+mHho3GxvBWPgNJqXqS93eJvAo5mRP5 RrA+ltRH49OEFFwTqufJXUOTbwGYg/HEYgbP6ViUJBLsef5vEqiWj1sUuHZbLq4PLagRUzMw7 oBZVlESfKef6C4CghXCRJJCVTFCMwIIbzVOiF062AmYrvmhK7vhn72KJAcn+O6U+OSGaTKup4 Hp9Jw1Pqg4m0ulESa4w/lYYVMblyjqg2Z3nGkdFdGI7zOea6QFY9hStKFHnpm8LMPL4z4OdCL dNdB/7o811qdnP8Fgtzta7kUZIt3doZfh7QfeSYO+hNTsQE6nMP1kwq64D9Ekn7VOSe3RLvRw Wyw/5S9ME4jPTMsGDNnMD3QuVDgbin9lWxRFmjqFffgpzCn4IMVHRXy0f/mthwJMnwxfgEZcK fhkxAVs4/d8MMhPQn9U3/eFFBqIgQo/QL328s6pC1eUCRnjNHiiG92znwjRTn9QBV/cCw03B+ vnAN/7jcwG9R9L0E4Z3PF8TlSHsqcpCkizqQX6T3/aqcraVfucdKsefmoxhLRrWfVhucMTlNZ U226oYWjuFVwSq7PLUq7dOTVIKK0tnwN7Yr8lAdAHA/6MlKRcvPy9FJZV+ALxpeC0mYuYsaDl mH55PdYv54BvtpY3 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20220411_130218_548079_54D9F5F6 X-CRM114-Status: GOOD ( 12.06 ) 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 From: Phil Elwell The red LED on the Raspberry Pi 3 B Plus is the power LED. So fix the GPIO line name accordingly. Fixes: 71c0cd2283f2 ("ARM: dts: bcm2837: Add Raspberry Pi 3 B+") Signed-off-by: Phil Elwell Signed-off-by: Stefan Wahren --- arch/arm/boot/dts/bcm2837-rpi-3-b-plus.dts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/arm/boot/dts/bcm2837-rpi-3-b-plus.dts b/arch/arm/boot/dts/bcm2837-rpi-3-b-plus.dts index e12938baaf12..c263f5b48b96 100644 --- a/arch/arm/boot/dts/bcm2837-rpi-3-b-plus.dts +++ b/arch/arm/boot/dts/bcm2837-rpi-3-b-plus.dts @@ -45,7 +45,7 @@ expgpio: gpio { #gpio-cells = <2>; gpio-line-names = "BT_ON", "WL_ON", - "STATUS_LED_R", + "PWR_LED_R", "LAN_RUN", "", "CAM_GPIO0", 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 */ From patchwork Mon Apr 11 20:01:42 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stefan Wahren X-Patchwork-Id: 12809572 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 0A6D0C433F5 for ; Mon, 11 Apr 2022 20:04:12 +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=++b+NnMKqKVkC7CQe/0qmcygUMo6lCZrBo0J7LuL+EM=; b=W6Oud3vdR47C4N ehS6VeW2MmAlXawu1Yzgd+Ae2UNcqRncIcSb6ThsVZBWgf5TIi4JHDnYLMVfJ9p9GXtnV6KmrNwUC Sc+X3+In/4WW1cciAKnjutL8oTi+mRmCD5QwJJFFcba4n5EPAf8JgvwBty1E1XU8y/d3iqkjr/VV1 96fJEAIORBAtiAjRoJc8IGHDd7OAZENsZBp3J4EURArw/LwskVuIOLd3CkvBSnlVLoMDYeWJFWrxC xsmGm5JXaA4eaS2tZuN8G2oT2vRFoSsy6iQnPShuQ9V3K2pykf2TyPFOs1/h7noHlJ6RUfmuNdlZ0 eCuyPiLu/KxVqP64gakQ==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1ne0FY-00AOae-Gz; Mon, 11 Apr 2022 20:03:00 +0000 Received: from mout.kundenserver.de ([212.227.17.10]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1ne0Es-00AOOs-3Z; Mon, 11 Apr 2022 20:02:23 +0000 Received: from localhost.localdomain ([37.4.249.94]) by mrelayeu.kundenserver.de (mreue108 [212.227.15.183]) with ESMTPSA (Nemesis) id 1MBDrM-1noU552Mn8-00Cgto; 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 Subject: [PATCH 5/6] ARM: dts: bcm283x: Remove gpio line name NC Date: Mon, 11 Apr 2022 22:01:42 +0200 Message-Id: <20220411200143.4876-6-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:6fTX83AbFoIJaJ+LkpYblK7X0yUyfuW5zOzErZfEv7aejwJaNjI q8MCwWXZOMVpk+D1iNgRTRdUATcjr+46ay0a74Z1iH8wKY51MKPV4P6BMlPRifRjli/qny8 lgPU+9IgSoLgdeUTPzfTWy8VpPEWSfLX4DygmQkbFdHWDoc798zerAD2BQzfkghFJ00PtN1 K6ym9fCwoWCsNSY/W95TQ== X-UI-Out-Filterresults: notjunk:1;V03:K0:YVfn1ZjQws8=:I6kkBeTg9/tLNcbn5d7P61 OvXCw9rzjSIDmHwRL5wZpscf2Oe0Eojp4pFpvfrZqAQdUVkai/gMW/raRCYBB08D0wYvocuLo 6Vspw9Lc6zLCna7j7quoqlS/KYsky2SLXsabqvm0Vg3/bStlAD/SPUVZGkXVwIgstIT7r14rC P3r4DhTmLjQk+EIwSxoExKc/nA8tmQ3atlmo03JgWFpLvU/3WTRE8VWmHciJDuHUmIwvcbGlq anvg2yk3i7Ms9GshGgU7+BoltgNn+ALhfhFfc7+AOgqNCHg3rcZ+/E1MK2DvWjHg7DrFIr2jO rJJ8k0l0YfE9qmtrFjDUXacN1MviQE4pwriOnp4RfV71ueRgON+t5IzTRg1HlLXrNE6qZ/5EA M4KZqhWqRCNyd4VFj2UYLWeARgvIKur+HRhQQlIkSbWCNXsI0hXUdVnYDWfRw+/fRKdqTpDVy YTVrVThCENHUppE2e3M9hUblwt1xyhL5u1s4mg1tenZkcC9u23zFb9d7VAM5a14f4+wEEAUdI ef0oXdDRE+toMB3pCqqo6zjxkiGZkGD+2iGQzo6kEYOcamIjnHmlDGuuSlQljRYQInPtEOpJ3 yC//EZ2P9Nl4H/FJ6KGmYsJIkSZk+6eJcFqx0+Q1TzGZt6gCTtzRHbcx5FGBqk90N9IuNLg6u 4eqCfPieDHIt1duddZVHD3S4iaN+9LvGEroiBdr0bI6RLhXe/bV6ShafXi+Rt/i7Wr0zCQvFU wDiwsuq9G6bcuhhZ X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20220411_130218_564964_BE93B73A X-CRM114-Status: GOOD ( 12.58 ) 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 The convention to name not connected GPIOs with NC has never been adapted. Also newer Raspberry Pi boards like RPi 4 never did. So fix this inconsistency by removing all of the NC names. Signed-off-by: Stefan Wahren --- arch/arm/boot/dts/bcm2835-rpi-a-plus.dts | 21 +++++++------ arch/arm/boot/dts/bcm2835-rpi-a.dts | 35 +++++++++++----------- arch/arm/boot/dts/bcm2835-rpi-b-plus.dts | 17 +++++------ arch/arm/boot/dts/bcm2835-rpi-b-rev2.dts | 35 +++++++++++----------- arch/arm/boot/dts/bcm2835-rpi-b.dts | 35 +++++++++++----------- arch/arm/boot/dts/bcm2835-rpi-cm1-io1.dts | 1 - arch/arm/boot/dts/bcm2835-rpi-zero-w.dts | 3 +- arch/arm/boot/dts/bcm2835-rpi-zero.dts | 29 +++++++++--------- arch/arm/boot/dts/bcm2836-rpi-2-b.dts | 1 - arch/arm/boot/dts/bcm2837-rpi-3-a-plus.dts | 1 - arch/arm/boot/dts/bcm2837-rpi-3-b-plus.dts | 1 - arch/arm/boot/dts/bcm2837-rpi-3-b.dts | 1 - arch/arm/boot/dts/bcm2837-rpi-cm3-io3.dts | 1 - arch/arm/boot/dts/bcm2837-rpi-cm3.dtsi | 12 ++++---- 14 files changed, 90 insertions(+), 103 deletions(-) diff --git a/arch/arm/boot/dts/bcm2835-rpi-a-plus.dts b/arch/arm/boot/dts/bcm2835-rpi-a-plus.dts index 40b9405f1a8e..9b9a18bbb20a 100644 --- a/arch/arm/boot/dts/bcm2835-rpi-a-plus.dts +++ b/arch/arm/boot/dts/bcm2835-rpi-a-plus.dts @@ -32,7 +32,6 @@ &gpio { * This is based on the unreleased schematic for the Model A+. * * Legend: - * "NC" = not connected (no rail from the SoC) * "FOO" = GPIO line named "FOO" on the schematic * "FOO_N" = GPIO line named "FOO" on schematic, active low */ @@ -67,21 +66,21 @@ &gpio { "GPIO27", "SDA0", "SCL0", - "NC", /* GPIO30 */ - "NC", /* GPIO31 */ + "", /* GPIO30 */ + "", /* GPIO31 */ "CAM_GPIO1", /* GPIO32 */ - "NC", /* GPIO33 */ - "NC", /* GPIO34 */ + "", /* GPIO33 */ + "", /* GPIO34 */ "PWR_LOW_N", /* GPIO35 */ - "NC", /* GPIO36 */ - "NC", /* GPIO37 */ + "", /* GPIO36 */ + "", /* GPIO37 */ "USB_LIMIT", /* GPIO38 */ - "NC", /* GPIO39 */ + "", /* GPIO39 */ "PWM0_OUT", /* GPIO40 */ "CAM_GPIO0", /* GPIO41 */ - "NC", /* GPIO42 */ - "NC", /* GPIO43 */ - "NC", /* GPIO44 */ + "", /* GPIO42 */ + "", /* GPIO43 */ + "", /* GPIO44 */ "PWM1_OUT", /* GPIO45 */ "HDMI_HPD_N", "STATUS_LED", diff --git a/arch/arm/boot/dts/bcm2835-rpi-a.dts b/arch/arm/boot/dts/bcm2835-rpi-a.dts index 11edb581dbaf..f664e4fced93 100644 --- a/arch/arm/boot/dts/bcm2835-rpi-a.dts +++ b/arch/arm/boot/dts/bcm2835-rpi-a.dts @@ -26,7 +26,6 @@ &gpio { * RPI00021 sheet 02 * * Legend: - * "NC" = not connected (no rail from the SoC) * "FOO" = GPIO line named "FOO" on the schematic * "FOO_N" = GPIO line named "FOO" on schematic, active low */ @@ -42,41 +41,41 @@ &gpio { "SPI_MISO", "SPI_MOSI", "SPI_SCLK", - "NC", /* GPIO12 */ - "NC", /* GPIO13 */ + "", /* GPIO12 */ + "", /* GPIO13 */ /* Serial port */ "TXD0", "RXD0", "STATUS_LED_N", "GPIO17", "GPIO18", - "NC", /* GPIO19 */ - "NC", /* GPIO20 */ + "", /* GPIO19 */ + "", /* GPIO20 */ "GPIO21", "GPIO22", "GPIO23", "GPIO24", "GPIO25", - "NC", /* GPIO26 */ + "", /* GPIO26 */ "CAM_GPIO0", /* Binary number representing build/revision */ "CONFIG0", "CONFIG1", "CONFIG2", "CONFIG3", - "NC", /* GPIO32 */ - "NC", /* GPIO33 */ - "NC", /* GPIO34 */ - "NC", /* GPIO35 */ - "NC", /* GPIO36 */ - "NC", /* GPIO37 */ - "NC", /* GPIO38 */ - "NC", /* GPIO39 */ + "", /* GPIO32 */ + "", /* GPIO33 */ + "", /* GPIO34 */ + "", /* GPIO35 */ + "", /* GPIO36 */ + "", /* GPIO37 */ + "", /* GPIO38 */ + "", /* GPIO39 */ "PWM0_OUT", - "NC", /* GPIO41 */ - "NC", /* GPIO42 */ - "NC", /* GPIO43 */ - "NC", /* GPIO44 */ + "", /* GPIO41 */ + "", /* GPIO42 */ + "", /* GPIO43 */ + "", /* GPIO44 */ "PWM1_OUT", "HDMI_HPD_P", "SD_CARD_DET", diff --git a/arch/arm/boot/dts/bcm2835-rpi-b-plus.dts b/arch/arm/boot/dts/bcm2835-rpi-b-plus.dts index 1b435c64bd9c..7b7c363e5ee8 100644 --- a/arch/arm/boot/dts/bcm2835-rpi-b-plus.dts +++ b/arch/arm/boot/dts/bcm2835-rpi-b-plus.dts @@ -34,7 +34,6 @@ &gpio { * RPI-BPLUS sheet 1 * * Legend: - * "NC" = not connected (no rail from the SoC) * "FOO" = GPIO line named "FOO" on the schematic * "FOO_N" = GPIO line named "FOO" on schematic, active low */ @@ -69,20 +68,20 @@ &gpio { "GPIO27", "SDA0", "SCL0", - "NC", /* GPIO30 */ + "", /* GPIO30 */ "LAN_RUN", /* GPIO31 */ "CAM_GPIO1", /* GPIO32 */ - "NC", /* GPIO33 */ - "NC", /* GPIO34 */ + "", /* GPIO33 */ + "", /* GPIO34 */ "PWR_LOW_N", /* GPIO35 */ - "NC", /* GPIO36 */ - "NC", /* GPIO37 */ + "", /* GPIO36 */ + "", /* GPIO37 */ "USB_LIMIT", /* GPIO38 */ - "NC", /* GPIO39 */ + "", /* GPIO39 */ "PWM0_OUT", /* GPIO40 */ "CAM_GPIO0", /* GPIO41 */ - "NC", /* GPIO42 */ - "NC", /* GPIO43 */ + "", /* GPIO42 */ + "", /* GPIO43 */ "ETHCLK", /* GPIO44 */ "PWM1_OUT", /* GPIO45 */ "HDMI_HPD_N", diff --git a/arch/arm/boot/dts/bcm2835-rpi-b-rev2.dts b/arch/arm/boot/dts/bcm2835-rpi-b-rev2.dts index a23c25c00eea..f5b66d3f4ff3 100644 --- a/arch/arm/boot/dts/bcm2835-rpi-b-rev2.dts +++ b/arch/arm/boot/dts/bcm2835-rpi-b-rev2.dts @@ -27,7 +27,6 @@ &gpio { * RPI00022 sheet 02 * * Legend: - * "NC" = not connected (no rail from the SoC) * "FOO" = GPIO line named "FOO" on the schematic * "FOO_N" = GPIO line named "FOO" on schematic, active low */ @@ -43,40 +42,40 @@ &gpio { "SPI_MISO", "SPI_MOSI", "SPI_SCLK", - "NC", /* GPIO12 */ - "NC", /* GPIO13 */ + "", /* GPIO12 */ + "", /* GPIO13 */ /* Serial port */ "TXD0", "RXD0", "STATUS_LED_N", "GPIO17", "GPIO18", - "NC", /* GPIO19 */ - "NC", /* GPIO20 */ + "", /* GPIO19 */ + "", /* GPIO20 */ "CAM_GPIO", "GPIO22", "GPIO23", "GPIO24", "GPIO25", - "NC", /* GPIO26 */ + "", /* GPIO26 */ "GPIO27", "GPIO28", "GPIO29", "GPIO30", "GPIO31", - "NC", /* GPIO32 */ - "NC", /* GPIO33 */ - "NC", /* GPIO34 */ - "NC", /* GPIO35 */ - "NC", /* GPIO36 */ - "NC", /* GPIO37 */ - "NC", /* GPIO38 */ - "NC", /* GPIO39 */ + "", /* GPIO32 */ + "", /* GPIO33 */ + "", /* GPIO34 */ + "", /* GPIO35 */ + "", /* GPIO36 */ + "", /* GPIO37 */ + "", /* GPIO38 */ + "", /* GPIO39 */ "PWM0_OUT", - "NC", /* GPIO41 */ - "NC", /* GPIO42 */ - "NC", /* GPIO43 */ - "NC", /* GPIO44 */ + "", /* GPIO41 */ + "", /* GPIO42 */ + "", /* GPIO43 */ + "", /* GPIO44 */ "PWM1_OUT", "HDMI_HPD_P", "SD_CARD_DET", diff --git a/arch/arm/boot/dts/bcm2835-rpi-b.dts b/arch/arm/boot/dts/bcm2835-rpi-b.dts index 25d87212cefd..f589bede2b11 100644 --- a/arch/arm/boot/dts/bcm2835-rpi-b.dts +++ b/arch/arm/boot/dts/bcm2835-rpi-b.dts @@ -27,7 +27,6 @@ &gpio { * RPI00021 sheet 02 * * Legend: - * "NC" = not connected (no rail from the SoC) * "FOO" = GPIO line named "FOO" on the schematic * "FOO_N" = GPIO line named "FOO" on schematic, active low */ @@ -43,40 +42,40 @@ &gpio { "SPI_MISO", "SPI_MOSI", "SPI_SCLK", - "NC", /* GPIO12 */ - "NC", /* GPIO13 */ + "", /* GPIO12 */ + "", /* GPIO13 */ /* Serial port */ "TXD0", "RXD0", "STATUS_LED_N", "GPIO17", "GPIO18", - "NC", /* GPIO19 */ - "NC", /* GPIO20 */ + "", /* GPIO19 */ + "", /* GPIO20 */ "CAM_GPIO0", "GPIO22", "GPIO23", "GPIO24", "GPIO25", - "NC", /* GPIO26 */ + "", /* GPIO26 */ "GPIO27", "GPIO28", "GPIO29", "GPIO30", "GPIO31", - "NC", /* GPIO32 */ - "NC", /* GPIO33 */ - "NC", /* GPIO34 */ - "NC", /* GPIO35 */ - "NC", /* GPIO36 */ - "NC", /* GPIO37 */ - "NC", /* GPIO38 */ - "NC", /* GPIO39 */ + "", /* GPIO32 */ + "", /* GPIO33 */ + "", /* GPIO34 */ + "", /* GPIO35 */ + "", /* GPIO36 */ + "", /* GPIO37 */ + "", /* GPIO38 */ + "", /* GPIO39 */ "PWM0_OUT", - "NC", /* GPIO41 */ - "NC", /* GPIO42 */ - "NC", /* GPIO43 */ - "NC", /* GPIO44 */ + "", /* GPIO41 */ + "", /* GPIO42 */ + "", /* GPIO43 */ + "", /* GPIO44 */ "PWM1_OUT", "HDMI_HPD_P", "SD_CARD_DET", diff --git a/arch/arm/boot/dts/bcm2835-rpi-cm1-io1.dts b/arch/arm/boot/dts/bcm2835-rpi-cm1-io1.dts index a75c882e6575..87958a96c3e0 100644 --- a/arch/arm/boot/dts/bcm2835-rpi-cm1-io1.dts +++ b/arch/arm/boot/dts/bcm2835-rpi-cm1-io1.dts @@ -13,7 +13,6 @@ &gpio { * This is based on the official GPU firmware DT blob. * * Legend: - * "NC" = not connected (no rail from the SoC) * "FOO" = GPIO line named "FOO" on the schematic * "FOO_N" = GPIO line named "FOO" on schematic, active low */ diff --git a/arch/arm/boot/dts/bcm2835-rpi-zero-w.dts b/arch/arm/boot/dts/bcm2835-rpi-zero-w.dts index 8b043ab62dc8..596bb1ef994e 100644 --- a/arch/arm/boot/dts/bcm2835-rpi-zero-w.dts +++ b/arch/arm/boot/dts/bcm2835-rpi-zero-w.dts @@ -39,7 +39,6 @@ &gpio { * This is based on the official GPU firmware DT blob. * * Legend: - * "NC" = not connected (no rail from the SoC) * "FOO" = GPIO line named "FOO" on the schematic * "FOO_N" = GPIO line named "FOO" on schematic, active low */ @@ -88,7 +87,7 @@ &gpio { "SD1_DATA3", "CAM_GPIO1", /* GPIO40 */ "WL_ON", /* GPIO41 */ - "NC", /* GPIO42 */ + "", /* GPIO42 */ "WIFI_CLK", /* GPIO43 */ "CAM_GPIO0", /* GPIO44 */ "BT_ON", /* GPIO45 */ diff --git a/arch/arm/boot/dts/bcm2835-rpi-zero.dts b/arch/arm/boot/dts/bcm2835-rpi-zero.dts index 6f9b3a908f28..a65c2bca69ea 100644 --- a/arch/arm/boot/dts/bcm2835-rpi-zero.dts +++ b/arch/arm/boot/dts/bcm2835-rpi-zero.dts @@ -29,7 +29,6 @@ &gpio { * This is based on the official GPU firmware DT blob. * * Legend: - * "NC" = not connected (no rail from the SoC) * "FOO" = GPIO line named "FOO" on the schematic * "FOO_N" = GPIO line named "FOO" on schematic, active low */ @@ -64,22 +63,22 @@ &gpio { "GPIO27", "SDA0", "SCL0", - "NC", /* GPIO30 */ - "NC", /* GPIO31 */ + "", /* GPIO30 */ + "", /* GPIO31 */ "CAM_GPIO1", /* GPIO32 */ - "NC", /* GPIO33 */ - "NC", /* GPIO34 */ - "NC", /* GPIO35 */ - "NC", /* GPIO36 */ - "NC", /* GPIO37 */ - "NC", /* GPIO38 */ - "NC", /* GPIO39 */ - "NC", /* GPIO40 */ + "", /* GPIO33 */ + "", /* GPIO34 */ + "", /* GPIO35 */ + "", /* GPIO36 */ + "", /* GPIO37 */ + "", /* GPIO38 */ + "", /* GPIO39 */ + "", /* GPIO40 */ "CAM_GPIO0", /* GPIO41 */ - "NC", /* GPIO42 */ - "NC", /* GPIO43 */ - "NC", /* GPIO44 */ - "NC", /* GPIO45 */ + "", /* GPIO42 */ + "", /* GPIO43 */ + "", /* GPIO44 */ + "", /* GPIO45 */ "HDMI_HPD_N", "STATUS_LED_N", /* Used by SD Card */ diff --git a/arch/arm/boot/dts/bcm2836-rpi-2-b.dts b/arch/arm/boot/dts/bcm2836-rpi-2-b.dts index d8af8eeac7b6..c824a2cea02e 100644 --- a/arch/arm/boot/dts/bcm2836-rpi-2-b.dts +++ b/arch/arm/boot/dts/bcm2836-rpi-2-b.dts @@ -34,7 +34,6 @@ &gpio { * the official GPU firmware DT blob. * * Legend: - * "NC" = not connected (no rail from the SoC) * "FOO" = GPIO line named "FOO" on the schematic * "FOO_N" = GPIO line named "FOO" on schematic, active low */ diff --git a/arch/arm/boot/dts/bcm2837-rpi-3-a-plus.dts b/arch/arm/boot/dts/bcm2837-rpi-3-a-plus.dts index d73daf5bff1d..f7222a28903e 100644 --- a/arch/arm/boot/dts/bcm2837-rpi-3-a-plus.dts +++ b/arch/arm/boot/dts/bcm2837-rpi-3-a-plus.dts @@ -55,7 +55,6 @@ &gpio { * This is mostly based on the official GPU firmware DT blob. * * Legend: - * "NC" = not connected (no rail from the SoC) * "FOO" = GPIO line named "FOO" on the schematic * "FOO_N" = GPIO line named "FOO" on schematic, active low */ diff --git a/arch/arm/boot/dts/bcm2837-rpi-3-b-plus.dts b/arch/arm/boot/dts/bcm2837-rpi-3-b-plus.dts index c263f5b48b96..fd4ac6f2d077 100644 --- a/arch/arm/boot/dts/bcm2837-rpi-3-b-plus.dts +++ b/arch/arm/boot/dts/bcm2837-rpi-3-b-plus.dts @@ -61,7 +61,6 @@ &gpio { * the official GPU firmware DT blob. * * Legend: - * "NC" = not connected (no rail from the SoC) * "FOO" = GPIO line named "FOO" on the schematic * "FOO_N" = GPIO line named "FOO" on schematic, active low */ diff --git a/arch/arm/boot/dts/bcm2837-rpi-3-b.dts b/arch/arm/boot/dts/bcm2837-rpi-3-b.dts index 42b5383b55d8..00ea439d601d 100644 --- a/arch/arm/boot/dts/bcm2837-rpi-3-b.dts +++ b/arch/arm/boot/dts/bcm2837-rpi-3-b.dts @@ -54,7 +54,6 @@ &gpio { * the official GPU firmware DT blob. * * Legend: - * "NC" = not connected (no rail from the SoC) * "FOO" = GPIO line named "FOO" on the schematic * "FOO_N" = GPIO line named "FOO" on schematic, active low */ diff --git a/arch/arm/boot/dts/bcm2837-rpi-cm3-io3.dts b/arch/arm/boot/dts/bcm2837-rpi-cm3-io3.dts index 3dfce4312dfc..cf84e69fced8 100644 --- a/arch/arm/boot/dts/bcm2837-rpi-cm3-io3.dts +++ b/arch/arm/boot/dts/bcm2837-rpi-cm3-io3.dts @@ -13,7 +13,6 @@ &gpio { * This is based on the official GPU firmware DT blob. * * Legend: - * "NC" = not connected (no rail from the SoC) * "FOO" = GPIO line named "FOO" on the schematic * "FOO_N" = GPIO line named "FOO" on schematic, active low */ diff --git a/arch/arm/boot/dts/bcm2837-rpi-cm3.dtsi b/arch/arm/boot/dts/bcm2837-rpi-cm3.dtsi index 828a20561b96..f57b4ca145dd 100644 --- a/arch/arm/boot/dts/bcm2837-rpi-cm3.dtsi +++ b/arch/arm/boot/dts/bcm2837-rpi-cm3.dtsi @@ -41,12 +41,12 @@ expgpio: gpio { #gpio-cells = <2>; gpio-line-names = "HDMI_HPD_N", "EMMC_EN_N", - "NC", - "NC", - "NC", - "NC", - "NC", - "NC"; + "", + "", + "", + "", + "", + ""; status = "okay"; }; }; From patchwork Mon Apr 11 20:01:43 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stefan Wahren X-Patchwork-Id: 12809571 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 D71A9C433EF for ; Mon, 11 Apr 2022 20:03:49 +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=IF0A5ZhKkhh1pULk8jI02x6W8ZcKPw4zwAFqz8UD+SA=; b=ny4SVC+1pExgXc GPvQV535NGkRsYpunE8w9v5LHoEY8wYIpBx97iga/nN1uuha7JdnShl3Ct98nXyVI2KtzAfCnMyOu j+fR5vqImIHchLage5PaeW0HE48nEUozUWsH4V3IpwTFjT4FEeTtkcNFwSPHGbXNMfNfxEL9YLrox qzaewmvo25j6o06OVrOwNwSl898wTxUkcHxClvUWa0VjRnWh7MXpVixo3hGn662Bl9wXwtpRQE+GW KYTIoXUkNejpjzCYK7iZsjBKYJvUdmuK0kUhuglysQTGu4938HiFeq2eJkUghpwf3Q/ql+y2uRPcz rvmNlLeYWy9c508umcaA==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1ne0FP-00AOXu-DZ; Mon, 11 Apr 2022 20:02:51 +0000 Received: from mout.kundenserver.de ([212.227.17.10]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1ne0Es-00AOOu-3a; Mon, 11 Apr 2022 20:02:22 +0000 Received: from localhost.localdomain ([37.4.249.94]) by mrelayeu.kundenserver.de (mreue108 [212.227.15.183]) with ESMTPSA (Nemesis) id 1MA7Om-1npa0i09Kk-00BaR6; Mon, 11 Apr 2022 22:02:06 +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, Phil Elwell , Stefan Wahren Subject: [PATCH 6/6] ARM: dts: bcm283x: Align ETH_CLK GPIO line name Date: Mon, 11 Apr 2022 22:01:43 +0200 Message-Id: <20220411200143.4876-7-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:KrFedrT8IfT+32vpSLgHtasxeDaJm/Jl+XoqHPoIBafnGkj/liU M3MX777w2SWykRFgOkpLhN7dY2GIBPIyR0w19R03Zb1vlo6rVmMO+/ChQW21ABFJFDcNLas l1dgkaiYZD3sZdei3ZdsWEqXVR3NbeEXnEijg8VpfC9lA3aQmQ6n0uU98rflYTzhcev9P8K vs7QobOAVFjoSbxLsCWag== X-UI-Out-Filterresults: notjunk:1;V03:K0:fsKYnIkBpeA=:eN9imY8hgdrnhDvpsI0Nft C69IfOWbZCh/i7cUIzKrZXMdx8AJMxkJsSlBbQwyl/SHKNWBPb9ZwpaJagSLT3zeWgg0+wUj6 GBfNNppal1oidvrauHRm+varpUno4TngzlSOYKpBviNBXz8seH1O6TPMCS08JUgp2TGF5aldV FWqzcJOJ/SIU6ZdBn69Z+hE1Hf7sZeT/Lz/L1STujeCmZyHVc8spo6OSl2xXl/tqTLn7xWQpq 5/RFVRoJoig6JXJMlCpGVJZZNxvv9h0ZtX2F57hIdQzKXp/KoFFNuh7cjAHWZ88Cc2mNUTQgH 5VMlni0COmls5d5XL3IBz81yi/35ZbVFYks+RdyZ1vYAwdRqXBuRB+6wplc10AQ3UEX1EnYBn s+NFbdoekb+uFksL/KHOIxRjtmQ6q8Q3TBLtJJPm7CE35qIoiu5DBsfTHiQeywkFuy/qDoHPK GKGh2UE+oN5jTlrJLu5RsJIYovV0NAAi+w5AjM2NxR3fNA9Ki9fuiCzIcf/zxWz4ttj7OeYvC gu8uX4FkBaNmIhN5owW68Nw8z+gqUAA5leqPSuYb/ipcXwqj6ZA1PhExHrro7MJ56msoW1gbE Agka01p5UXcuY3jkG79RI+dK/HgrtR0V5I2E8DzcPEqdNqcFZC3Zos1iK+M77Tu99vFruXy7g chj7qaaoZNvsdbxo6FmKLUbNevexp4F/xYcJpIfvJJ6/bJJaF9VaT9zduBa3ElgxJjfIf9YHl rWlCaMxVCtCtJZjx X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20220411_130218_548233_40F15896 X-CRM114-Status: GOOD ( 12.34 ) 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 From: Phil Elwell The GPIO line name ETHCLK is not aligned with the other signals like WIFI_CLK. Recently this has been fixed in the vendor tree, so upstream this change. Signed-off-by: Phil Elwell Signed-off-by: Stefan Wahren --- arch/arm/boot/dts/bcm2835-rpi-b-plus.dts | 2 +- arch/arm/boot/dts/bcm2836-rpi-2-b.dts | 2 +- arch/arm/boot/dts/bcm2837-rpi-3-b-plus.dts | 2 +- arch/arm/boot/dts/bcm2837-rpi-3-b.dts | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/arch/arm/boot/dts/bcm2835-rpi-b-plus.dts b/arch/arm/boot/dts/bcm2835-rpi-b-plus.dts index 7b7c363e5ee8..248feb2ed23d 100644 --- a/arch/arm/boot/dts/bcm2835-rpi-b-plus.dts +++ b/arch/arm/boot/dts/bcm2835-rpi-b-plus.dts @@ -82,7 +82,7 @@ &gpio { "CAM_GPIO0", /* GPIO41 */ "", /* GPIO42 */ "", /* GPIO43 */ - "ETHCLK", /* GPIO44 */ + "ETH_CLK", /* GPIO44 */ "PWM1_OUT", /* GPIO45 */ "HDMI_HPD_N", "STATUS_LED", diff --git a/arch/arm/boot/dts/bcm2836-rpi-2-b.dts b/arch/arm/boot/dts/bcm2836-rpi-2-b.dts index c824a2cea02e..3635502b1e0a 100644 --- a/arch/arm/boot/dts/bcm2836-rpi-2-b.dts +++ b/arch/arm/boot/dts/bcm2836-rpi-2-b.dts @@ -82,7 +82,7 @@ &gpio { "CAM_GPIO0", "SMPS_SCL", "SMPS_SDA", - "ETHCLK", + "ETH_CLK", "PWM1_OUT", "HDMI_HPD_N", "STATUS_LED", diff --git a/arch/arm/boot/dts/bcm2837-rpi-3-b-plus.dts b/arch/arm/boot/dts/bcm2837-rpi-3-b-plus.dts index fd4ac6f2d077..ec721d323ac5 100644 --- a/arch/arm/boot/dts/bcm2837-rpi-3-b-plus.dts +++ b/arch/arm/boot/dts/bcm2837-rpi-3-b-plus.dts @@ -109,7 +109,7 @@ &gpio { "SD1_DATA3", "PWM0_OUT", "PWM1_OUT", - "ETHCLK", + "ETH_CLK", "WIFI_CLK", "SDA0", "SCL0", diff --git a/arch/arm/boot/dts/bcm2837-rpi-3-b.dts b/arch/arm/boot/dts/bcm2837-rpi-3-b.dts index 00ea439d601d..fb6a417d73e7 100644 --- a/arch/arm/boot/dts/bcm2837-rpi-3-b.dts +++ b/arch/arm/boot/dts/bcm2837-rpi-3-b.dts @@ -102,7 +102,7 @@ &gpio { "SD1_DATA3", "PWM0_OUT", "PWM1_OUT", - "ETHCLK", + "ETH_CLK", "WIFI_CLK", "SDA0", "SCL0",