From patchwork Tue Mar 22 02:28:17 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Leo Li X-Patchwork-Id: 12788033 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 9138FC433EF for ; Tue, 22 Mar 2022 02:31:02 +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=myJ7rSq/pH4R+XmEO2hlLkzi65lqEI/cQkyMUrX1Jh0=; b=YYhTBNA+mf4Omh tXp0KXTgnYlQT9rtLJH/q7BuXpSm1FHZHtelfMwO/1PJXzbzGs54Je7fdOxeFl3IOYSUci8qlo4Xz S4ByqMi2KqETAqGiK98/wmM9yRGanCeOLcFaWKMk5Gxp8TinKkxyR0OQgOjsdKh+118ufzQuAJulQ RvomGInjr2cXh9OlDmu8X9VonPNUNfbOYbUtg4IQgv7F+OgoU0Nnu86fW048tbeOtKWSIf5KSmn21 lGx/tHERXbLC1ZfHhGs5jxkFOxcDtei1nkaVHyK1Q99tF/7cEy3VvWWkb2z+TSriMenvDb6w5i9hF t3riGjqmvymURrHAdm3w==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1nWUGx-009iD4-K0; Tue, 22 Mar 2022 02:29:23 +0000 Received: from inva020.nxp.com ([92.121.34.13]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1nWUGS-009i1c-Tk for linux-arm-kernel@lists.infradead.org; Tue, 22 Mar 2022 02:28:55 +0000 Received: from inva020.nxp.com (localhost [127.0.0.1]) by inva020.eu-rdc02.nxp.com (Postfix) with ESMTP id AB5E51A1295; Tue, 22 Mar 2022 03:28:51 +0100 (CET) Received: from smtp.na-rdc02.nxp.com (usphx01srsp001v.us-phx01.nxp.com [134.27.49.11]) by inva020.eu-rdc02.nxp.com (Postfix) with ESMTP id 6D7B31A01EF; Tue, 22 Mar 2022 03:28:51 +0100 (CET) Received: from right.am.freescale.net (right.am.freescale.net [10.81.116.145]) by usphx01srsp001v.us-phx01.nxp.com (Postfix) with ESMTP id 37DB64028F; Mon, 21 Mar 2022 19:28:50 -0700 (MST) From: Li Yang To: Shawn Guo , Li Yang , Rob Herring Cc: linux-arm-kernel@lists.infradead.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH 5/6] arm64: dts: freescale: update ifc node name to be memory-controller Date: Mon, 21 Mar 2022 21:28:17 -0500 Message-Id: <20220322022818.9860-5-leoyang.li@nxp.com> X-Mailer: git-send-email 2.25.1.377.g2d2118b In-Reply-To: <20220322022818.9860-1-leoyang.li@nxp.com> References: <20220322022818.9860-1-leoyang.li@nxp.com> MIME-Version: 1.0 X-Virus-Scanned: ClamAV using ClamSMTP X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20220321_192853_135613_B0345A14 X-CRM114-Status: GOOD ( 11.78 ) 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 Update the node name to be align with updated DT binding. But be noted that u-boot for ls1088a used the ifc node name to disable ifc-nor node when the SoC is configured to use QSPI. The u-boot has been updated to use the latest name but the change could break compatibility with older u-boot for ls1088a. Signed-off-by: Li Yang --- arch/arm64/boot/dts/freescale/fsl-ls1043a.dtsi | 2 +- arch/arm64/boot/dts/freescale/fsl-ls1046a.dtsi | 2 +- arch/arm64/boot/dts/freescale/fsl-ls1088a.dtsi | 2 +- arch/arm64/boot/dts/freescale/fsl-ls208xa.dtsi | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/arch/arm64/boot/dts/freescale/fsl-ls1043a.dtsi b/arch/arm64/boot/dts/freescale/fsl-ls1043a.dtsi index 996d45bc6d91..7cd1260b0690 100644 --- a/arch/arm64/boot/dts/freescale/fsl-ls1043a.dtsi +++ b/arch/arm64/boot/dts/freescale/fsl-ls1043a.dtsi @@ -389,7 +389,7 @@ dcfg: dcfg@1ee0000 { big-endian; }; - ifc: ifc@1530000 { + ifc: memory-controller@1530000 { compatible = "fsl,ifc"; reg = <0x0 0x1530000 0x0 0x10000>; interrupts = <0 43 0x4>; diff --git a/arch/arm64/boot/dts/freescale/fsl-ls1046a.dtsi b/arch/arm64/boot/dts/freescale/fsl-ls1046a.dtsi index cdfb0513e081..df7104477e3e 100644 --- a/arch/arm64/boot/dts/freescale/fsl-ls1046a.dtsi +++ b/arch/arm64/boot/dts/freescale/fsl-ls1046a.dtsi @@ -280,7 +280,7 @@ ddr: memory-controller@1080000 { big-endian; }; - ifc: ifc@1530000 { + ifc: memory-controller@1530000 { compatible = "fsl,ifc"; reg = <0x0 0x1530000 0x0 0x10000>; interrupts = ; diff --git a/arch/arm64/boot/dts/freescale/fsl-ls1088a.dtsi b/arch/arm64/boot/dts/freescale/fsl-ls1088a.dtsi index c8f76898384b..de57c2c2cf3b 100644 --- a/arch/arm64/boot/dts/freescale/fsl-ls1088a.dtsi +++ b/arch/arm64/boot/dts/freescale/fsl-ls1088a.dtsi @@ -396,7 +396,7 @@ gpio3: gpio@2330000 { #interrupt-cells = <2>; }; - ifc: ifc@2240000 { + ifc: memory-controller@2240000 { compatible = "fsl,ifc"; reg = <0x0 0x2240000 0x0 0x20000>; interrupts = <0 21 IRQ_TYPE_LEVEL_HIGH>; diff --git a/arch/arm64/boot/dts/freescale/fsl-ls208xa.dtsi b/arch/arm64/boot/dts/freescale/fsl-ls208xa.dtsi index ed872273c3af..fe9b6191ff1b 100644 --- a/arch/arm64/boot/dts/freescale/fsl-ls208xa.dtsi +++ b/arch/arm64/boot/dts/freescale/fsl-ls208xa.dtsi @@ -1036,7 +1036,7 @@ i2c3: i2c@2030000 { QORIQ_CLK_PLL_DIV(4)>; }; - ifc: ifc@2240000 { + ifc: memory-controller@2240000 { compatible = "fsl,ifc"; reg = <0x0 0x2240000 0x0 0x20000>; interrupts = <0 21 0x4>; /* Level high type */