Received: by 2002:a05:6a10:f3d0:0:0:0:0 with SMTP id a16csp671460pxv; Wed, 14 Jul 2021 12:39:47 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxS6Ti+ODiGwB93cqoeGCDsWbRNmH4Ee50Pt7146kwM6UZ8EnaTLraknzaOxG8k/ZIF1CES X-Received: by 2002:a05:6e02:f53:: with SMTP id y19mr8209447ilj.181.1626291586982; Wed, 14 Jul 2021 12:39:46 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1626291586; cv=none; d=google.com; s=arc-20160816; b=LRIWzC3sc4sXlNlru/l5FLjGzL0vBFmyVdihj6wL03xmvynikoPdWX0+D1ua04bjt8 lhDx9TJl6sRsjo2dvSMaqJeHwZizA/H8vEMq3RNQxfTzHWqYznjzW0oPSo3PpysLgHgb VBXf7cYJ/Yu1crWDYZDEMx6iM85XXtaLFFKGJ24QqtH1k2E4nxIuTkhO0ZD6x74tOJ4h ZgI4sr4HkPqMao2pIBS7BOiI8pQGYI7CuHUdmBAoUn+3LUQQUiX+KBMHt7wBIjY68IGi WKaB+88R1ed6ZJG8kPZLcfrLuvbrpQYDAuG24eTgQpVbeF5nDvOhWY8408e6UN2rgpA7 qAtg== 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=GZhtuaDDeO3U0dQH4CFUvLemya8BIY1Dr/idOugMwZQ=; b=eTMEyy4Vf/rMXjkp7YrnyTkBUsC7EHMCwcq+7fQPjiRbcPcrJS69CJzFkZ9V0KiTw+ m/2EFK/4F0Xwiz1vf8s1W0aImkM83CK0p/eFWVIDoUDgQJLU31lPKI4wczJ2fvUbxHAs 7sTVVoSUSncAQRYpzMWXasTvJg56SvOY2lgFNboXWxerTmI1FQmQLX2F7V0cnNVPf4KY Rq/tR1Ssn69JJUSVNbx8OXXVDQoHrT7ew9u0Lqd+YOc5mv9oA3MXUZvJ9eux6fA7wP54 dtafBbnU4kh9l2xgJBx52QaBnUSz9fIP1wiy880SC5b7mO9rPBorePoq2zrAnLPyB7pJ FeDg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=t2Qr62UV; 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 o14si4091417ilj.24.2021.07.14.12.39.34; Wed, 14 Jul 2021 12:39:46 -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=t2Qr62UV; 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 S233090AbhGNTla (ORCPT + 99 others); Wed, 14 Jul 2021 15:41:30 -0400 Received: from mail.kernel.org ([198.145.29.99]:35686 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232186AbhGNTlT (ORCPT ); Wed, 14 Jul 2021 15:41:19 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id 4B81D613CB; Wed, 14 Jul 2021 19:38:26 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1626291507; bh=dumczC+bSItUFokwnf1JtchFKI5EZs3VRWdzdaiVhvA=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=t2Qr62UVxDuLuYF00DLa4z/7TStSKCmAswsjF/aVawvXxsVewe4AKq0I4IO6If6Hp EpI3Pz9OGPZbzw4YpT1uNP8DXdhDXTD3KmwW53QJHCttPuq0u9lgVoORFRjnkntnD/ JQt/V9yyS+3aUCkovO04GOw6H4bhVuwR9gzEPJcNASbPvJtZKByOXxQvVZJ9xFvPaU zL7Ns15FiesWdqgOEH/FjXjR3y88o6wWqR6co95jqlc+7sArIPHHop6GJzuiPsjXYH O/dAiv4GBIrjkM1nTpG5NMxoc6j7UgA8tdJD55SCajGBh6idKCo9VePHdoW7xNnWxH sbxci1ZclSxaA== 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.13 017/108] ARM: brcmstb: dts: fix NAND nodes names Date: Wed, 14 Jul 2021 15:36:29 -0400 Message-Id: <20210714193800.52097-17-sashal@kernel.org> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20210714193800.52097-1-sashal@kernel.org> References: <20210714193800.52097-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