Received: by 2002:a6b:500f:0:0:0:0:0 with SMTP id e15csp1326554iob; Wed, 4 May 2022 21:20:06 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxxoSreDYsX8rpt6zhTCLa4oHAvHK3NvG5zZLgUF4wfWzfOVTDJZcKuPS/v7AfF4jH1lC6L X-Received: by 2002:a17:907:8a07:b0:6f4:73c3:89b0 with SMTP id sc7-20020a1709078a0700b006f473c389b0mr14014391ejc.420.1651724406382; Wed, 04 May 2022 21:20:06 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1651724406; cv=none; d=google.com; s=arc-20160816; b=RNMqMr4XjB8mCo2agwbk9nqMAyN92ItXlSi0zdZjDQVGxaytMqEhZNnxAmliUJBXD8 UWU8zV6ReYGFAbkjht4k8RbJP3B5od9Y21lzI2twwb7/oI85gVXuigOqXT4g1ZXjZ6GC n0cEeStCc5O/PpjgOQCmoP7BzEwk5mKcTD15iYDARQ3UmJbvobCQaI+ntkcW+EqEuS9B veIGrpaIxDTh0aWLwELl55ywBIZLQO8rrM7ldwFCmTXIn2Ktge3w7uwDNxFj6QV2oGku AT0ZVPpvxxdu41G2Gt341A4SiekWxX1idq0SYmu+N2ood31g/xiDsSvyDEOThotHodzc qlXw== 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=exaaHa2mLKFLac0eZobaGEHbV0/JNK7vLnDhGL0Py+E=; b=r/Ntjn1ZK3hqwAYj+atq5Js2Qn6duMiX4bA3DkelBp3WyeNI65dy/IcoP6fg06B/Ob WckA6P+GcRQR94JcByT/uCJsvQ7mjiTbrYB/KUMHXPRPhVpiRbxO7uT6RBTvQwoOBCff KZuR/R+HmpZYwdjXUJfky77XhIPSSv8C12V7v3J60TU1a3+ONOYndGs5kSHTyvt0+T9I 0O5J8/FO0fmBXEJffYIROMVxKUdf9MrNDNsPWp3BUti88fImo2o/bBcnnUXKly3SLBIV 5Oz0BvrjWhlwWNfDeOm6OXvHiR0SSrHq8Ylzq0smazYTQMm5/vRnQnexz8Gu8c9oMrra Yhxg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=lE7Og0Wf; 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 cb26-20020a170906a45a00b006e7ee599274si1031591ejb.235.2022.05.04.21.19.30; Wed, 04 May 2022 21:20: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=lE7Og0Wf; 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 S1358765AbiEDRQO (ORCPT + 99 others); Wed, 4 May 2022 13:16:14 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:55186 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1355782AbiEDREm (ORCPT ); Wed, 4 May 2022 13:04:42 -0400 Received: from ams.source.kernel.org (ams.source.kernel.org [145.40.68.75]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 52EBC4990C; Wed, 4 May 2022 09:53: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 CEACCB827AC; Wed, 4 May 2022 16:53:22 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 766EFC385A5; Wed, 4 May 2022 16:53:21 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1651683201; bh=kPLz94WvLTpi4nn5bI9RZUlYwgXMZk6o7VGKl86N18I=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=lE7Og0WfdLYCti3fBza8jqt5dmhRvPuG1sq8j0qKEQGFlCMj65UmGMJq8u6Lpsh2r CH/mOmZ3FKz3PRCy2lGv0I2+1vWLHGOYBpix8rBpvlnnDvFNJ6kNvLr78SV9KkFeTj B1X9Nvlu6uuUozSUnMSb2RbDcY7+wrC82oeqJTQc= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Ajay Kathat , Claudiu Beznea , Nicolas Ferre , Sasha Levin Subject: [PATCH 5.15 066/177] ARM: dts: at91: fix pinctrl phandles Date: Wed, 4 May 2022 18:44:19 +0200 Message-Id: <20220504153058.970518474@linuxfoundation.org> X-Mailer: git-send-email 2.36.0 In-Reply-To: <20220504153053.873100034@linuxfoundation.org> References: <20220504153053.873100034@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=-7.7 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: Claudiu Beznea [ Upstream commit 0c640d9544d0109da3889d71ae77301e556db977 ] Commit bf781869e5cf ("ARM: dts: at91: add pinctrl-{names, 0} for all gpios") introduces pinctrl phandles for pins used by individual controllers to avoid failures due to commit 2ab73c6d8323 ("gpio: Support GPIO controllers without pin-ranges"). For SPI controllers available on SAMA5D4 and SAMA5D3 some of the pins are defined in SoC specific dtsi on behalf of pinctrl-0. Adding extra pinctrl phandles on board specific dts also on behalf of pinctrl-0 overwrite the pinctrl-0 phandle specified in SoC specific dtsi. Thus add the board specific pinctrl to pinctrl-1. Fixes: bf781869e5cf ("ARM: dts: at91: add pinctrl-{names, 0} for all gpios") Depends-on: 5c8b49852910 ("ARM: dts: at91: sama5d4_xplained: fix pinctrl phandle name") Reported-by: Ajay Kathat Co-developed-by: Ajay Kathat Signed-off-by: Ajay Kathat Tested-by: Ajay Kathat Signed-off-by: Claudiu Beznea Signed-off-by: Nicolas Ferre Link: https://lore.kernel.org/r/20220331141323.194355-2-claudiu.beznea@microchip.com Signed-off-by: Sasha Levin --- arch/arm/boot/dts/at91-sama5d3_xplained.dts | 8 ++++---- arch/arm/boot/dts/at91-sama5d4_xplained.dts | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/arch/arm/boot/dts/at91-sama5d3_xplained.dts b/arch/arm/boot/dts/at91-sama5d3_xplained.dts index d72c042f2850..a49c2966b41e 100644 --- a/arch/arm/boot/dts/at91-sama5d3_xplained.dts +++ b/arch/arm/boot/dts/at91-sama5d3_xplained.dts @@ -57,8 +57,8 @@ slot@0 { }; spi0: spi@f0004000 { - pinctrl-names = "default"; - pinctrl-0 = <&pinctrl_spi0_cs>; + pinctrl-names = "default", "cs"; + pinctrl-1 = <&pinctrl_spi0_cs>; cs-gpios = <&pioD 13 0>, <0>, <0>, <&pioD 16 0>; status = "okay"; }; @@ -171,8 +171,8 @@ slot@0 { }; spi1: spi@f8008000 { - pinctrl-names = "default"; - pinctrl-0 = <&pinctrl_spi1_cs>; + pinctrl-names = "default", "cs"; + pinctrl-1 = <&pinctrl_spi1_cs>; cs-gpios = <&pioC 25 0>; status = "okay"; }; diff --git a/arch/arm/boot/dts/at91-sama5d4_xplained.dts b/arch/arm/boot/dts/at91-sama5d4_xplained.dts index accb92cfac44..e519d2747936 100644 --- a/arch/arm/boot/dts/at91-sama5d4_xplained.dts +++ b/arch/arm/boot/dts/at91-sama5d4_xplained.dts @@ -81,8 +81,8 @@ usart4: serial@fc010000 { }; spi1: spi@fc018000 { - pinctrl-names = "default"; - pinctrl-0 = <&pinctrl_spi1_cs>; + pinctrl-names = "default", "cs"; + pinctrl-1 = <&pinctrl_spi1_cs>; cs-gpios = <&pioB 21 0>; status = "okay"; }; -- 2.35.1