Received: by 2002:a6b:fb09:0:0:0:0:0 with SMTP id h9csp443880iog; Mon, 13 Jun 2022 06:07:07 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyL1MGojkHGnvGw5FpShm7O2bnJbtiveEfBuNYLd9mmajMoHH7e/FmJu9IBgZqp8JTZouPg X-Received: by 2002:a17:903:1249:b0:168:e059:59c1 with SMTP id u9-20020a170903124900b00168e05959c1mr4181983plh.0.1655125626953; Mon, 13 Jun 2022 06:07:06 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1655125626; cv=none; d=google.com; s=arc-20160816; b=mrbfWVa2ViBqgmfzoNUhJZDKHDUJMvgUy/OpbD4aiPCocBNujIqkm2fhmquPJVbYdo Bb9EJkIy9ZbUxxZbu8+CDgfI93n0Lv12Wa7V6YGz6DyIC99cS2Po3I7SdttF+BCacku4 fBDTdIT6xAuRBY8KOxhyDF0jaNJawSl7JnzMXd4mMo0PDDxQ0Mxr+TzgeEOhi3nT4oKS 6FQarv91hXMhIMI+O0ZahP+nrmOS76adjKdHl/gjezPx4APOzFRLryyTZjyNtU8WVUBb hVUGT3fbK39F8w44iBiOdLaE7cJhhD0p93ksbg9XzJMFaJmX1lID3eqZcqXgzOHSp7EP ELfA== 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=F1IS6aqcHIB6uCTlwb28WBYtoYDJsjAc0kjgDHKr3b4=; b=yyopEElaG803ncaUSrRsHvkNMik9U1qylBMiEbqgN8hd5BoVw2ert9OxWs9Op4hB9A iG5Fup7N0bvOEZh9u8h3VpxjcSK/J7zBOMwASLk3UA7oAJoLqLpd5SFCbGUGHUNjNwR5 2aZwzGGcp7MzN0/dnAyIyEq9xcsJK1JXebjpSR9KqZXZEOaqZLww4R74MgJgWDnfLKsv XmPjACF7p+rsPIctNlfq1NnEnf9jc0rFt3hBDgWxzhgBHZ+5JgrYkjVI8S0ctIlhvuPe i3W/WoOM8W+3Av5T8hBZDPjVIUu0gBZEpjF1bR6WLff4Diz0fOa/ece6Ip3oZfkcbkEs FeOg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=B0Jowjsl; 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 76-20020a63064f000000b003fe19299386si9608457pgg.756.2022.06.13.06.06.51; Mon, 13 Jun 2022 06:07:06 -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=B0Jowjsl; 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 S1347552AbiFMKtA (ORCPT + 99 others); Mon, 13 Jun 2022 06:49:00 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:47674 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S244283AbiFMKoj (ORCPT ); Mon, 13 Jun 2022 06:44:39 -0400 Received: from ams.source.kernel.org (ams.source.kernel.org [145.40.68.75]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id A6E1A2B1A3; Mon, 13 Jun 2022 03:25:35 -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 BFCD7B80E95; Mon, 13 Jun 2022 10:25:33 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 163A2C34114; Mon, 13 Jun 2022 10:25:31 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1655115932; bh=OVUFaOWUmbpkj69+VKs5fiy14EGc8rkaQ0JYQakAbwk=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=B0JowjslV54Y4x22qzHJpWx8QO5HbStcVhs9EBGD2Nfhb1ty/Do28AgZkZc2et3Zp MziOAhkD78Nd2e+fesgO7tYCGBkbRdjD67fE6cuTkVJCvobaUa+flgCIt6uNRBWWbB 2LBmR2JQOiSKr7wiIvfh9ca60kLAmpj7tKJ7qytk= 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 4.14 083/218] ARM: dts: bcm2835-rpi-zero-w: Fix GPIO line name for Wifi/BT Date: Mon, 13 Jun 2022 12:09:01 +0200 Message-Id: <20220613094923.032582436@linuxfoundation.org> X-Mailer: git-send-email 2.36.1 In-Reply-To: <20220613094908.257446132@linuxfoundation.org> References: <20220613094908.257446132@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: Phil Elwell [ Upstream commit 2c663e5e5bbf2a5b85e0f76ccb69663f583c3e33 ] 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 Signed-off-by: Florian Fainelli Signed-off-by: Sasha Levin --- 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 120776d45441..932e0e6320c5 100644 --- a/arch/arm/boot/dts/bcm2835-rpi-zero-w.dts +++ b/arch/arm/boot/dts/bcm2835-rpi-zero-w.dts @@ -77,16 +77,18 @@ "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 */ -- 2.35.1