From patchwork Fri Feb 16 22:34:32 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sebastian Reichel X-Patchwork-Id: 202409 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:693c:2685:b0:108:e6aa:91d0 with SMTP id mn5csp30689dyc; Fri, 16 Feb 2024 14:42:24 -0800 (PST) X-Forwarded-Encrypted: i=3; AJvYcCUw5HNLkii58spch381+gC8SERcb2quk4AqIXbyDytF1GfY2yREIybzWPfuZc7EVuk1B/mTJeogR+6arKfDM59UggP4bQ== X-Google-Smtp-Source: AGHT+IGXDuWjuf20DtdYC3MSgDabp0sE0ENawXQRIDTHcj1wyZdEG1icImhiqHyhtElrPgD9uU69 X-Received: by 2002:aa7:c896:0:b0:564:21fd:2710 with SMTP id p22-20020aa7c896000000b0056421fd2710mr43290eds.37.1708123344815; Fri, 16 Feb 2024 14:42:24 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1708123344; cv=pass; d=google.com; s=arc-20160816; b=IvSYG62Y2s7Uypg0s1n22BCUv3ESXHl1Unn6t8+7ygRzlLGkWRi/ZoYci6zs+gQgra iDRBKP0NelLUa+DnvRuM442PBDIbPrC28Su9e96v9e3YuotP4BF9BsPu7h159gohkAv/ JDyoy8lIeyv4ccnuabOCnO6emYjkqtf9HYkiZfEa+ICJJwGpD4i9jX4zrD/vY9En0CTo hAkV30+M1IQmGdVFGESBjdlQCtPuyZpttESsFpQx74nbrgIzS3EewXL811HykoB8aWYx G1lqpvy+GY5erEgqDhB/9c2bj40gR7cKPzkZH1TIWlFoPOrY6Wn2ci7uKwvs3f7iQfwg zXMQ== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:list-unsubscribe :list-subscribe:list-id:precedence:references:in-reply-to:message-id :date:subject:cc:to:from:dkim-signature; bh=ArpsOzZE2u9x8V7ls8D1sRNWCeNFxOon6LT8ovxSMF4=; fh=VWDFbHpN9TQEY5WpugUlm4QkekLeBSg2vlBpp3dxvXQ=; b=Z80hTukEM/K/xLkvrUkUuDIHP1dZHmvC0xVmdMo95Wrc2dQVcjehJAWfSsOBHM+d72 Ph9pph6f9O1OZ5/Qd6QeCT9sjJiz4XA209S9ku5PziBdL7au+93rRmPnXMaZCDP2x29K FB+tY2d3I7B//0u0LeM0giqXH4Y6xKgXYUhNFz8zmYdh/MtILAblXu78oQL6wkLR64DC XwD6N98FQXM6LfgnIknfx440/NhBzVl3qzYq9uGvkuxeW5SeP0Q+3vV7lYDuvSNwwaFp +ZTXl+X+hk8+pqX0FuPZrTZJ+siYrxUWq6hkeX/ka8keWEmPWS1e9OrPVrJxe9lmiYTR Xlzg==; dara=google.com ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b="Wlk1/bAX"; arc=pass (i=1 dkim=pass dkdomain=kernel.org); spf=pass (google.com: domain of linux-kernel+bounces-69439-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:4601:e00::3 as permitted sender) smtp.mailfrom="linux-kernel+bounces-69439-ouuuleilei=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: from am.mirrors.kernel.org (am.mirrors.kernel.org. [2604:1380:4601:e00::3]) by mx.google.com with ESMTPS id e17-20020a056402089100b00562b64e6badsi326786edy.600.2024.02.16.14.42.24 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 16 Feb 2024 14:42:24 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel+bounces-69439-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:4601:e00::3 as permitted sender) client-ip=2604:1380:4601:e00::3; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b="Wlk1/bAX"; arc=pass (i=1 dkim=pass dkdomain=kernel.org); spf=pass (google.com: domain of linux-kernel+bounces-69439-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:4601:e00::3 as permitted sender) smtp.mailfrom="linux-kernel+bounces-69439-ouuuleilei=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: from smtp.subspace.kernel.org (wormhole.subspace.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by am.mirrors.kernel.org (Postfix) with ESMTPS id 42AA71F225A7 for ; Fri, 16 Feb 2024 22:42:24 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 1D4A915350C; Fri, 16 Feb 2024 22:37:09 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="Wlk1/bAX" Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id E5B8114AD33; Fri, 16 Feb 2024 22:37:02 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1708123023; cv=none; b=pxiSCR4xn4JfVrLmvhfBEbMut0daA4OksYCpM16Azyl+OT7ZLz/D+ZJZfMkSB6sMn3ssIVVB1DSWUbIUBm0uPpavodjzXSf+h8EC2BqUypFxLPEUKadGDQIqya7dc+XYQHm1D2raTrmF3OvnEMmfunmcJweM36QkZyX7bNty8VU= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1708123023; c=relaxed/simple; bh=SAdPuLjhilobCNPcWWFQ6UbKmsBElzGTcLLtPhYgvDc=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=RqT/hJhz00UbuEQW7X1ovVlHHQQ19Eu7+pEGTswKQzaXDn7VXNbY63wyoecDRSHXtuH3cZW43FE8/SKqGkL4KWRB4sEPeOBD1TwFCQSOe9TP6vZGDU91mm43YtaszluIx80b3xeyo+kB1sN9iKJ8t5pdpTcv7d7CZZRCus/BwEY= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=Wlk1/bAX; arc=none smtp.client-ip=10.30.226.201 Received: by smtp.kernel.org (Postfix) with ESMTPSA id 76808C43330; Fri, 16 Feb 2024 22:37:02 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1708123022; bh=SAdPuLjhilobCNPcWWFQ6UbKmsBElzGTcLLtPhYgvDc=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Wlk1/bAXpFbe/BP4FrctXle6GHcBWa8dalqwsVEZohWx4qXCfdHMm2cgVsdYzSbRr h6sDz6F3yrrL1QM2qqqQsdJwkCZWZg/BLQrb5t7vMq2xu3pp4+7EJDBqY2y9wBN0kE 9C2JNtlc10CPiTt70XBgiEcjMynVcVbsj1ObYB9rYrfjnmopPaN4T8+hS6zWsvpW9+ d/OnfYz6lQqvvH6hG4BOuE07EnP/DN7xGYlLJi90l4iDShKuURFPctLgBlZODLVumc QDvQtSDItAlsOFTG0GTO53ckh3uieu/jbKcSoiaahMmODbChf6UEG22puU7A6POHBD cjeL7na3NZqHA== Received: by mercury (Postfix, from userid 1000) id D22DE10633F2; Fri, 16 Feb 2024 23:36:56 +0100 (CET) From: Sebastian Reichel To: Sebastian Reichel , Rob Herring , Krzysztof Kozlowski , Conor Dooley , Shawn Guo , Sascha Hauer , Fabio Estevam , Pengutronix Kernel Team , NXP Linux Team Cc: Dong Aisheng , Linus Walleij , Dmitry Torokhov , Mark Brown , linux-arm-kernel@lists.infradead.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH v3 13/16] ARM: dts: nxp: imx: fix weim node name Date: Fri, 16 Feb 2024 23:34:32 +0100 Message-ID: <20240216223654.1312880-14-sre@kernel.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240216223654.1312880-1-sre@kernel.org> References: <20240216223654.1312880-1-sre@kernel.org> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1791097144038985712 X-GMAIL-MSGID: 1791097144038985712 DT node names should be generic, so replace "weim" node name with "memory-controller" in all i.MX SoC DT files. Signed-off-by: Sebastian Reichel Reviewed-by: Krzysztof Kozlowski --- arch/arm/boot/dts/nxp/imx/imx1.dtsi | 2 +- arch/arm/boot/dts/nxp/imx/imx27.dtsi | 2 +- arch/arm/boot/dts/nxp/imx/imx31.dtsi | 2 +- arch/arm/boot/dts/nxp/imx/imx35.dtsi | 2 +- arch/arm/boot/dts/nxp/imx/imx51.dtsi | 2 +- arch/arm/boot/dts/nxp/imx/imx6qdl.dtsi | 2 +- arch/arm/boot/dts/nxp/imx/imx6sl.dtsi | 2 +- arch/arm/boot/dts/nxp/imx/imx6sx.dtsi | 2 +- arch/arm/boot/dts/nxp/imx/imx6ul.dtsi | 2 +- 9 files changed, 9 insertions(+), 9 deletions(-) diff --git a/arch/arm/boot/dts/nxp/imx/imx1.dtsi b/arch/arm/boot/dts/nxp/imx/imx1.dtsi index 1ac10965fdfd..389ecb1ebf8f 100644 --- a/arch/arm/boot/dts/nxp/imx/imx1.dtsi +++ b/arch/arm/boot/dts/nxp/imx/imx1.dtsi @@ -251,7 +251,7 @@ gpio4: gpio@21c300 { }; }; - weim: weim@220000 { + weim: memory-controller@220000 { #address-cells = <2>; #size-cells = <1>; compatible = "fsl,imx1-weim"; diff --git a/arch/arm/boot/dts/nxp/imx/imx27.dtsi b/arch/arm/boot/dts/nxp/imx/imx27.dtsi index ec472695c71e..ec3ccc8f4095 100644 --- a/arch/arm/boot/dts/nxp/imx/imx27.dtsi +++ b/arch/arm/boot/dts/nxp/imx/imx27.dtsi @@ -568,7 +568,7 @@ nfc: nand-controller@d8000000 { status = "disabled"; }; - weim: weim@d8002000 { + weim: memory-controller@d8002000 { #address-cells = <2>; #size-cells = <1>; compatible = "fsl,imx27-weim"; diff --git a/arch/arm/boot/dts/nxp/imx/imx31.dtsi b/arch/arm/boot/dts/nxp/imx/imx31.dtsi index e1ae7c175f7d..00006c90d9a7 100644 --- a/arch/arm/boot/dts/nxp/imx/imx31.dtsi +++ b/arch/arm/boot/dts/nxp/imx/imx31.dtsi @@ -352,7 +352,7 @@ nfc: nand@b8000000 { status = "disabled"; }; - weim: weim@b8002000 { + weim: memory-controller@b8002000 { compatible = "fsl,imx31-weim", "fsl,imx27-weim"; reg = <0xb8002000 0x1000>; clocks = <&clks 56>; diff --git a/arch/arm/boot/dts/nxp/imx/imx35.dtsi b/arch/arm/boot/dts/nxp/imx/imx35.dtsi index 2d20e5541acc..442dc15677b8 100644 --- a/arch/arm/boot/dts/nxp/imx/imx35.dtsi +++ b/arch/arm/boot/dts/nxp/imx/imx35.dtsi @@ -374,7 +374,7 @@ nfc: nand@bb000000 { status = "disabled"; }; - weim: weim@b8002000 { + weim: memory-controller@b8002000 { #address-cells = <2>; #size-cells = <1>; clocks = <&clks 0>; diff --git a/arch/arm/boot/dts/nxp/imx/imx51.dtsi b/arch/arm/boot/dts/nxp/imx/imx51.dtsi index c96d6311dfa7..4efce49022e4 100644 --- a/arch/arm/boot/dts/nxp/imx/imx51.dtsi +++ b/arch/arm/boot/dts/nxp/imx/imx51.dtsi @@ -578,7 +578,7 @@ m4if: m4if@83fd8000 { reg = <0x83fd8000 0x1000>; }; - weim: weim@83fda000 { + weim: memory-controller@83fda000 { #address-cells = <2>; #size-cells = <1>; compatible = "fsl,imx51-weim"; diff --git a/arch/arm/boot/dts/nxp/imx/imx6qdl.dtsi b/arch/arm/boot/dts/nxp/imx/imx6qdl.dtsi index 81142c523fa8..8431b8a994f4 100644 --- a/arch/arm/boot/dts/nxp/imx/imx6qdl.dtsi +++ b/arch/arm/boot/dts/nxp/imx/imx6qdl.dtsi @@ -1158,7 +1158,7 @@ mmdc1: memory-controller@21b4000 { /* MMDC1 */ status = "disabled"; }; - weim: weim@21b8000 { + weim: memory-controller@21b8000 { #address-cells = <2>; #size-cells = <1>; compatible = "fsl,imx6q-weim"; diff --git a/arch/arm/boot/dts/nxp/imx/imx6sl.dtsi b/arch/arm/boot/dts/nxp/imx/imx6sl.dtsi index 28111efb19a6..6aa61235e39e 100644 --- a/arch/arm/boot/dts/nxp/imx/imx6sl.dtsi +++ b/arch/arm/boot/dts/nxp/imx/imx6sl.dtsi @@ -949,7 +949,7 @@ rngb: rngb@21b4000 { clocks = <&clks IMX6SL_CLK_DUMMY>; }; - weim: weim@21b8000 { + weim: memory-controller@21b8000 { #address-cells = <2>; #size-cells = <1>; reg = <0x021b8000 0x4000>; diff --git a/arch/arm/boot/dts/nxp/imx/imx6sx.dtsi b/arch/arm/boot/dts/nxp/imx/imx6sx.dtsi index df3a375f0a3e..0de359d62a47 100644 --- a/arch/arm/boot/dts/nxp/imx/imx6sx.dtsi +++ b/arch/arm/boot/dts/nxp/imx/imx6sx.dtsi @@ -1107,7 +1107,7 @@ fec2: ethernet@21b4000 { status = "disabled"; }; - weim: weim@21b8000 { + weim: memory-controller@21b8000 { #address-cells = <2>; #size-cells = <1>; compatible = "fsl,imx6sx-weim", "fsl,imx6q-weim"; diff --git a/arch/arm/boot/dts/nxp/imx/imx6ul.dtsi b/arch/arm/boot/dts/nxp/imx/imx6ul.dtsi index 8aa365f837ca..aeb7e07fd309 100644 --- a/arch/arm/boot/dts/nxp/imx/imx6ul.dtsi +++ b/arch/arm/boot/dts/nxp/imx/imx6ul.dtsi @@ -975,7 +975,7 @@ memory-controller@21b0000 { clocks = <&clks IMX6UL_CLK_MMDC_P0_IPG>; }; - weim: weim@21b8000 { + weim: memory-controller@21b8000 { #address-cells = <2>; #size-cells = <1>; compatible = "fsl,imx6ul-weim", "fsl,imx6q-weim";