Received: by 2002:a6b:fb09:0:0:0:0:0 with SMTP id h9csp443651iog; Mon, 13 Jun 2022 06:06:55 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzzcvLNC5paPyOa/mjfzcdIJ3rZV7VX9FGHp387arHm1A1ctgwUIbIK01rRWvbV8FxBqZz8 X-Received: by 2002:a17:902:d58a:b0:164:f5d1:82e9 with SMTP id k10-20020a170902d58a00b00164f5d182e9mr58885175plh.3.1655125614959; Mon, 13 Jun 2022 06:06:54 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1655125614; cv=none; d=google.com; s=arc-20160816; b=sf3y5ev4TZWrQwH+wvw29CBDSO3Cdw+oa7axdXZOpRr4PW1cTTngfV3En40ciGQWCr mkqzfG//SUGvix9k5yAF7UIahbVOLJN+ulidGEndOze3N2ir5rq3rhkzRAwBCrMvW/fr Ypxh6+hgzDFN8KJGegZ814JC/OuksAj4IJKh3fNxgs7gp+/7cwKFgrYsqd4AARz4dKDw DRPDmbge3/a3JQ7RHxlq2K4f3tPggrgctKIhEYfeR2NWbD2jZ5CmiIlHt0asH5fzphUr TVyyRG5i/zj6iJGFOLiq8DuMwYpBaNGwg3DISLO2+IZhKqI8yxbr4qZFsNtp41nQgURf Y/pQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=agBbbQOvpJ62GBF8ajjlt1OlaWfpiIqFld5kRc2Lqiw=; b=C3SMy4XsJK7fbgAgIdpbhGp45XNYe2VmmHy+etzgHusA27WfK4i5zgg9eLvdg1TUBa BUUBC1+3jAjOea2bcSUqrJgD02O7Vv6rpm36DoalVxFDCUr4urUc5+yt4wuXR3X3fFV4 YJ7D1Wua7iV61F4FzGBqDW9LoYbCsf0E6SBtMf7Kg1xr7wA4YpwbX5g1hNFBvCvb4soo QJeYXxrCKMmGTOn/Xv5W5Jr/wDoE/SLGKvFbuugwHXAkNaq6ZD02SOE7++DLNBxUF7Bn 1iocnKMzJswIsq07EKmxM47H7buJYFHqJEtZ5lTtqgyrRGJYP+yy5WF82fiAxkfkybx5 iH2A== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=aFKB1Yr5; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Return-Path: Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id 185-20020a6204c2000000b0051c16acf791si8647623pfe.304.2022.06.13.06.06.28; Mon, 13 Jun 2022 06:06:54 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=aFKB1Yr5; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1352959AbiFMLWn (ORCPT + 99 others); Mon, 13 Jun 2022 07:22:43 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:46500 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1351681AbiFMLQf (ORCPT ); Mon, 13 Jun 2022 07:16:35 -0400 Received: from ams.source.kernel.org (ams.source.kernel.org [IPv6:2604:1380:4601:e00::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 02AA313F50; Mon, 13 Jun 2022 03:39:58 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ams.source.kernel.org (Postfix) with ESMTPS id A0390B80EB4; Mon, 13 Jun 2022 10:39:57 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 0372AC34114; Mon, 13 Jun 2022 10:39:55 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1655116796; bh=AcdtkWwvTJuyIE69/E/Rkvg1tC2FUJiA9+td4VW2HKk=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=aFKB1Yr5XzKVfDGXRBG1C3Mftwti7BBAoZmjQExpNN1/Xv2uYcnSdKo1z6iDOOeHu cQ4lahR1Lxa4Ha8sXIXgwuh48lrxWufQ0ViEYOwq49a60QuDFxIP7preHLJIqbVQc4 NQi+euMncIghUefqZPpPofuE7MUsIif35hdko+Rk= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Phil Elwell , Stefan Wahren , Florian Fainelli , Sasha Levin Subject: [PATCH 5.4 167/411] ARM: dts: bcm2835-rpi-b: Fix GPIO line names Date: Mon, 13 Jun 2022 12:07:20 +0200 Message-Id: <20220613094933.668942305@linuxfoundation.org> X-Mailer: git-send-email 2.36.1 In-Reply-To: <20220613094928.482772422@linuxfoundation.org> References: <20220613094928.482772422@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-8.3 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_HI, SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Stefan Wahren [ Upstream commit 97bd8659c1c46c23e4daea7e040befca30939950 ] 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 Signed-off-by: Florian Fainelli Signed-off-by: Sasha Levin --- 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 2b69957e0113..1838e0fa0ff5 100644 --- a/arch/arm/boot/dts/bcm2835-rpi-b.dts +++ b/arch/arm/boot/dts/bcm2835-rpi-b.dts @@ -53,18 +53,17 @@ "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 */ -- 2.35.1