From patchwork Tue Apr 5 07:20:40 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg Kroah-Hartman X-Patchwork-Id: 557575 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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 247F7C433EF for ; Tue, 5 Apr 2022 09:28:31 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1347801AbiDEJ2Y (ORCPT ); Tue, 5 Apr 2022 05:28:24 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:53834 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S244901AbiDEIwq (ORCPT ); Tue, 5 Apr 2022 04:52:46 -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 23E6C24594; Tue, 5 Apr 2022 01:45:57 -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 B826B614EB; Tue, 5 Apr 2022 08:45:56 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id C3079C385A1; Tue, 5 Apr 2022 08:45:55 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1649148356; bh=J0WD4djqociSdD8QofJp0UbOEnwx+j5yOsva2RrHM3Q=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=xhyFssvBKuuKQKaLw3mTvxDxeJIvjtHrpM1BACKrf8rHzN0+oPmRTGg/shvhx0DTQ /9XOMzORfJWNkprP8/uqJ0i+iIB9Q/I0Ro0QDCbfnrfob/RLUFWGf+9EX7zmShV3E1 9hRmT88Co3o08uBTNMj1e4MIrSjDsFO5niWGAEG8= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Olivier Moysan , Alexandre Torgue , Sasha Levin Subject: [PATCH 5.16 0327/1017] ARM: dts: stm32: fix AV96 board SAI2 pin muxing on stm32mp15 Date: Tue, 5 Apr 2022 09:20:40 +0200 Message-Id: <20220405070403.987625567@linuxfoundation.org> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220405070354.155796697@linuxfoundation.org> References: <20220405070354.155796697@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Olivier Moysan [ Upstream commit ee2aacb6f3a901a95b1dd68964b69c92cdbbf213 ] Replace sai2a-2 node name by sai2a-sleep-2, to avoid name duplication. Fixes: 1a9a9d226f0f ("ARM: dts: stm32: fix AV96 board SAI2 pin muxing on stm32mp15") Signed-off-by: Olivier Moysan Signed-off-by: Alexandre Torgue Signed-off-by: Sasha Levin --- arch/arm/boot/dts/stm32mp15-pinctrl.dtsi | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/arm/boot/dts/stm32mp15-pinctrl.dtsi b/arch/arm/boot/dts/stm32mp15-pinctrl.dtsi index 2ebafe27a865..d3553e0f0187 100644 --- a/arch/arm/boot/dts/stm32mp15-pinctrl.dtsi +++ b/arch/arm/boot/dts/stm32mp15-pinctrl.dtsi @@ -1190,7 +1190,7 @@ }; }; - sai2a_sleep_pins_c: sai2a-2 { + sai2a_sleep_pins_c: sai2a-sleep-2 { pins { pinmux = , /* SAI2_SCK_A */ , /* SAI2_SD_A */