Received: by 2002:a6b:fb09:0:0:0:0:0 with SMTP id h9csp445612iog; Mon, 13 Jun 2022 06:08:21 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwTPRsNE3u6aDfHt6jFHlUiKvbVGIQcKy5qKQqx771QPS2IrYXbKLu0m7XHZ+aR0ww2uCRU X-Received: by 2002:a17:906:99ce:b0:711:c6b6:1d95 with SMTP id s14-20020a17090699ce00b00711c6b61d95mr37410539ejn.339.1655125701159; Mon, 13 Jun 2022 06:08:21 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1655125701; cv=none; d=google.com; s=arc-20160816; b=fug2KJuzREgVmSOHpAnpZ2nD0gLkpfFmQpgXdD9AOqP5jIi6d0zq+fxcP4CavTNNlB gL4SoeERTHTcb62rS3m6NnWXYfQ06iqtNQw79w4x+S/prhAPi2eIyEJfsgezpYkWBi1v VKkTdqGwLwNRZ/Uk7op/+u0NYB397akK2MwwqZQa+O1qRbSTi3S1C7aqrDpucnX4xBg/ DTjhFHMcPihSi8DdG/77C3l3Yi9g8xcv5i4LnSK0W6N0he9+Gq5YKLK3MGf4bqp79jqZ lC48Ns7A7yYxiMbeAt96bmFxz4+dThQqlmqMVxj4tRlcL5/SFkx8ukpd89G+EkJzwp0Q zRFw== 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=x5xFw+WmOaF3NSBcdYKdpLUemdVUPqJfd+uYsQnkxE8=; b=W9nwSZKGqhakZCpLnap0IDMCBQzt9vqmPDzFtZ6poKWBP8hcEmHm5vG2g8j+rSbGae fEuK4J3g/PLiAyl5RMut3TsaMHtnyXzOI9BZiJAdBOr5p65Tuznc9cPXApOT0/od6ags 8LWroByE9zXojx4Hja6J/8ZKcmAU5cM2BTQ7SAkIvccd/s+zDs9o5T2mrkhDJB6EIOwJ fX6TfOez7eOTUkwihOQ37c/2DYIAMu+wNk6uei2iQpJJ0fHbdnvbBv9ujlEnjfG1rMS+ tnKmJI2pzrJQ4iQaRwfCbVaSyi7MXnH3lW57pdcVqVga5Ss26EfWZjTsAMqEVnymFKPd 1eSQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=AxdISOsO; 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 ne16-20020a1709077b9000b0070dcedd6ca2si7731039ejc.713.2022.06.13.06.07.55; Mon, 13 Jun 2022 06:08:21 -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=AxdISOsO; 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 S1353372AbiFMLXj (ORCPT + 99 others); Mon, 13 Jun 2022 07:23:39 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:46638 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1353664AbiFMLQK (ORCPT ); Mon, 13 Jun 2022 07:16: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 C2EF713CFF; Mon, 13 Jun 2022 03:38:52 -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 7D104B80EA8; Mon, 13 Jun 2022 10:38:51 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id CF785C3411C; Mon, 13 Jun 2022 10:38:49 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1655116730; bh=7agJsc/WXzZAfFP3rDLQLuaD2uvLx9yEAoeeaXFPjTY=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=AxdISOsOImqKcMW+Y/XIrmqiW+j60ko1FYmIS3RouAiTAMzT+uXgGkjTDjTbfRKXH RCGuGr2zHWeBE+3XqJzA1zMIjfYJ/DyknvElRREfdwBAu7IiWfXf+r1KZ7mnLoB0VN kJZfb+habh33nZ5dR39YyKrAOWCy5cxKEcohqod0= 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 164/411] ARM: dts: bcm2835-rpi-zero-w: Fix GPIO line name for Wifi/BT Date: Mon, 13 Jun 2022 12:07:17 +0200 Message-Id: <20220613094933.579805640@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: 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 f65448c01e31..34a85ad9f03c 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 @@ "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