Received: by 2002:a05:6a10:f3d0:0:0:0:0 with SMTP id a16csp671484pxv; Wed, 14 Jul 2021 12:39:50 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyaQl0axzcOIQUG51YP4jFV0hOKdiTJBvUnUh4XBcrJafkOP3mCJwBkLP+6sZkP++5yyZ1B X-Received: by 2002:a6b:7b0a:: with SMTP id l10mr8324186iop.54.1626291590376; Wed, 14 Jul 2021 12:39:50 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1626291590; cv=none; d=google.com; s=arc-20160816; b=mDss6Gdqk4NZ5aZ78ZxH7/ifpHHHA7KJ1uhZSv8A2Tr5wDY1eakdv3kneQRcP3YFd+ Pm3MFKy29z1bGrCgV0FTXPjuxFQ3EubdxMxSkZp0wzbVhEwrhdDTAArktdQ8UgRhOpSU uv406TDvfTqrfn1eaoxe9LV0HTvyeMf/mENWx04IiEZen9EVP21Y95JgPyqIJFIF/vdC dCuX7brkHOrgkihjtXP8JfuhoijSUhrsakL0BuBonAZS6BIguZHv0Ukx7WrUJKu6HW/m dxbnWelAyBN5Gs6qQ9BPI5i2fyvoEoPlPhMC3ZxRkYrSsK4tMSy9eecE7i7lCsrZmvnO H6WA== 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=Jg/t5EHuGlm+BBco3eAc4X24T94PkOE7pRfQ10Gq8sw=; b=JKyr5R7bKsM7ARxNzyRdyuMOPR4vrbjL9mwlRQoT3mVMYeFizOssQacUvl7TKd7viS 1dP4tXjvAwu1Jj58ag7IM2aVN+lARfO4TkTTNef82HNSi7bUeGBpnXu0JQVAwLr3gil2 bOUqcXHUhT4hQUSC3x9l/trAWhBpPK7mLwLdO8zgWyTPmbA42DKqYKqfT16yU++eJ3r0 rLKRCBl7KNdFNHFCYb5mzPqaowx+C+5jGXCNk/X8JJkE7DdTKZ1KxVQceeKvzm1VjxJn Ka+CZg4GjuAsYYeuDa3OwUWTW38PeMV/I1GzPvDSJv9VyMhEUYm2Pb2oE50zA/fe9V0A Ogng== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=azcyqOG0; 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 j30si3722778ila.56.2021.07.14.12.39.37; Wed, 14 Jul 2021 12:39:50 -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=azcyqOG0; 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 S233299AbhGNTlc (ORCPT + 99 others); Wed, 14 Jul 2021 15:41:32 -0400 Received: from mail.kernel.org ([198.145.29.99]:35734 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232169AbhGNTlU (ORCPT ); Wed, 14 Jul 2021 15:41:20 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id B7FFD613E2; Wed, 14 Jul 2021 19:38:27 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1626291508; bh=MnkZqjfaEZebjtwblUsWzU5f/OOwRtIiyMkh/TTg7Zs=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=azcyqOG0ZBC9yv0oHcZ/rHuaZuuO5L74NK838nsDmkzAqXYCmMrWij4gL6680H1jB 5kkOurc+4H5VQ0nnSF2+heXfTZdQ6NELgp2jiLaHBsf/u4YZF+uAZYOAOEo3C8RJ5S kKMQNPKMfcS7B6lKfdCsdukRh00MK99Z2Vu6w/aT5vMaPi0exwa1UtaPRd6LpHLOum Uw+QLBVobrM9YvqB1NA66u5BS1hqWhT1UkbrCs2TMTnDqndYkmnRy3vQkmw6yV9RPW sC+AaIdKW4TgFRL8r7urVE56MMmmB3MWTG35te/VjWJsgyG7L87sAJQye1Bydn3rQ7 0ewOE/BnmZ29A== 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, linux-arm-kernel@lists.infradead.org Subject: [PATCH AUTOSEL 5.13 018/108] ARM: Cygnus: dts: fix NAND nodes names Date: Wed, 14 Jul 2021 15:36:30 -0400 Message-Id: <20210714193800.52097-18-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 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 0025c88f660c..8ecb7861ce10 100644 --- a/arch/arm/boot/dts/bcm-cygnus.dtsi +++ b/arch/arm/boot/dts/bcm-cygnus.dtsi @@ -460,7 +460,7 @@ sdhci1: sdhci@18043000 { 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 @@ &uart3 { 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 @@ &uart3 { 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 @@ &uart3 { status = "okay"; }; -&nand { - nandcs@1 { +&nand_controller { + nand@1 { compatible = "brcm,nandcs"; reg = <0>; nand-on-flash-bbt; -- 2.30.2