From patchwork Wed Oct 19 08:28:41 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Greg KH X-Patchwork-Id: 5492 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:4ac7:0:0:0:0:0 with SMTP id y7csp334943wrs; Wed, 19 Oct 2022 06:43:58 -0700 (PDT) X-Google-Smtp-Source: AMsMyM7hVI8inDhUOn4VG5d3msN1pLkdWuvcWTtmM7hL9auY8O+nzIwxd1y3F8iKgZSseM84nKQH X-Received: by 2002:a05:6402:357:b0:458:5cb6:f587 with SMTP id r23-20020a056402035700b004585cb6f587mr7612557edw.183.1666187038612; Wed, 19 Oct 2022 06:43:58 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1666187038; cv=none; d=google.com; s=arc-20160816; b=RB8nGNF3cPYM/DxrJ2FWpgy+YrIFWkr5yJq3ZEtO7d4iHBpe74yRNxvsIay/tbw3nl C2q9XH15np7pex4+MYnp8hj9VW0fW+bwgPUHpIr7/viwArPeqk2oDOtd0iIOShZZpjCT 92/UQZ4wImvporb/80Bj5UZC5GacjA2DDXwh1V2w1+wyF7On3L4D8xb/dGPfpJ7uqq5j 3ZQrW5eGKwsnuErGWzi/tGFf/riHZXj2zJY5pt17X2Oge9zffhL4FwHI4N7woXkYRd5y m1BCyOmEbZTC4nStN/VCINJHVWlhALskLaUs1tNXNl7ExTEnDAV01RjnawR754s4Jaru YSKg== 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=kKrmdbXN8++sv+oZyT/qiEU2U7VGcWRidcEyi/oSLZ8=; b=RTydbm1oujQU6RHYTFh6scMkQ514jkZUOtWMg3FurzipnEFDdZl0y4y7PX7wUUJCfm BtH7eg8QP/u81yT5cRPohimod7KrLJBnFZooUMcPCVI7Z4J3n6inKNROY0j2SfqEsPNA 4yDWiQokApm77oaB9UHbmj0+qdVKYMKA6p6ZtS4m+kDiz8WaRIaQaJAbVtBQPxwKsQhW 8D9vjOhK+MRFtphl4RMwDMu/LYP0Mc9AmfSuET1FODRubGwG59QOvm8wyDAN4vKGPCqJ 3X2m6P7sfI7YM8oTM0P6Jzu9OSYaPkYRjXVNSCDc9iRcTsJD1jCTvdPw25KWZnYVHTeA 6wlw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=WHLoCBf8; 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: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id sg35-20020a170907a42300b0078234266a78si14765226ejc.894.2022.10.19.06.43.32; Wed, 19 Oct 2022 06:43:58 -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=WHLoCBf8; 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 S232825AbiJSNkx (ORCPT + 99 others); Wed, 19 Oct 2022 09:40:53 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:48986 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232565AbiJSNiy (ORCPT ); Wed, 19 Oct 2022 09:38:54 -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 DB8DEC8950; Wed, 19 Oct 2022 06:26:23 -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 BF738B82428; Wed, 19 Oct 2022 08:57:36 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 2F91EC433C1; Wed, 19 Oct 2022 08:57:35 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1666169855; bh=QE29W445skf+b67eNF58++sy3X82ljVGxWpQJ0ChOqc=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=WHLoCBf8JsZaosJNlvfI/JjDw0OwuXN7PYBonePMavyPOJRfo1DfotgDfwPb+r2Qx oBtMk1YtAkgp0hXbAIEoRwlgLvnC+HvavPjEuXRgHwvaVeU81X7dkIZuBPRANxG2ET Cv94GYp35myXiztKsxIwgOQJVy2DyaopLyUjs1HY= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, =?utf-8?q?Marek_Beh=C3=BAn?= , Gregory CLEMENT , Sasha Levin Subject: [PATCH 6.0 434/862] ARM: dts: turris-omnia: Fix mpp26 pin name and comment Date: Wed, 19 Oct 2022 10:28:41 +0200 Message-Id: <20221019083309.154357076@linuxfoundation.org> X-Mailer: git-send-email 2.38.0 In-Reply-To: <20221019083249.951566199@linuxfoundation.org> References: <20221019083249.951566199@linuxfoundation.org> User-Agent: quilt/0.67 MIME-Version: 1.0 X-Spam-Status: No, score=-7.4 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 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 X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1747123739892727673?= X-GMAIL-MSGID: =?utf-8?q?1747123739892727673?= From: Marek Behún [ Upstream commit 49e93898f0dc177e645c22d0664813567fd9ec00 ] There is a bug in Turris Omnia's schematics, whereupon the MPP[26] pin, which is routed to CN11 pin header, is documented as SPI CS1, but MPP[26] pin does not support this function. Instead it controls chip select 2 if in "spi0" mode. Fix the name of the pin node in pinctrl node and fix the comment in SPI node. Fixes: 26ca8b52d6e1 ("ARM: dts: add support for Turris Omnia") Signed-off-by: Marek Behún Signed-off-by: Gregory CLEMENT Signed-off-by: Sasha Levin --- arch/arm/boot/dts/armada-385-turris-omnia.dts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/arch/arm/boot/dts/armada-385-turris-omnia.dts b/arch/arm/boot/dts/armada-385-turris-omnia.dts index d1e0db6e5730..a41902e3815c 100644 --- a/arch/arm/boot/dts/armada-385-turris-omnia.dts +++ b/arch/arm/boot/dts/armada-385-turris-omnia.dts @@ -476,7 +476,7 @@ marvell,function = "spi0"; }; - spi0cs1_pins: spi0cs1-pins { + spi0cs2_pins: spi0cs2-pins { marvell,pins = "mpp26"; marvell,function = "spi0"; }; @@ -511,7 +511,7 @@ }; }; - /* MISO, MOSI, SCLK and CS1 are routed to pin header CN11 */ + /* MISO, MOSI, SCLK and CS2 are routed to pin header CN11 */ }; &uart0 {