From patchwork Mon Oct 24 11:30:30 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Greg KH X-Patchwork-Id: 8728 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:6687:0:0:0:0:0 with SMTP id l7csp423770wru; Mon, 24 Oct 2022 05:25:43 -0700 (PDT) X-Google-Smtp-Source: AMsMyM7Oa+xH8hpUFnXlBJMBgCwYhCuGdFLUR91OnzhcnYyXrKbJjM7zu7eW9B9Pap6u7g2Q7Wo0 X-Received: by 2002:a17:902:ced1:b0:186:b18a:d0d5 with SMTP id d17-20020a170902ced100b00186b18ad0d5mr2532626plg.60.1666614342800; Mon, 24 Oct 2022 05:25:42 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1666614342; cv=none; d=google.com; s=arc-20160816; b=JDxkoSJFQAIb+pNjuDDZm5zZ7RrdEjgo9KWqbbSj479die5qUTnXZ1NbpXGk6y9uHV 3vapVeF5zFP/IKPSZlLRCxqXxB3QtwsMRDVgH3x4xbwwBsehsifCe9S4JZbSvk8UJE/o ritVrzpc/e6AlChh/KYkw3CbZC7OtFHW6Q7IR0ou805DqtirGe0yhHtIL5mmhaV4M3PV Bk10cUnmEht9oBwIQY5Ho82uY3BHbCK6+hv8YKsaq8NrjlasjyeVxvxwQu31x/zXnZQq mBplCa9LcY4iBJ84Bxi7zM/c1bbbyUQGBUiY3SdvMvcUC0o+pMHOnfLkxzkfljLkUZvc jQDw== 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=GyJzWI/3K+eYCuoLWmEQ/RUEr2IgU15DA+HH+EwjSks=; b=aITBBMs9zBq1NLCX5zPwohXays3s6T4yYVVyajy1Kqq1MCiWHrSVCjwV+3UAuhWE5A poXRGevIrQjAybWMMBgNL7kS+RhINikP5JTgAIDF8WtuuB2gQQ4pZQyTT+6fIdaOpH0m LcFVLCJ5ZFMzmHLHBt8gK3y9nrTL1j6YVS2cTtTWl9BANZWpiaAONRlwnQRcpv0ys6Av aIeYUaFx0mabV42Uqcl2fFcAUy3GrAUNMc2NG0Wad9TYc1LR3hXaAj9an4CdsjHn6opx ykuc4+JCXUkX9+woNL7kLHCBUosJCCiNjefL8AZK1qDgjyAUWcVaKSfWKO5H+VQC7mhr 2ajA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=GPMJrVkw; 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 h16-20020a170902f55000b0017edeec4716si41557732plf.34.2022.10.24.05.25.28; Mon, 24 Oct 2022 05:25:42 -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=GPMJrVkw; 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 S233465AbiJXMYv (ORCPT + 99 others); Mon, 24 Oct 2022 08:24:51 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:40686 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233559AbiJXMXL (ORCPT ); Mon, 24 Oct 2022 08:23:11 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 1F42D1C119; Mon, 24 Oct 2022 04:59:43 -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 dfw.source.kernel.org (Postfix) with ESMTPS id 58C0F61252; Mon, 24 Oct 2022 11:59:30 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 6AE14C433C1; Mon, 24 Oct 2022 11:59:29 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1666612769; bh=cHT/tctzQJbGiXiQn4s+uUUWvv1Z72ev5clpduBCXxw=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=GPMJrVkwjJB/Tto61ezoEEuMcyRorrGSKq3t+SmwdENP6pjN/nLfLNVC4Am22kg5/ 4y7RKc83HWpn8qyqVivu7J76UgCdFwBkwNBumj3r/iygAr26z0xroODp3kQ/HkotAS 1BhDqcMclNt46zX6U+f7YPw6vkpSb5NGmahTnXFA= 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 4.19 111/229] ARM: dts: turris-omnia: Fix mpp26 pin name and comment Date: Mon, 24 Oct 2022 13:30:30 +0200 Message-Id: <20221024113002.595984668@linuxfoundation.org> X-Mailer: git-send-email 2.38.1 In-Reply-To: <20221024112959.085534368@linuxfoundation.org> References: <20221024112959.085534368@linuxfoundation.org> User-Agent: quilt/0.67 MIME-Version: 1.0 X-Spam-Status: No, score=-7.6 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?1747571801105044414?= X-GMAIL-MSGID: =?utf-8?q?1747571801105044414?= 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 fde4c302f08e..92e08486ec81 100644 --- a/arch/arm/boot/dts/armada-385-turris-omnia.dts +++ b/arch/arm/boot/dts/armada-385-turris-omnia.dts @@ -307,7 +307,7 @@ marvell,function = "spi0"; }; - spi0cs1_pins: spi0cs1-pins { + spi0cs2_pins: spi0cs2-pins { marvell,pins = "mpp26"; marvell,function = "spi0"; }; @@ -342,7 +342,7 @@ }; }; - /* MISO, MOSI, SCLK and CS1 are routed to pin header CN11 */ + /* MISO, MOSI, SCLK and CS2 are routed to pin header CN11 */ }; &uart0 {