From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-19.7 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id B1D84C12002 for ; Wed, 14 Jul 2021 19:44:25 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 9803F613B5 for ; Wed, 14 Jul 2021 19:44:25 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S238195AbhGNTrQ (ORCPT ); Wed, 14 Jul 2021 15:47:16 -0400 Received: from mail.kernel.org ([198.145.29.99]:38672 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S236630AbhGNToK (ORCPT ); Wed, 14 Jul 2021 15:44:10 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id 99C3C613EB; Wed, 14 Jul 2021 19:41:00 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1626291661; bh=dumczC+bSItUFokwnf1JtchFKI5EZs3VRWdzdaiVhvA=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=nEN7WZc/VsjbuhjfsTTSGPOCy6HX8TKq49yWMUfZ/GiAToHjltAa9s8O2iRKhhcKc lgkVWnEl9+KQcnuyz6yqOQENsbgYFao/Fg7GdITbBuUoMR23UiKLCjnDIOPDLcc7l6 vrknMBLKQy2XmggwsqqDJeIU7a937kX1RyWzNZF9/p5L4+PU3LkCiPyZ468v312jcd 0dttjlgL6bP2JGD4A3yiyUNOfbj7FkXsl3zNkjvehETsPnF5m6fA+tLKs7JjMhLk0d hWPpv6N+6tLNZ/VqlbrGxsA18B+TueWpWg7JRK1GxeXSvXCdKP3stL2t5cdpj0nCu0 XTCM8tUPMCSMQ== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: =?UTF-8?q?Rafa=C5=82=20Mi=C5=82ecki?= , Florian Fainelli , Sasha Levin , linux-arm-kernel@lists.infradead.org, devicetree@vger.kernel.org Subject: [PATCH AUTOSEL 5.12 017/102] ARM: brcmstb: dts: fix NAND nodes names Date: Wed, 14 Jul 2021 15:39:10 -0400 Message-Id: <20210714194036.53141-17-sashal@kernel.org> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20210714194036.53141-1-sashal@kernel.org> References: <20210714194036.53141-1-sashal@kernel.org> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Rafał Miłecki [ Upstream commit 9a800ce1aada6e0f56b78e4713f4858c8990c1f7 ] This matches nand-controller.yaml requirements. Signed-off-by: Rafał Miłecki Signed-off-by: Florian Fainelli Signed-off-by: Sasha Levin --- arch/arm/boot/dts/bcm7445-bcm97445svmb.dts | 4 ++-- arch/arm/boot/dts/bcm7445.dtsi | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/arch/arm/boot/dts/bcm7445-bcm97445svmb.dts b/arch/arm/boot/dts/bcm7445-bcm97445svmb.dts index 8313b7cad542..f92d2cf85972 100644 --- a/arch/arm/boot/dts/bcm7445-bcm97445svmb.dts +++ b/arch/arm/boot/dts/bcm7445-bcm97445svmb.dts @@ -14,10 +14,10 @@ memory@0 { }; }; -&nand { +&nand_controller { status = "okay"; - nandcs@1 { + nand@1 { compatible = "brcm,nandcs"; reg = <1>; nand-ecc-step-size = <512>; diff --git a/arch/arm/boot/dts/bcm7445.dtsi b/arch/arm/boot/dts/bcm7445.dtsi index 58f67c9b830b..5ac2042515b8 100644 --- a/arch/arm/boot/dts/bcm7445.dtsi +++ b/arch/arm/boot/dts/bcm7445.dtsi @@ -148,7 +148,7 @@ aon-ctrl@410000 { reg-names = "aon-ctrl", "aon-sram"; }; - nand: nand@3e2800 { + nand_controller: nand-controller@3e2800 { status = "disabled"; #address-cells = <1>; #size-cells = <0>; -- 2.30.2 From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-17.7 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,INCLUDES_CR_TRAILER,INCLUDES_PATCH,MAILING_LIST_MULTI, SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 7236EC12002 for ; Wed, 14 Jul 2021 20:50:21 +0000 (UTC) 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 mail.kernel.org (Postfix) with ESMTPS id 444FB613D0 for ; Wed, 14 Jul 2021 20:50:21 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 444FB613D0 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=kernel.org Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org 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=ZwjmQj2HviHH2QNfqSR0sA9UHmHffESkuutzMin4/ao=; b=ba5pZH4KVxCEYz whmv8F0KllkbeLeHuKuwxSMyB3A+YBzsrYKlbuf9CshuUGcVJGtRofDGSzYjZn8661HLA1lCKB4Nm p1FX/H2xBK5Y6hsaW4eo2lfMjh71U/JVdUSglPVBg1gx6QhodYGEqU1GrX9JUO/9u5/6Vz7VFgkBY P4uzu8Q6W5i6RJp/q/M6ArSyj8EqeALXfRvmts0l1Ys033H0PTU6VRA6/IABp0N1Uj7+zaYRrOO/E p9nhQd2hN6Ib2HAufudfmTGPokTAmA1z61VtV6qZRTAw3NBMuDGZIAJsaQG5nA/x+y9VzaEhwNbFk nYKuLF+aUszNn4t3DhPw==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1m3lnd-00F8zP-5R; Wed, 14 Jul 2021 20:48:09 +0000 Received: from mail.kernel.org ([198.145.29.99]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1m3kkg-00EdKG-0V for linux-arm-kernel@lists.infradead.org; Wed, 14 Jul 2021 19:41:03 +0000 Received: by mail.kernel.org (Postfix) with ESMTPSA id 99C3C613EB; Wed, 14 Jul 2021 19:41:00 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1626291661; bh=dumczC+bSItUFokwnf1JtchFKI5EZs3VRWdzdaiVhvA=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=nEN7WZc/VsjbuhjfsTTSGPOCy6HX8TKq49yWMUfZ/GiAToHjltAa9s8O2iRKhhcKc lgkVWnEl9+KQcnuyz6yqOQENsbgYFao/Fg7GdITbBuUoMR23UiKLCjnDIOPDLcc7l6 vrknMBLKQy2XmggwsqqDJeIU7a937kX1RyWzNZF9/p5L4+PU3LkCiPyZ468v312jcd 0dttjlgL6bP2JGD4A3yiyUNOfbj7FkXsl3zNkjvehETsPnF5m6fA+tLKs7JjMhLk0d hWPpv6N+6tLNZ/VqlbrGxsA18B+TueWpWg7JRK1GxeXSvXCdKP3stL2t5cdpj0nCu0 XTCM8tUPMCSMQ== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: =?UTF-8?q?Rafa=C5=82=20Mi=C5=82ecki?= , Florian Fainelli , Sasha Levin , linux-arm-kernel@lists.infradead.org, devicetree@vger.kernel.org Subject: [PATCH AUTOSEL 5.12 017/102] ARM: brcmstb: dts: fix NAND nodes names Date: Wed, 14 Jul 2021 15:39:10 -0400 Message-Id: <20210714194036.53141-17-sashal@kernel.org> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20210714194036.53141-1-sashal@kernel.org> References: <20210714194036.53141-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20210714_124102_123636_9BC1E289 X-CRM114-Status: GOOD ( 10.13 ) 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: , Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org RnJvbTogUmFmYcWCIE1pxYJlY2tpIDxyYWZhbEBtaWxlY2tpLnBsPgoKWyBVcHN0cmVhbSBjb21t aXQgOWE4MDBjZTFhYWRhNmUwZjU2Yjc4ZTQ3MTNmNDg1OGM4OTkwYzFmNyBdCgpUaGlzIG1hdGNo ZXMgbmFuZC1jb250cm9sbGVyLnlhbWwgcmVxdWlyZW1lbnRzLgoKU2lnbmVkLW9mZi1ieTogUmFm YcWCIE1pxYJlY2tpIDxyYWZhbEBtaWxlY2tpLnBsPgpTaWduZWQtb2ZmLWJ5OiBGbG9yaWFuIEZh aW5lbGxpIDxmLmZhaW5lbGxpQGdtYWlsLmNvbT4KU2lnbmVkLW9mZi1ieTogU2FzaGEgTGV2aW4g PHNhc2hhbEBrZXJuZWwub3JnPgotLS0KIGFyY2gvYXJtL2Jvb3QvZHRzL2JjbTc0NDUtYmNtOTc0 NDVzdm1iLmR0cyB8IDQgKystLQogYXJjaC9hcm0vYm9vdC9kdHMvYmNtNzQ0NS5kdHNpICAgICAg ICAgICAgIHwgMiArLQogMiBmaWxlcyBjaGFuZ2VkLCAzIGluc2VydGlvbnMoKyksIDMgZGVsZXRp b25zKC0pCgpkaWZmIC0tZ2l0IGEvYXJjaC9hcm0vYm9vdC9kdHMvYmNtNzQ0NS1iY205NzQ0NXN2 bWIuZHRzIGIvYXJjaC9hcm0vYm9vdC9kdHMvYmNtNzQ0NS1iY205NzQ0NXN2bWIuZHRzCmluZGV4 IDgzMTNiN2NhZDU0Mi4uZjkyZDJjZjg1OTcyIDEwMDY0NAotLS0gYS9hcmNoL2FybS9ib290L2R0 cy9iY203NDQ1LWJjbTk3NDQ1c3ZtYi5kdHMKKysrIGIvYXJjaC9hcm0vYm9vdC9kdHMvYmNtNzQ0 NS1iY205NzQ0NXN2bWIuZHRzCkBAIC0xNCwxMCArMTQsMTAgQEAgbWVtb3J5QDAgewogCX07CiB9 OwogCi0mbmFuZCB7CismbmFuZF9jb250cm9sbGVyIHsKIAlzdGF0dXMgPSAib2theSI7CiAKLQlu YW5kY3NAMSB7CisJbmFuZEAxIHsKIAkJY29tcGF0aWJsZSA9ICJicmNtLG5hbmRjcyI7CiAJCXJl ZyA9IDwxPjsKIAkJbmFuZC1lY2Mtc3RlcC1zaXplID0gPDUxMj47CmRpZmYgLS1naXQgYS9hcmNo L2FybS9ib290L2R0cy9iY203NDQ1LmR0c2kgYi9hcmNoL2FybS9ib290L2R0cy9iY203NDQ1LmR0 c2kKaW5kZXggNThmNjdjOWI4MzBiLi41YWMyMDQyNTE1YjggMTAwNjQ0Ci0tLSBhL2FyY2gvYXJt L2Jvb3QvZHRzL2JjbTc0NDUuZHRzaQorKysgYi9hcmNoL2FybS9ib290L2R0cy9iY203NDQ1LmR0 c2kKQEAgLTE0OCw3ICsxNDgsNyBAQCBhb24tY3RybEA0MTAwMDAgewogCQkJcmVnLW5hbWVzID0g ImFvbi1jdHJsIiwgImFvbi1zcmFtIjsKIAkJfTsKIAotCQluYW5kOiBuYW5kQDNlMjgwMCB7CisJ CW5hbmRfY29udHJvbGxlcjogbmFuZC1jb250cm9sbGVyQDNlMjgwMCB7CiAJCQlzdGF0dXMgPSAi ZGlzYWJsZWQiOwogCQkJI2FkZHJlc3MtY2VsbHMgPSA8MT47CiAJCQkjc2l6ZS1jZWxscyA9IDww PjsKLS0gCjIuMzAuMgoKCl9fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fCmxpbnV4LWFybS1rZXJuZWwgbWFpbGluZyBsaXN0CmxpbnV4LWFybS1rZXJuZWxAbGlz dHMuaW5mcmFkZWFkLm9yZwpodHRwOi8vbGlzdHMuaW5mcmFkZWFkLm9yZy9tYWlsbWFuL2xpc3Rp bmZvL2xpbnV4LWFybS1rZXJuZWwK