From patchwork Thu Mar 31 14:13:23 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Claudiu Beznea X-Patchwork-Id: 12797181 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id A87A3C433EF for ; Thu, 31 Mar 2022 14:14:38 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-ID:Date:Subject:CC:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=NM991kBZk9Q3nW0dXjnuNOT6nTfnjZgGPC0GG5+9/vw=; b=X5dkzn5CGjbZn8 WUtksa4dZMz82erASRHZQ/tKqBbuqenESP2EimodPCn2RlQ9BpqbhLYMxhe1Evh4xnqnOO/uGQn47 EmU7jgRCLxcbDiWkUvzK7GOwX6tpDymDs04MojoAZZzhwks2VsrRNr7EfSaogNHAweW/fJF0LvE1k apDG4HoNBfYJdSxwA7/h60kMDDPn16y9vE7ZW9ecdlkiBgMWZzGFFNALYXQIYTtMIOi+sr0bdT4Va EbUjTBnviVkWlkvPmum7OYMQra7QYCw4LwNUP+3bYG48en5CMezV4idT+LL6HA0xcowAEcNXVx7m7 4vomaCI57dJ927jFcNAQ==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1nZvXk-002Wj3-E8; Thu, 31 Mar 2022 14:12:56 +0000 Received: from esa.microchip.iphmx.com ([68.232.153.233]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1nZvW7-002W0W-DN for linux-arm-kernel@lists.infradead.org; Thu, 31 Mar 2022 14:11:17 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=microchip.com; i=@microchip.com; q=dns/txt; s=mchp; t=1648735875; x=1680271875; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=s14Q9frxV/DdiV00e2n8rH5uoNNzzoof8snfleEcI58=; b=xD+IVauBKfNNeVcAZt82mhrwq5S8MaiMyYJgD0FuoQ8lGR3DE/D7ckOR M5lDaEjlTwNUJjWtmcHiaDrDxXG7+iRj/aHKQGYS8BkoAJ144djmR7eSF 3bmF6Y3SITw+pxRgbxWgRjSYc1G8Jn7MtAN7FGmAmVMueXhdG75ZBvce1 9ffkD1ZlwOsiRD7eiKlSuViH7s1TEMF+td7xwy0e2O6thjfsT30Yn6poZ 2rHqegfpfZ+jVk0qIjc1UA06TLSMYRvDZSEOAQODb2vcLlJpPhz4rmzwC fv/5Y/H66/HSYWLk4SKzyzkAgECjnkKRwmBAmsSKmwdrqLBB1H0twvqP6 w==; X-IronPort-AV: E=Sophos;i="5.90,225,1643698800"; d="scan'208";a="158386519" Received: from smtpout.microchip.com (HELO email.microchip.com) ([198.175.253.82]) by esa5.microchip.iphmx.com with ESMTP/TLS/AES256-SHA256; 31 Mar 2022 07:11:15 -0700 Received: from chn-vm-ex02.mchp-main.com (10.10.85.144) by chn-vm-ex01.mchp-main.com (10.10.85.143) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2375.17; Thu, 31 Mar 2022 07:11:14 -0700 Received: from localhost.localdomain (10.10.115.15) by chn-vm-ex02.mchp-main.com (10.10.85.144) with Microsoft SMTP Server id 15.1.2375.17 via Frontend Transport; Thu, 31 Mar 2022 07:11:12 -0700 From: Claudiu Beznea To: , , CC: , , , Claudiu Beznea , Ajay Kathat Subject: [PATCH 2/2] ARM: dts: at91: fix pinctrl phandles Date: Thu, 31 Mar 2022 17:13:23 +0300 Message-ID: <20220331141323.194355-2-claudiu.beznea@microchip.com> X-Mailer: git-send-email 2.33.0 In-Reply-To: <20220331141323.194355-1-claudiu.beznea@microchip.com> References: <20220331141323.194355-1-claudiu.beznea@microchip.com> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20220331_071115_513622_0DD265B5 X-CRM114-Status: GOOD ( 12.00 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org 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: e8042102d11e ("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 Acked-by: Nicolas Ferre --- Hi, Nicolas, If all good with this patches please update the SHA1 on "Depends-on" tag. Thank you, Claudiu Beznea 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"; };