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 AEF9DC12002 for ; Wed, 14 Jul 2021 19:44:58 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 9BBF26142D for ; Wed, 14 Jul 2021 19:44:58 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234258AbhGNTrq (ORCPT ); Wed, 14 Jul 2021 15:47:46 -0400 Received: from mail.kernel.org ([198.145.29.99]:38712 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S236645AbhGNToK (ORCPT ); Wed, 14 Jul 2021 15:44:10 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id 0BC42613DC; Wed, 14 Jul 2021 19:41:01 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1626291662; bh=MnkZqjfaEZebjtwblUsWzU5f/OOwRtIiyMkh/TTg7Zs=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=RtN41EkxOVaBgjvQM5xKQAs8pkUps6ktwkbJqb2Jg75nVcZ2GC5FSUm+2ngW0ttnA SCzQV6O6u/lwAyklWCP5DohBRJ75p1ZRmQo8I+asWV2FJdLFugPXeECfktvxJ8ILkP e6ixXic/ZcdGCwpnMjCmvSgQIqj8Bx3mURg2affVoYzuH+Kuhp/G3pXSXwMKmxsWVz A2/6dw/2SD9TVU8FOgvY4wCEYgHaekinuDaOckifnXzOD5ypA+ehMGSxlFQB6BIE61 wBhu50MsgwKkOo7o6mhmK9WQnLFZ+tarmBy2FjlvyVcA7kIo+tOjRXEGyv/COGmjbD 7F1PVg2qh1nEA== 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 , devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org Subject: [PATCH AUTOSEL 5.12 018/102] ARM: Cygnus: dts: fix NAND nodes names Date: Wed, 14 Jul 2021 15:39:11 -0400 Message-Id: <20210714194036.53141-18-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 e256b48a3b07ee1ae4bfa60abbf509ba8e386862 ] 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/bcm-cygnus.dtsi | 2 +- arch/arm/boot/dts/bcm911360_entphn.dts | 4 ++-- arch/arm/boot/dts/bcm958300k.dts | 4 ++-- arch/arm/boot/dts/bcm958305k.dts | 4 ++-- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/arch/arm/boot/dts/bcm-cygnus.dtsi b/arch/arm/boot/dts/bcm-cygnus.dtsi index 0025c88f660c..8ecb7861ce10 100644 --- a/arch/arm/boot/dts/bcm-cygnus.dtsi +++ b/arch/arm/boot/dts/bcm-cygnus.dtsi @@ -460,7 +460,7 @@ sdhci1: sdhci@18043000 { status = "disabled"; }; - nand: nand@18046000 { + nand_controller: nand-controller@18046000 { compatible = "brcm,nand-iproc", "brcm,brcmnand-v6.1"; reg = <0x18046000 0x600>, <0xf8105408 0x600>, <0x18046f00 0x20>; diff --git a/arch/arm/boot/dts/bcm911360_entphn.dts b/arch/arm/boot/dts/bcm911360_entphn.dts index b2d323f4a5ab..a76c74b44bba 100644 --- a/arch/arm/boot/dts/bcm911360_entphn.dts +++ b/arch/arm/boot/dts/bcm911360_entphn.dts @@ -82,8 +82,8 @@ &uart3 { status = "okay"; }; -&nand { - nandcs@1 { +&nand_controller { + nand@1 { compatible = "brcm,nandcs"; reg = <0>; nand-on-flash-bbt; diff --git a/arch/arm/boot/dts/bcm958300k.dts b/arch/arm/boot/dts/bcm958300k.dts index b4a1392bd5a6..dda3e11b711f 100644 --- a/arch/arm/boot/dts/bcm958300k.dts +++ b/arch/arm/boot/dts/bcm958300k.dts @@ -60,8 +60,8 @@ &uart3 { status = "okay"; }; -&nand { - nandcs@1 { +&nand_controller { + nand@1 { compatible = "brcm,nandcs"; reg = <0>; nand-on-flash-bbt; diff --git a/arch/arm/boot/dts/bcm958305k.dts b/arch/arm/boot/dts/bcm958305k.dts index 3378683321d3..ea3c6b88b313 100644 --- a/arch/arm/boot/dts/bcm958305k.dts +++ b/arch/arm/boot/dts/bcm958305k.dts @@ -68,8 +68,8 @@ &uart3 { status = "okay"; }; -&nand { - nandcs@1 { +&nand_controller { + nand@1 { compatible = "brcm,nandcs"; reg = <0>; nand-on-flash-bbt; -- 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 E1CDEC12002 for ; Wed, 14 Jul 2021 20:51:02 +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 B3606613CA for ; Wed, 14 Jul 2021 20:51:02 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org B3606613CA 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=EXOac3EwThfCGtlJrKhu1fRdxOKonrLrMD38KFwFONo=; b=py91PFixH3QWO5 SLAdKZQgunInsNXnkd61DjT6yWs4qdJ+9Qz1e40NuhrrxbDjDdWl+p6cVMHclrYmMXiyceUPyP/R9 s0ufRDXJL56WsbngxH0PscKMnUNW0b0KGWmXaYg/ZuYRLr/KtFJW4iQqxDkrWYZJRXAJIH0EyV6YH E18bzolt6rJGDDbYAqvoFtek5jxA/LAlqHkJ2X+F1nqG6xfL516hodMqtpwu/Lu2/+jYkewP1RTqC uL/nHrgSi9+9UG8UYIKUu4g94Tvg6BxW7JYEEMNQzySJ+VenrokG9jyQ9Fw3BV/832TKpyCO7EDVj S/6/vjIWeI8tMq6KePWA==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1m3loO-00F9ID-Am; Wed, 14 Jul 2021 20:48:57 +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 1m3kkh-00EdLF-BT for linux-arm-kernel@lists.infradead.org; Wed, 14 Jul 2021 19:41:05 +0000 Received: by mail.kernel.org (Postfix) with ESMTPSA id 0BC42613DC; Wed, 14 Jul 2021 19:41:01 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1626291662; bh=MnkZqjfaEZebjtwblUsWzU5f/OOwRtIiyMkh/TTg7Zs=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=RtN41EkxOVaBgjvQM5xKQAs8pkUps6ktwkbJqb2Jg75nVcZ2GC5FSUm+2ngW0ttnA SCzQV6O6u/lwAyklWCP5DohBRJ75p1ZRmQo8I+asWV2FJdLFugPXeECfktvxJ8ILkP e6ixXic/ZcdGCwpnMjCmvSgQIqj8Bx3mURg2affVoYzuH+Kuhp/G3pXSXwMKmxsWVz A2/6dw/2SD9TVU8FOgvY4wCEYgHaekinuDaOckifnXzOD5ypA+ehMGSxlFQB6BIE61 wBhu50MsgwKkOo7o6mhmK9WQnLFZ+tarmBy2FjlvyVcA7kIo+tOjRXEGyv/COGmjbD 7F1PVg2qh1nEA== 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 , devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org Subject: [PATCH AUTOSEL 5.12 018/102] ARM: Cygnus: dts: fix NAND nodes names Date: Wed, 14 Jul 2021 15:39:11 -0400 Message-Id: <20210714194036.53141-18-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_124103_499218_759B1A4C X-CRM114-Status: UNSURE ( 9.74 ) X-CRM114-Notice: Please train this message. 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 aXQgZTI1NmI0OGEzYjA3ZWUxYWU0YmZhNjBhYmJmNTA5YmE4ZTM4Njg2MiBdCgpUaGlzIG1hdGNo ZXMgbmFuZC1jb250cm9sbGVyLnlhbWwgcmVxdWlyZW1lbnRzLgoKU2lnbmVkLW9mZi1ieTogUmFm YcWCIE1pxYJlY2tpIDxyYWZhbEBtaWxlY2tpLnBsPgpTaWduZWQtb2ZmLWJ5OiBGbG9yaWFuIEZh aW5lbGxpIDxmLmZhaW5lbGxpQGdtYWlsLmNvbT4KU2lnbmVkLW9mZi1ieTogU2FzaGEgTGV2aW4g PHNhc2hhbEBrZXJuZWwub3JnPgotLS0KIGFyY2gvYXJtL2Jvb3QvZHRzL2JjbS1jeWdudXMuZHRz aSAgICAgIHwgMiArLQogYXJjaC9hcm0vYm9vdC9kdHMvYmNtOTExMzYwX2VudHBobi5kdHMgfCA0 ICsrLS0KIGFyY2gvYXJtL2Jvb3QvZHRzL2JjbTk1ODMwMGsuZHRzICAgICAgIHwgNCArKy0tCiBh cmNoL2FybS9ib290L2R0cy9iY205NTgzMDVrLmR0cyAgICAgICB8IDQgKystLQogNCBmaWxlcyBj aGFuZ2VkLCA3IGluc2VydGlvbnMoKyksIDcgZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvYXJj aC9hcm0vYm9vdC9kdHMvYmNtLWN5Z251cy5kdHNpIGIvYXJjaC9hcm0vYm9vdC9kdHMvYmNtLWN5 Z251cy5kdHNpCmluZGV4IDAwMjVjODhmNjYwYy4uOGVjYjc4NjFjZTEwIDEwMDY0NAotLS0gYS9h cmNoL2FybS9ib290L2R0cy9iY20tY3lnbnVzLmR0c2kKKysrIGIvYXJjaC9hcm0vYm9vdC9kdHMv YmNtLWN5Z251cy5kdHNpCkBAIC00NjAsNyArNDYwLDcgQEAgc2RoY2kxOiBzZGhjaUAxODA0MzAw MCB7CiAJCQlzdGF0dXMgPSAiZGlzYWJsZWQiOwogCQl9OwogCi0JCW5hbmQ6IG5hbmRAMTgwNDYw MDAgeworCQluYW5kX2NvbnRyb2xsZXI6IG5hbmQtY29udHJvbGxlckAxODA0NjAwMCB7CiAJCQlj b21wYXRpYmxlID0gImJyY20sbmFuZC1pcHJvYyIsICJicmNtLGJyY21uYW5kLXY2LjEiOwogCQkJ cmVnID0gPDB4MTgwNDYwMDAgMHg2MDA+LCA8MHhmODEwNTQwOCAweDYwMD4sCiAJCQkgICAgICA8 MHgxODA0NmYwMCAweDIwPjsKZGlmZiAtLWdpdCBhL2FyY2gvYXJtL2Jvb3QvZHRzL2JjbTkxMTM2 MF9lbnRwaG4uZHRzIGIvYXJjaC9hcm0vYm9vdC9kdHMvYmNtOTExMzYwX2VudHBobi5kdHMKaW5k ZXggYjJkMzIzZjRhNWFiLi5hNzZjNzRiNDRiYmEgMTAwNjQ0Ci0tLSBhL2FyY2gvYXJtL2Jvb3Qv ZHRzL2JjbTkxMTM2MF9lbnRwaG4uZHRzCisrKyBiL2FyY2gvYXJtL2Jvb3QvZHRzL2JjbTkxMTM2 MF9lbnRwaG4uZHRzCkBAIC04Miw4ICs4Miw4IEBAICZ1YXJ0MyB7CiAJc3RhdHVzID0gIm9rYXki OwogfTsKIAotJm5hbmQgewotCW5hbmRjc0AxIHsKKyZuYW5kX2NvbnRyb2xsZXIgeworCW5hbmRA MSB7CiAJCWNvbXBhdGlibGUgPSAiYnJjbSxuYW5kY3MiOwogCQlyZWcgPSA8MD47CiAJCW5hbmQt b24tZmxhc2gtYmJ0OwpkaWZmIC0tZ2l0IGEvYXJjaC9hcm0vYm9vdC9kdHMvYmNtOTU4MzAway5k dHMgYi9hcmNoL2FybS9ib290L2R0cy9iY205NTgzMDBrLmR0cwppbmRleCBiNGExMzkyYmQ1YTYu LmRkYTNlMTFiNzExZiAxMDA2NDQKLS0tIGEvYXJjaC9hcm0vYm9vdC9kdHMvYmNtOTU4MzAway5k dHMKKysrIGIvYXJjaC9hcm0vYm9vdC9kdHMvYmNtOTU4MzAway5kdHMKQEAgLTYwLDggKzYwLDgg QEAgJnVhcnQzIHsKIAlzdGF0dXMgPSAib2theSI7CiB9OwogCi0mbmFuZCB7Ci0JbmFuZGNzQDEg eworJm5hbmRfY29udHJvbGxlciB7CisJbmFuZEAxIHsKIAkJY29tcGF0aWJsZSA9ICJicmNtLG5h bmRjcyI7CiAJCXJlZyA9IDwwPjsKIAkJbmFuZC1vbi1mbGFzaC1iYnQ7CmRpZmYgLS1naXQgYS9h cmNoL2FybS9ib290L2R0cy9iY205NTgzMDVrLmR0cyBiL2FyY2gvYXJtL2Jvb3QvZHRzL2JjbTk1 ODMwNWsuZHRzCmluZGV4IDMzNzg2ODMzMjFkMy4uZWEzYzZiODhiMzEzIDEwMDY0NAotLS0gYS9h cmNoL2FybS9ib290L2R0cy9iY205NTgzMDVrLmR0cworKysgYi9hcmNoL2FybS9ib290L2R0cy9i Y205NTgzMDVrLmR0cwpAQCAtNjgsOCArNjgsOCBAQCAmdWFydDMgewogCXN0YXR1cyA9ICJva2F5 IjsKIH07CiAKLSZuYW5kIHsKLQluYW5kY3NAMSB7CismbmFuZF9jb250cm9sbGVyIHsKKwluYW5k QDEgewogCQljb21wYXRpYmxlID0gImJyY20sbmFuZGNzIjsKIAkJcmVnID0gPDA+OwogCQluYW5k LW9uLWZsYXNoLWJidDsKLS0gCjIuMzAuMgoKCl9fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fCmxpbnV4LWFybS1rZXJuZWwgbWFpbGluZyBsaXN0CmxpbnV4LWFy bS1rZXJuZWxAbGlzdHMuaW5mcmFkZWFkLm9yZwpodHRwOi8vbGlzdHMuaW5mcmFkZWFkLm9yZy9t YWlsbWFuL2xpc3RpbmZvL2xpbnV4LWFybS1rZXJuZWwK