Received: by 2002:a5d:9c59:0:0:0:0:0 with SMTP id 25csp2195763iof; Tue, 7 Jun 2022 22:52:29 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxBU+S0csAXuWAnZc+/xpYVXCtAy7CaEknAD1ONiZQZJxdAUIwj1gPiKC6zEPEOo5JD8BZl X-Received: by 2002:a05:6a00:248a:b0:51b:f461:8318 with SMTP id c10-20020a056a00248a00b0051bf4618318mr21166130pfv.47.1654667549632; Tue, 07 Jun 2022 22:52:29 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1654667549; cv=none; d=google.com; s=arc-20160816; b=RV4lMiO8GCbZybBox50w3nwXYI53xtUtlupcrFSmW7mXWQTkBa9S889iGXbIraQaKV RtVQJzq2GjesnDuUMymra8QGpxehawJnpSUzOxHU3WYZ9QpJ3MTjdZAUx44+ganDbJbE STcZLW7Ckz5FzyAaBAVBLiC3bga1RHg5YFw0haL4ANwxwLtvRCCGaY2DK3/kH9+cK4e/ jMZ0F0LpBfn+kOLkaygb/bERfQ0g6WNjYIzXwNUI3UMP8nOltlY3dMHBghJQzslWdZv0 7ZhUYOGo1DigrDjL6UIdsZZUA5/eEwUAw6bNIKxpL3ujhV3iNmIARN8Wjc6lDe85FoO0 v1cw== 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=HXOVCBAfkgnsXeo8gv41Ll6aIAiUjbZqGKWqjoyPwoI=; b=NPmyBS9eAPj4ATLxBLQ+3K7svs/C5MOX9tuVkrO8GNzhb6g5Knmn8I/a/zHIbhgemP /jIVI5tVXtBQT/+LmnvqXo6xJxZyLpDvGNYLZm/kG2Cil1ISy7eNB4i0+Dq0+Tk0ETVq d9XkcbtFV11xZGTX1ix/TSY5iMoO+bw+CEuTfiyyiC9a8ZXVdfjxtKIqVZKhQDKM1yXb 6bVM8ktp8ayb/SadlPdgTBS02pIFBuMAOZXRIUJpS1iq+1m5bJtgIHdvCJyu9QXumdCJ /1MtZK15bf6HP+nIf7Jl48b+akaHeCok+X8pC0+kq6ZQKt487m3fTmBTpZp+VhH6ZF1o 5Ypg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=GuSTbdFw; spf=softfail (google.com: domain of transitioning linux-kernel-owner@vger.kernel.org does not designate 23.128.96.19 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 lindbergh.monkeyblade.net (lindbergh.monkeyblade.net. [23.128.96.19]) by mx.google.com with ESMTPS id m8-20020a056a00080800b0051c16acf791si5628338pfk.304.2022.06.07.22.52.29 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 07 Jun 2022 22:52:29 -0700 (PDT) Received-SPF: softfail (google.com: domain of transitioning linux-kernel-owner@vger.kernel.org does not designate 23.128.96.19 as permitted sender) client-ip=23.128.96.19; Authentication-Results: mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=GuSTbdFw; spf=softfail (google.com: domain of transitioning linux-kernel-owner@vger.kernel.org does not designate 23.128.96.19 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by lindbergh.monkeyblade.net (Postfix) with ESMTP id 8789035C57A; Tue, 7 Jun 2022 22:19:07 -0700 (PDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1392557AbiFHAww (ORCPT + 99 others); Tue, 7 Jun 2022 20:52:52 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:46196 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1383418AbiFGVxK (ORCPT ); Tue, 7 Jun 2022 17:53:10 -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 1226E244445; Tue, 7 Jun 2022 12:11:42 -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 4F6F6B823AF; Tue, 7 Jun 2022 19:11:41 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id B92BBC3411F; Tue, 7 Jun 2022 19:11:39 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1654629100; bh=QkOH8aBw7HbsAVaM5zKar+EG2d5a++2v14+Ybugj7nQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=GuSTbdFwzsYHsI1uvmQ35glaOp0E0jC5N+txgFlFQhYP4TrlUtE0PDADjFuZt9wpO lkHrh6c3fjgMjJxZMhsrEbzku4Qqn9Ld5+4b7VlNL9zhTQLwOfN2voomKSA3xqVR4l hzITMNiUKSF9tPIhoJ3hiosO7YqFGH1uR4qIcfw0= 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.18 569/879] ARM: dts: bcm2835-rpi-b: Fix GPIO line names Date: Tue, 7 Jun 2022 19:01:27 +0200 Message-Id: <20220607165019.374470908@linuxfoundation.org> X-Mailer: git-send-email 2.36.1 In-Reply-To: <20220607165002.659942637@linuxfoundation.org> References: <20220607165002.659942637@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=-3.1 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,RDNS_NONE,SPF_HELO_NONE,T_SCC_BODY_TEXT_LINE autolearn=unavailable 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 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 @@ "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