Received: by 2002:a05:6a10:1287:0:0:0:0 with SMTP id d7csp684757pxv; Thu, 22 Jul 2021 09:41:21 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzEdH7Rz/CkHdlIwHyv6LCGYiqo+nMBgYUELDgg5ZyL2ex6YzpnKKqVM/47rnkK3CZJ/1// X-Received: by 2002:aa7:db11:: with SMTP id t17mr574581eds.297.1626972081032; Thu, 22 Jul 2021 09:41:21 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1626972081; cv=none; d=google.com; s=arc-20160816; b=lwYCtdUEdR9sKcUbLXIhyYynnGE5Oe5vIIpdPzymtgS9iTXj3NEq5b2V8CE5t3Ibte 2nPPtRU6CC9Pb99KhO7kIXdlbXKdxp4klkETh1cJy1WwJVmo8gnctDwLZGIr4WTGiS5+ W3uq2XAsGigEV4/L4YFA4DpEJ50ODyNbPc2SDFkcsaoFVBxSQEo1unWlpGynYJopCVSj goxtL/5UKT1MwmRU2jI3P2dUAOSvdUU106QQYxKILIxuNDdvoRZiTRRDJCrx94cJ1kF6 T1+8tHeJOaeZPNmNk22kZgNpQy/5i4Dah/JR2myVQbsw+LE6KevODmgKuz4smwaDrIhZ Q1YQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=Gjp8NMWKuHBQ9CPnpSgFXkPmXp9Y/3l0CQOMVn2/UqE=; b=kCZ9G3UtvX8EoxHJ8vHOxe2wVeXajGOizk7yyA8i+5fIPAo9SFl6IS8dshycJrGjtA 1+c8KX4iqwYwSYh+aALHLnhvbjLQt74Y2BENte3aKAOGWeuUfxc8qShWulclxky24qS2 B8KoydoIh2EJ9qSDbGlqnLWlwQKLu1mejUl0BCTbHnSJXRtPEwwskB83EUVQLOVcFkiM eqTOh9NNYUQGVH8wdQqy7GEg4RCSzy8NRzd4Dp9m6XhejvjlowcwLUzdpjJsUmSwe1Ya qQxcEYDHrlX0S+Dyc36l2Nf73rbFdOV9ci5wzfofEHe6TV6plAwDqkf1cDSXznDkvnja F9XQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=Lj2P9p8r; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id u15si30792722ejb.376.2021.07.22.09.40.57; Thu, 22 Jul 2021 09:41:21 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=Lj2P9p8r; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232906AbhGVP46 (ORCPT + 99 others); Thu, 22 Jul 2021 11:56:58 -0400 Received: from mail.kernel.org ([198.145.29.99]:59072 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231126AbhGVPz2 (ORCPT ); Thu, 22 Jul 2021 11:55:28 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id F0EFD61378; Thu, 22 Jul 2021 16:35:58 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1626971759; bh=o2+DIMKG+ANXAYmwk2LkDsSp8f1fh5jsvzyYiqGkwLA=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Lj2P9p8rHU/6vtJtospOpGehQ8B0wsXRte5CS0LLYPPjMRHOtUyjCk1y9pfqgJmbV FuoHkf+R6Tk1XT0dwoykRGnX840CnoQtjLw+qLnJccBo60qFwunhNs38r5tMPDdLe7 Ty3cq7Njj1sEbrswzfLwT5DbJS+AbiBueh88GdJ0= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, =?UTF-8?q?Rafa=C5=82=20Mi=C5=82ecki?= , Florian Fainelli , Sasha Levin Subject: [PATCH 5.10 016/125] ARM: Cygnus: dts: fix NAND nodes names Date: Thu, 22 Jul 2021 18:30:07 +0200 Message-Id: <20210722155625.222187360@linuxfoundation.org> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20210722155624.672583740@linuxfoundation.org> References: <20210722155624.672583740@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 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 dacaef2c14ca..ea3dc128b764 100644 --- a/arch/arm/boot/dts/bcm-cygnus.dtsi +++ b/arch/arm/boot/dts/bcm-cygnus.dtsi @@ -460,7 +460,7 @@ 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 @@ 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 @@ 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 @@ status = "okay"; }; -&nand { - nandcs@1 { +&nand_controller { + nand@1 { compatible = "brcm,nandcs"; reg = <0>; nand-on-flash-bbt; -- 2.30.2