From patchwork Wed May 10 10:38:15 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tony Lindgren X-Patchwork-Id: 680687 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 2D7F3C77B7D for ; Wed, 10 May 2023 10:38:31 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S236250AbjEJKi3 (ORCPT ); Wed, 10 May 2023 06:38:29 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:49972 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235904AbjEJKi1 (ORCPT ); Wed, 10 May 2023 06:38:27 -0400 Received: from muru.com (muru.com [72.249.23.125]) by lindbergh.monkeyblade.net (Postfix) with ESMTP id 7785535B3 for ; Wed, 10 May 2023 03:38:26 -0700 (PDT) Received: from hillo.muru.com (localhost [127.0.0.1]) by muru.com (Postfix) with ESMTP id CA2878109; Wed, 10 May 2023 10:38:23 +0000 (UTC) From: Tony Lindgren To: Arnd Bergmann , Olof Johansson , Rob Herring , Krzysztof Kozlowski , Conor Dooley , Ray Jui , Scott Branden , Broadcom internal kernel review list , Wei Xu , Dinh Nguyen Cc: linux-arm-kernel@lists.infradead.org, Niravkumar L Rabara , devicetree@vger.kernel.org Subject: [PATCH] arm64: dts: Change pinconf controller node name to pinctrl Date: Wed, 10 May 2023 13:38:15 +0300 Message-Id: <20230510103816.39015-1-tony@atomide.com> X-Mailer: git-send-email 2.40.1 MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: devicetree@vger.kernel.org According to the pinctrl binding pinmux and pinctrl are valid controller names. Let's replace pinconf with pinctrl so we don't get new warnings when pinctrl-singl yaml binding gets merged. Cc: Conor Dooley Cc: Dinh Nguyen Cc: Krzysztof Kozlowski Cc: Niravkumar L Rabara Cc: Ray Jui Cc: Rob Herring Cc: Scott Branden Cc: Wei Xu Signed-off-by: Tony Lindgren Acked-by: Florian Fainelli Acked-by: Dinh Nguyen --- arch/arm64/boot/dts/broadcom/stingray/stingray-pinctrl.dtsi | 2 +- arch/arm64/boot/dts/hisilicon/hi3798cv200.dtsi | 2 +- arch/arm64/boot/dts/intel/socfpga_agilex.dtsi | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/arch/arm64/boot/dts/broadcom/stingray/stingray-pinctrl.dtsi b/arch/arm64/boot/dts/broadcom/stingray/stingray-pinctrl.dtsi --- a/arch/arm64/boot/dts/broadcom/stingray/stingray-pinctrl.dtsi +++ b/arch/arm64/boot/dts/broadcom/stingray/stingray-pinctrl.dtsi @@ -32,7 +32,7 @@ #include - pinconf: pinconf@140000 { + pinconf: pinctrl@140000 { compatible = "pinconf-single"; reg = <0x00140000 0x250>; pinctrl-single,register-width = <32>; diff --git a/arch/arm64/boot/dts/hisilicon/hi3798cv200.dtsi b/arch/arm64/boot/dts/hisilicon/hi3798cv200.dtsi --- a/arch/arm64/boot/dts/hisilicon/hi3798cv200.dtsi +++ b/arch/arm64/boot/dts/hisilicon/hi3798cv200.dtsi @@ -172,7 +172,7 @@ combphy1: phy@858 { }; }; - pmx0: pinconf@8a21000 { + pmx0: pinctrl@8a21000 { compatible = "pinconf-single"; reg = <0x8a21000 0x180>; pinctrl-single,register-width = <32>; diff --git a/arch/arm64/boot/dts/intel/socfpga_agilex.dtsi b/arch/arm64/boot/dts/intel/socfpga_agilex.dtsi --- a/arch/arm64/boot/dts/intel/socfpga_agilex.dtsi +++ b/arch/arm64/boot/dts/intel/socfpga_agilex.dtsi @@ -365,7 +365,7 @@ pinctrl0: pinctrl@ffd13000 { pinctrl-single,function-mask = <0x0000000f>; }; - pinctrl1: pinconf@ffd13100 { + pinctrl1: pinctrl@ffd13100 { compatible = "pinctrl-single"; #pinctrl-cells = <1>; reg = <0xffd13100 0x20>;