Received: by 2002:a05:6a10:f3d0:0:0:0:0 with SMTP id a16csp707331pxv; Wed, 14 Jul 2021 13:35:22 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzYYVjIqm77ospBt5XinOPbYzkUcUgocTsKI0Ybcxrp1Bf+K0RIyrY1sYg4Z7W+9++vIHEt X-Received: by 2002:a50:8e19:: with SMTP id 25mr208514edw.11.1626294922706; Wed, 14 Jul 2021 13:35:22 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1626294922; cv=none; d=google.com; s=arc-20160816; b=EskOJMEW2f1a7ZO5Fm7h7kvaxP5PHr3c3gZdfWNLaAxO1HnejyXDBoJAToTtKHQpn+ BDmXR51LuD2kE7Yh7sDJmSTjo0iBXDu90JEjrwN2RjsUIL5RiaMdx2HH6Mi/JUzZUXXD A51manze3gB3l2GhZGf6KLPFmeyUcrBoZ44AMc8WciYdJHmgO0tCZuIK5Uf6+Hk0plQu 6eT+mfekjTglcoxh8s2lVuqcRFJ0gBXiul0806juY4+L5y0xwVE+8e5469ioyDr7adYZ V04D8IqvGxdjKE0FVPvDRrBTX5hG4UVQhiqB9XrHf0y7VqmNmllaO+x3zIurDnwyzrR6 b7/A== 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=rEcwWhKTFzxtigm59/Vvrx+5qNr+B1OHWK4MqB5E9H4=; b=ubCPmwEVU0M1CfDtGzDhsUGCROV7usDHyltbSNDqzeXh5M87yQ3wcChi6IY0NkVaR+ 0RzUFRrZb1BoWAsePZpLG62LGA7vpi4zhtG2W/TdVYOz+WEM6a63Iji1ICbPFN/exIua f/SblYc3DYFCsLDO1H0IVIrQzN4xDLw7f1EcO9KSxBX9ns17upNXIiTXFB5CHoDmlRcR 6lRHoYwWiX4Tx5sliiqu/r6WE1x31NMRaIirVLeUez6a/qq4Hsz1l0EuovUCe48CGspi iEhz37+zNFODzlEdGzuLndNeJZ9WXJSE86GbXoqeS8N63NyQjgBG2hRkp0RU45MKJR6Y t2/Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b="iCvTAhf/"; 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 la14si3852983ejc.142.2021.07.14.13.34.59; Wed, 14 Jul 2021 13:35:22 -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="iCvTAhf/"; 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 S242570AbhGNUE5 (ORCPT + 99 others); Wed, 14 Jul 2021 16:04:57 -0400 Received: from mail.kernel.org ([198.145.29.99]:49262 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S238756AbhGNTvG (ORCPT ); Wed, 14 Jul 2021 15:51:06 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id B92DC613D1; Wed, 14 Jul 2021 19:48:13 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1626292094; bh=IsDXt9MRxv2/0Dcd3vFCuFrZl7JfyFY0hH3w3yGDm04=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=iCvTAhf/7x/hKOXE7inf5ViT5YioYcbcSZvXgif1sBXLCCCviMBkv833AhtmpjkWn KgMZ0/VQzp7SmbBgaGYwQKLL+mOR/ZFarnl/PNR5Y3eJpAj5d3W89AgNHHXPMi2PBy zLIvgBnPnZv/g1dLOVijSYiEp20Ir2hrFHXuyb6AMWWqTjbArRyG5ysOlUZ1vum2vg vI/QC9WkuW8QKEnJhPBOyfwf9IeZX6ukppRyUsLoSxHdNIa2GVVuVqeoKdDmP9Od1E B41YfQCa3eC4sdRGVn/Rxjzr3kKdRemK7oPKbgRli26k3zSSs10UVdmP/o6KaYiHVw HmFXMDBMc1Szg== 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 Subject: [PATCH AUTOSEL 4.9 05/18] ARM: dts: BCM63xx: Fix NAND nodes names Date: Wed, 14 Jul 2021 15:47:53 -0400 Message-Id: <20210714194806.55962-5-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 75e2f012f6e34b93124d1d86eaa8f27df48e9ea0 ] 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/bcm63138.dtsi | 2 +- arch/arm/boot/dts/bcm963138dvt.dts | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/arch/arm/boot/dts/bcm63138.dtsi b/arch/arm/boot/dts/bcm63138.dtsi index 547369c69e96..aedbea888684 100644 --- a/arch/arm/boot/dts/bcm63138.dtsi +++ b/arch/arm/boot/dts/bcm63138.dtsi @@ -174,7 +174,7 @@ serial1: serial@620 { status = "disabled"; }; - nand: nand@2000 { + nand_controller: nand-controller@2000 { #address-cells = <1>; #size-cells = <0>; compatible = "brcm,nand-bcm63138", "brcm,brcmnand-v7.0", "brcm,brcmnand"; diff --git a/arch/arm/boot/dts/bcm963138dvt.dts b/arch/arm/boot/dts/bcm963138dvt.dts index 370aa2cfddf2..439cff69e948 100644 --- a/arch/arm/boot/dts/bcm963138dvt.dts +++ b/arch/arm/boot/dts/bcm963138dvt.dts @@ -29,10 +29,10 @@ &serial1 { status = "okay"; }; -&nand { +&nand_controller { status = "okay"; - nandcs@0 { + nand@0 { compatible = "brcm,nandcs"; reg = <0>; nand-ecc-strength = <4>; -- 2.30.2