From patchwork Mon Oct 24 11:30:22 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Greg KH X-Patchwork-Id: 8923 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:6687:0:0:0:0:0 with SMTP id l7csp434609wru; Mon, 24 Oct 2022 05:52:32 -0700 (PDT) X-Google-Smtp-Source: AMsMyM53MIsSfykTcvkaVDI5Nswcyj/Hwau9j9rcj5IFsBf1uavlCklIgzyt31p+b9iAX9Axfuit X-Received: by 2002:a17:906:da86:b0:740:7120:c6e6 with SMTP id xh6-20020a170906da8600b007407120c6e6mr27200391ejb.44.1666615952735; Mon, 24 Oct 2022 05:52:32 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1666615952; cv=none; d=google.com; s=arc-20160816; b=yycNx4Z/kUO7AmS9jFLED59FGYyIE1KOfMHaavv50zm/zWSkPFYyaL85co401tPE2h WpJzQI/uCZGCWdbIgH++duMT93jJSDG6x/3e7HQtczaKP1sZxpIRFgRm2FhP6HWxbMRl FNlbd5IzERTk9Nl0D9jQXncHlrsWyT9hBc2xJfh5sYlu3ZLYBT7Bd9K6+Od4VPwonQGp lxpjqzQK0exiqJlJdw4U4yvDk/bGd4SoH7KtEEXgEgmzMJveVWQ00qa55Kn/SlugsaRE YgbTh8fNL8bLQuCXYsCJjvmeveiPZTcigFoVO4wvXZnIdREEJH6hv1npmCuYxvheKYKg GTRA== 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=PoR145ezcpvPKQUCCpCGoCB938uBFcj397TFTepX4pFfRuUXxiMfkByLs/3+iTRzUv Eec8a/BUEneZ6sGwb92eAjYS5amrH9d2IiAjebY0J+DEeqT/2QI0MEWU41o5IFXybQVq LTefMKvZynhHgKGinLqyNTa4QDBz51gfnVMGX5LsCIM+cQG4P1HaxyRQNNiF97d5WUXU wn9FaYs7W0+zOZtq3jPBEQc1hxrbNqggWIQ+aEdD5I3Vc+CPX/vI+2KEX5OJ7JdtRzqH eIARtNzm1CjRiKtEnACHGs4s+bRZbVl0AYxlCmdvweggIyCSHr8j+zNCGPTiosBeP1Uy CDaQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=BC2w4zXg; 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 v15-20020a170906180f00b0078d20d71475si24080032eje.413.2022.10.24.05.52.07; Mon, 24 Oct 2022 05:52:32 -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=BC2w4zXg; 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 S234419AbiJXMvF (ORCPT + 99 others); Mon, 24 Oct 2022 08:51:05 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:58322 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234683AbiJXMp3 (ORCPT ); Mon, 24 Oct 2022 08:45:29 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [IPv6:2604:1380:4641:c500::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 6265A6156; Mon, 24 Oct 2022 05:10:01 -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 1D1F86128E; Mon, 24 Oct 2022 12:09:35 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 2FF02C433D6; Mon, 24 Oct 2022 12:09:34 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1666613374; bh=cHT/tctzQJbGiXiQn4s+uUUWvv1Z72ev5clpduBCXxw=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=BC2w4zXgazcjXBj03+wWOvmxN0Zkt8ShfQvMaUQnZxuLFovN8+DR/gsirqroUrma8 skFkL05ftvG/yNDHGQtFyDqgK7qNe8RQ947WW/AHl5AWKCeHEKlwTPuNDZUhd4IJyN UAmQP4zTtuTYEOE7ZVBrKS09I8bgNcZDag2EVp5g= 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 5.4 112/255] ARM: dts: turris-omnia: Fix mpp26 pin name and comment Date: Mon, 24 Oct 2022 13:30:22 +0200 Message-Id: <20221024113006.214478404@linuxfoundation.org> X-Mailer: git-send-email 2.38.1 In-Reply-To: <20221024113002.471093005@linuxfoundation.org> References: <20221024113002.471093005@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?1747573489401249617?= X-GMAIL-MSGID: =?utf-8?q?1747573489401249617?= 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 {