Received: by 2002:a05:6a10:1287:0:0:0:0 with SMTP id d7csp683420pxv; Thu, 22 Jul 2021 09:39:54 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwfcPn0CEoAk5hMT4EfWcL3pYG97kkTSisqJgvXGSIcoFe3w7d/TfH+i5rOGGdvCSavYwoL X-Received: by 2002:a6b:14ca:: with SMTP id 193mr463994iou.206.1626971993833; Thu, 22 Jul 2021 09:39:53 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1626971993; cv=none; d=google.com; s=arc-20160816; b=ce4wo9XeAJ0069haDjVk6BcqCMHuMSNKcs9viWRXOCurep53zQUof6KPXspiyf7hTw 0+xGCtmWwibaxooMFIS6t1iCyVMMp0FAorX2HUtXoiWYVTqGls9NbBsiAAeK6W49pJD+ X4MipLEB15CiDlXELLSr8JR7szlTvTeoT+jpBv/odBYn4e2ORqBIMQaVF4L/blPJKRdJ 280bJI09qkqcJUvJPJvBnseZkoMaGUOgWGYfCAcLBlYNxNfO3QV107GN7D19OOgQuwa8 Znqre5zpn2zgNRdQNrZB+DYWfujxmW+FKKQs9IGVV/xRvn8E5PDgQjiwcimmudb59MTw H+sg== 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=jk4SzJc/fR68A80uxonXHdkM7t8LMiQg7hYBYAtE2dQ=; b=PDY/Z4OypuyEHeSgJelbAqQl11TdWniMt01V1+YveHoyTHPBEjcHGcHxSdo9KmNOSX jlUPKqezxN3QnDA/fedUMQp/lqAJgoDeCQkwBazAUitSHlo0GdaqF369C/a2QK9luz2H EQL0QMtYuJKyjQo/5c+RFcdL8fnLHc7/+gwV/8dTEGp4frHz8Mn1qQWvvMjn9Zg915nL 15s3HbDF9TED5sc5UPGdMeAD9U7neGwIyEQpYPs+48gvFkxpWhOgkUgecRugLV8gxFyv tLTsuWvl10BAcz9m7/h3d453BEiA5fihxAWUKNWlbHJi2AkHAxjZpfTbHkBYFA0/FYIA 5MXQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=G3vR9LUC; 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 u5si34888035jad.124.2021.07.22.09.39.40; Thu, 22 Jul 2021 09:39:53 -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=G3vR9LUC; 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 S233231AbhGVP6Q (ORCPT + 99 others); Thu, 22 Jul 2021 11:58:16 -0400 Received: from mail.kernel.org ([198.145.29.99]:59460 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230281AbhGVPzX (ORCPT ); Thu, 22 Jul 2021 11:55:23 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id 6118A61377; Thu, 22 Jul 2021 16:35:56 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1626971757; bh=wVyccyobmz7/CFF8QnrwUJDpJW1OH0nkl8KRnURzRrw=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=G3vR9LUCCdE1xVROFdQ91asnlZgEM4bnjZXV4RE0KV70bp3MmM69GnxOXx6JVhdx0 9zrOe40GEGF7KO+UNB8UU+2jOKGUeo9pMJtFXQVKq6AJSuwCU8xOGIC8pzK4k0URK4 fAX/uE0hUeU8trbh9/H1VuIs1xroFAg6hA1HbhvU= 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 015/125] ARM: brcmstb: dts: fix NAND nodes names Date: Thu, 22 Jul 2021 18:30:06 +0200 Message-Id: <20210722155625.190998468@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 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 @@ }; }; -&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 @@ 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