From patchwork Sat Feb 24 21:29:45 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sebastian Reichel X-Patchwork-Id: 205947 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:7300:a81b:b0:108:e6aa:91d0 with SMTP id bq27csp1328204dyb; Sat, 24 Feb 2024 13:36:23 -0800 (PST) X-Forwarded-Encrypted: i=3; AJvYcCUqwAa5ih0DMWWtdrsTUcab5jEAyfT+sElO5VlcMNadSedAlhz8Z1TvzPgPta9nOQHtc+HLA3O1T3VlzKf6K3qRjfNyPw== X-Google-Smtp-Source: AGHT+IHfe+l6CObzLU7wvY0Q6GRwaj0BVktWz+zYA8mNX3cKcUjHb9gj99UvNQs3a4AOYvzPcrYJ X-Received: by 2002:a17:907:1de0:b0:a3e:5ebf:345c with SMTP id og32-20020a1709071de000b00a3e5ebf345cmr2739206ejc.21.1708810582991; Sat, 24 Feb 2024 13:36:22 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1708810582; cv=pass; d=google.com; s=arc-20160816; b=lclGukb006E7xYmHTn4z17+5OUQHxhEy5eyV65wZkrKnDQNy92i6DLfWRMn+zw9N1n iHYGzT63BnF888PDqMT7mBVtpGnARpy43ftUYB7rdMHTa+1Jc/QE1pZwr6TknuKUl9+X A/LCniGoAy/aEj5whtnuGUHBEBYWxIZWzk+MgdiGQFrl3B8uyulg2FcqhZ7nFVuQ6VVL 4ziyPG5IcMiTz5wJQZtrP7BnsD1RIerjj21iywRjISfsPc2FJlLde9y5yu0uR2whrtS5 MZc/f/qVfoDkFCCiaqZ4b3e2QIuBKxWI/ZocJiP8Ev+9H0R2KftKFAor9UO+WeOO04Gr Nxyg== 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=VkNTa28tE7ITSptg/Qqnf5FvMFy/qqmCLjNfCy7WKok=; fh=uxsBptzdNzBOcKMKcLueW03u+6OheYo4M2JeOxWag2I=; b=RkvbnP5IdOQidjAQ+FmUrRMbOS54XK7fwKbSXNzgLWUvThXtTywfg47YJG3Is+8f5L srrJSWEUx/GXLjteMLSZRvebMmma8pLaC8EG8/FKdv0o9skjVYgSdtBOGq0PJplrgvPm +Rpm0A7PDLOR9NKlyxVv1jg/C5o5eGK4flxYYMfuVRKiGuNY8plKknJKiczRmvnwgRyO TP1SOGhuvYWBPGizGi5MUWSX/f2lZD8Iu9LxZCD9DsjQwTltinXqCPK3giNSh7n7SMwz 2+gV0YP8GLGC4xQlt7XCjQ819vRUaElA93HrrEWCOZCuW+r/+ESz/SVxKSr4YBGlbBTY MiTg==; dara=google.com ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b="W/tFzk+F"; arc=pass (i=1 dkim=pass dkdomain=kernel.org); spf=pass (google.com: domain of linux-kernel+bounces-79871-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:4601:e00::3 as permitted sender) smtp.mailfrom="linux-kernel+bounces-79871-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 f12-20020a170906560c00b00a3f2b83c813si750609ejq.628.2024.02.24.13.36.22 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 24 Feb 2024 13:36:22 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel+bounces-79871-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="W/tFzk+F"; arc=pass (i=1 dkim=pass dkdomain=kernel.org); spf=pass (google.com: domain of linux-kernel+bounces-79871-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:4601:e00::3 as permitted sender) smtp.mailfrom="linux-kernel+bounces-79871-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 770651F2223B for ; Sat, 24 Feb 2024 21:36:22 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id E44BB54FBA; Sat, 24 Feb 2024 21:33:20 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="W/tFzk+F" 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 490284F61D; Sat, 24 Feb 2024 21:33:16 +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=1708810396; cv=none; b=LRf9y9ofVgHG7btx0wqLkRpaQcUkPsluVK97I6eoIo/nHOFQM3O8TqOhsHzFj7MHwR9gVf4UZXVJ7t+geJ5n0N3rWfQTslSsCXxvlxty8ozFCbHrH73eT6EMtDNjWBYBY07P4OfIPGW6UepbH8+6Kq6AxzoT7l+tFZcmE9zQN0I= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1708810396; c=relaxed/simple; bh=L9B9Wlbx9dWT/gnx1LSt+W/JhAQ8gYcV4FnLbg2y+wo=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=D+bnK1JphCaW+9dChP9C68XCTV71aE60maepe/gG5QBt4QGeDxbTaJMJCIiTCW7WCEVT7Q8a/1ngsAWPW+/UWkuZH9d8N9YXmwglHkutFryGCbLg/9MC3vN0dbAxJ7CSCq2/KVKtOFcAJ0n4aLhlzSuqqF5+rx9b7/iiJvVYtB0= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=W/tFzk+F; arc=none smtp.client-ip=10.30.226.201 Received: by smtp.kernel.org (Postfix) with ESMTPSA id 97546C43601; Sat, 24 Feb 2024 21:33:15 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1708810395; bh=L9B9Wlbx9dWT/gnx1LSt+W/JhAQ8gYcV4FnLbg2y+wo=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=W/tFzk+FX99anNf1BhDEl554BaxFGW4vheKl1zxQ92nWGe/dmVdVnpu4q4Dujpcpf QSIUFzmK7J2HM/a52Mj7SK022ostSt2RstvwjuNHUKGdKIoet4vHmooCl9J9wHT1Aq J7QE4+4L79L1U5BViQfHVVmAoyZCnV/gru/NFHaMAQOhVX7MoryFBLYmBX77S8F3xs +AFDPxRwyxVLGvNug/8eJ26KhTcDPBRmlWJ30YGKJSCMxoT0yt77EYMvT4S1jFcD47 2DCBXSWWzIS97I/4v98Ed6TVWkv8dfIJkOCfimDkcRdUt/KZj8mVgehQ1nVhERumVp Z7jaavjHMgT+w== Received: by mercury (Postfix, from userid 1000) id 39964106113D; Sat, 24 Feb 2024 22:33:10 +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, Krzysztof Kozlowski Subject: [PATCH v4 13/16] ARM: dts: nxp: imx: fix weim node name Date: Sat, 24 Feb 2024 22:29:45 +0100 Message-ID: <20240224213240.1854709-14-sre@kernel.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240224213240.1854709-1-sre@kernel.org> References: <20240224213240.1854709-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: 1791817765523466690 X-GMAIL-MSGID: 1791817765523466690 DT node names should be generic, so replace "weim" node name with "memory-controller" in all i.MX SoC DT files. Reviewed-by: Krzysztof Kozlowski Signed-off-by: Sebastian Reichel --- 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";