Received: by 2002:a05:6a10:f3d0:0:0:0:0 with SMTP id a16csp706745pxv; Wed, 14 Jul 2021 13:34:25 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxe9FxcOmecPLRw2VZnqg5ru3ZqlFcPko4yQBlx30GIrRcZtGypsgx5/2Jl3BLO8xwQCDAa X-Received: by 2002:a17:906:3c14:: with SMTP id h20mr71985ejg.176.1626294864866; Wed, 14 Jul 2021 13:34:24 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1626294864; cv=none; d=google.com; s=arc-20160816; b=JT0B015S/vgut0Ez3J16ImmKM50whsMXGpifQjZ/C9HLsNfQp3T1++NjxSomeUB/nA gVwDoroqUaWqOYXF4RVbR4ybCeS//zamphSlCKDmqzFuLdlsCtZErFQGqdax+iLdq9YF BV+NM1Xb89wFe2FZiLmt9mtQJXMz85ktYY20DEc/pcsJPnCxhRv3Uyh94YbwkRNm4QIn hIpPo+UjrmYxC/ZfP7RS41h5UIcHlZ/RCmGWvnDeRi7o0/e9H/Syrqe2o0sB1l7NyM0h bL3xlCDmxJsMZPjRBTsw18vdPHccHYujVfC0x7mAC1WksiLcEGq5MaOtpIuzLFQnbkDP pK4Q== 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 :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=Huhbomy9pLf0NsHJmh13Nd2CVs+MnoMJZUzh/wd6pl4=; b=AfT8MyDhlyecD7iE+qHxiFAdykwunOl+E7OID2ZSXOv6m/CCELT9Rrba6gCLpWN0pt Iaz3tGAfcOkUUGSMNzyTxzTxt+NXcCyGA0qNFSpxkU4gc7k7v0XrqBm7RzslCO2o2NPL bdRYms58vGU+/1oTJFuyk3+k6S5Dpg2i4T+C93o6vCmmxaPeXF9I6kXIeSptC5qBP4Xw uBg81vfZhHK/+pjQb90tT69WQ3Z7iatW6fW5lqfWvJbclmSsFXGZrDqEVvL5W6wsNnby OZ9xVC8k7A4RO1oanO03JiRkO2L71U/rQWu/gNROKqsRUiVN4fq85YwmhIq9qnc0JMfb t7cg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b="TJiy75/O"; 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=kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id df18si3831268edb.600.2021.07.14.13.34.02; Wed, 14 Jul 2021 13:34:24 -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=@kernel.org header.s=k20201202 header.b="TJiy75/O"; 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=kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S242485AbhGNUEy (ORCPT + 99 others); Wed, 14 Jul 2021 16:04:54 -0400 Received: from mail.kernel.org ([198.145.29.99]:49182 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233384AbhGNTvF (ORCPT ); Wed, 14 Jul 2021 15:51:05 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id 36F21613F6; Wed, 14 Jul 2021 19:48:12 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1626292093; bh=n8HgM6WO45WIlTe1BG2AxxEVNh9IpZpYOvrLwQTKtSc=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=TJiy75/Ob1m+LejGIfMN52JiLnzSEbjgsySJ4rlAKDx7dTCzoM944G0atFdZfdDfS jskAgvf3pCG8RD6DRZwG75dz0K2vhGaez2N+vXzUUGOkTDyq1tIzX45ZImsb4+XbYY o+jFGXXAbiP1yF/8n6JgLE7IHLAdMFJiasuCLKWg0AZWj7Y9hfK59xuG+sl4fGEXyw Jk8l8mUU8GvYNCdAIjINspk5FY9RJFtpSem3CFNUO+uPgltrkZ68bBSeZ91VW7Oq+G 3CMXFjZNLCWuQY96yex600PYNgFdOlXwbtGCneve0sWIPDVIzVobZ+ez3PHKYTx5IH x56ePImgmWaAw== 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 4.9 04/18] ARM: brcmstb: dts: fix NAND nodes names Date: Wed, 14 Jul 2021 15:47:52 -0400 Message-Id: <20210714194806.55962-4-sashal@kernel.org> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20210714194806.55962-1-sashal@kernel.org> References: <20210714194806.55962-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 0bb8d17e4c2d..e51c9b079432 100644 --- a/arch/arm/boot/dts/bcm7445-bcm97445svmb.dts +++ b/arch/arm/boot/dts/bcm7445-bcm97445svmb.dts @@ -13,10 +13,10 @@ memory { }; }; -&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 4791321969b3..3f002f2047f1 100644 --- a/arch/arm/boot/dts/bcm7445.dtsi +++ b/arch/arm/boot/dts/bcm7445.dtsi @@ -149,7 +149,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