Received: by 2002:a05:6a10:f3d0:0:0:0:0 with SMTP id a16csp671952pxv; Wed, 14 Jul 2021 12:40:32 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxgNjgpMBnjseYux5fGpbk6/XYTQxtXiDh3lV/aB2fhXTdMc2i3FkOVa1X07lmT4//DVQYC X-Received: by 2002:a50:d642:: with SMTP id c2mr15687487edj.22.1626291632438; Wed, 14 Jul 2021 12:40:32 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1626291632; cv=none; d=google.com; s=arc-20160816; b=RhKmbk0s8ixfU9XON0M3h9Sv26Rkj7jR9/t3r9HBp7UQyzvYZZ//k5whJqxy7iOS7p gEMCNSWUasQLnkWp01E74FtnpECoNPsXkSfXbFayz6eEIoNXB8839gfdIppwZ7tN1c3X Lt2xzHvv4rvHhm07vyzPDQweGdIuXeaGUoyGDhayVhkJJp4/5tk/AobcUkCxlxHStqGJ i0t96HlfHnnUxsGWEUOWvToQ+85XTi4YPSF4fXm4phc/OKU4bb5XnmS/aQyFaETSyiU4 SKLNQK59KQtUpY5ApbHidv4jnYI3ZER04aga864gACQ7fQk3eLplt9XmeifIlgdXunMC nv/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=CoIl2duD8fsI4VeDc3HdhbYSBTZ7E087rx1pgj523Gg=; b=KYwkgnVuZJY8EGj+gDIgL94ff54nPRFEWax57iTjQurkfVJVr0WYc8nmduI7zhOcac A146cSEL4f2mm2a3HcyqLsZzkZxifMd9X9rNHb+O4481YybM5zJMaIf8fij/q1t1tZIs et9w50xHCOeByUoko67Ff9h1wjSsVO+gqzUU8yEfbuVCgcaHzg0h8I2TbUy/B+4LaCvX spyX4eQ8owT0ud+wC7Gb32aQPaPizwyVZvcxz6yH6pKWED+YduV2eX0ihSpFHR43kYM4 Tiq04FZTmHH/sCtCR/pQ9veo+c400ISueHFZfO2kR828wBbY3hwDElgIblzh6YSjAVcD QXzQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=PIpXOQ2d; 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 ay6si3740343edb.49.2021.07.14.12.40.08; Wed, 14 Jul 2021 12:40:32 -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=PIpXOQ2d; 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 S233282AbhGNTle (ORCPT + 99 others); Wed, 14 Jul 2021 15:41:34 -0400 Received: from mail.kernel.org ([198.145.29.99]:35768 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232326AbhGNTlW (ORCPT ); Wed, 14 Jul 2021 15:41:22 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id 6B359613D0; Wed, 14 Jul 2021 19:38:29 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1626291510; bh=P/rwddjjYwar/g4tvCkYhJOStW8tN5vzoj/oxckFAAU=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=PIpXOQ2dBDsLbzsoh5I6sn1ZAUhk8o1btL8+Ed+Can+TzcTWgze28sUMJbP494SiJ htpMsdLd6kcGBiFVEXEIBlQVBn2ZXFMz1wrdQGbnTmUVg4m/xKoPvMesxYLss5vP2p c7VXRIlaDrQZ/9xM5h7KGxpEFzOHWLAdRnoA7/FYXk5edTmL/UHe4a4UuoGaRz7QA5 4T3D5iI4q5dIJzwyn1zbDRmkIdcO7AyysA4E2w+MLjNCwqfza2yfY4B5wlUzNlmEtK wfgNGFvYOizzIVqU+NoUMAaukMSi1uHZjJrEtN0GCHxq63JVsK/WI2qSekhy+mvU// 6OY0WF+BFIeJg== 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 019/108] ARM: NSP: dts: fix NAND nodes names Date: Wed, 14 Jul 2021 15:36:31 -0400 Message-Id: <20210714193800.52097-19-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 0484594be733d5cdf976f55a2d4e8d887f351b69 ] 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-nsp.dtsi | 2 +- arch/arm/boot/dts/bcm958522er.dts | 4 ++-- arch/arm/boot/dts/bcm958525er.dts | 4 ++-- arch/arm/boot/dts/bcm958525xmc.dts | 4 ++-- arch/arm/boot/dts/bcm958622hr.dts | 4 ++-- arch/arm/boot/dts/bcm958623hr.dts | 4 ++-- arch/arm/boot/dts/bcm958625hr.dts | 4 ++-- arch/arm/boot/dts/bcm958625k.dts | 4 ++-- arch/arm/boot/dts/bcm988312hr.dts | 4 ++-- 9 files changed, 17 insertions(+), 17 deletions(-) diff --git a/arch/arm/boot/dts/bcm-nsp.dtsi b/arch/arm/boot/dts/bcm-nsp.dtsi index b4d2cc70afb1..748df7955ae6 100644 --- a/arch/arm/boot/dts/bcm-nsp.dtsi +++ b/arch/arm/boot/dts/bcm-nsp.dtsi @@ -269,7 +269,7 @@ mailbox: mailbox@25c00 { dma-coherent; }; - nand: nand@26000 { + nand_controller: nand-controller@26000 { compatible = "brcm,nand-iproc", "brcm,brcmnand-v6.1"; reg = <0x026000 0x600>, <0x11b408 0x600>, diff --git a/arch/arm/boot/dts/bcm958522er.dts b/arch/arm/boot/dts/bcm958522er.dts index 5443fc079e6e..1f73885ec274 100644 --- a/arch/arm/boot/dts/bcm958522er.dts +++ b/arch/arm/boot/dts/bcm958522er.dts @@ -74,8 +74,8 @@ &ehci0 { status = "okay"; }; -&nand { - nandcs@0 { +&nand_controller { + nand@0 { compatible = "brcm,nandcs"; reg = <0>; nand-on-flash-bbt; diff --git a/arch/arm/boot/dts/bcm958525er.dts b/arch/arm/boot/dts/bcm958525er.dts index e1e3c26cef19..b6b9ca8b0972 100644 --- a/arch/arm/boot/dts/bcm958525er.dts +++ b/arch/arm/boot/dts/bcm958525er.dts @@ -74,8 +74,8 @@ &ehci0 { status = "okay"; }; -&nand { - nandcs@0 { +&nand_controller { + nand@0 { compatible = "brcm,nandcs"; reg = <0>; nand-on-flash-bbt; diff --git a/arch/arm/boot/dts/bcm958525xmc.dts b/arch/arm/boot/dts/bcm958525xmc.dts index f161ba2e7e5e..ecf426f6ad5d 100644 --- a/arch/arm/boot/dts/bcm958525xmc.dts +++ b/arch/arm/boot/dts/bcm958525xmc.dts @@ -90,8 +90,8 @@ rtc@68 { }; }; -&nand { - nandcs@0 { +&nand_controller { + nand@0 { compatible = "brcm,nandcs"; reg = <0>; nand-on-flash-bbt; diff --git a/arch/arm/boot/dts/bcm958622hr.dts b/arch/arm/boot/dts/bcm958622hr.dts index 83cb877d63db..8ca18da981ad 100644 --- a/arch/arm/boot/dts/bcm958622hr.dts +++ b/arch/arm/boot/dts/bcm958622hr.dts @@ -78,8 +78,8 @@ &ehci0 { status = "okay"; }; -&nand { - nandcs@0 { +&nand_controller { + nand@0 { compatible = "brcm,nandcs"; reg = <0>; nand-on-flash-bbt; diff --git a/arch/arm/boot/dts/bcm958623hr.dts b/arch/arm/boot/dts/bcm958623hr.dts index 4e106ce1384a..9747378db531 100644 --- a/arch/arm/boot/dts/bcm958623hr.dts +++ b/arch/arm/boot/dts/bcm958623hr.dts @@ -78,8 +78,8 @@ &ehci0 { status = "okay"; }; -&nand { - nandcs@0 { +&nand_controller { + nand@0 { compatible = "brcm,nandcs"; reg = <0>; nand-on-flash-bbt; diff --git a/arch/arm/boot/dts/bcm958625hr.dts b/arch/arm/boot/dts/bcm958625hr.dts index cda6cc281e18..0f92b773afb8 100644 --- a/arch/arm/boot/dts/bcm958625hr.dts +++ b/arch/arm/boot/dts/bcm958625hr.dts @@ -89,8 +89,8 @@ &ehci0 { status = "okay"; }; -&nand { - nandcs@0 { +&nand_controller { + nand@0 { compatible = "brcm,nandcs"; reg = <0>; nand-on-flash-bbt; diff --git a/arch/arm/boot/dts/bcm958625k.dts b/arch/arm/boot/dts/bcm958625k.dts index ffbff0014c65..9e984ca0e6df 100644 --- a/arch/arm/boot/dts/bcm958625k.dts +++ b/arch/arm/boot/dts/bcm958625k.dts @@ -68,8 +68,8 @@ &ehci0 { status = "okay"; }; -&nand { - nandcs@0 { +&nand_controller { + nand@0 { compatible = "brcm,nandcs"; reg = <0>; nand-on-flash-bbt; diff --git a/arch/arm/boot/dts/bcm988312hr.dts b/arch/arm/boot/dts/bcm988312hr.dts index 3fd39c479a3c..5475dab8181d 100644 --- a/arch/arm/boot/dts/bcm988312hr.dts +++ b/arch/arm/boot/dts/bcm988312hr.dts @@ -74,8 +74,8 @@ &ehci0 { status = "okay"; }; -&nand { - nandcs@0 { +&nand_controller { + nand@0 { compatible = "brcm,nandcs"; reg = <0>; nand-on-flash-bbt; -- 2.30.2