From: Sasha Levin <sashal@kernel.org>
To: linux-kernel@vger.kernel.org, stable@vger.kernel.org
Cc: "Rafał Miłecki" <rafal@milecki.pl>,
"Florian Fainelli" <f.fainelli@gmail.com>,
"Sasha Levin" <sashal@kernel.org>,
devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org
Subject: [PATCH AUTOSEL 4.19 12/39] ARM: NSP: dts: fix NAND nodes names
Date: Wed, 14 Jul 2021 15:45:57 -0400 [thread overview]
Message-ID: <20210714194625.55303-12-sashal@kernel.org> (raw)
In-Reply-To: <20210714194625.55303-1-sashal@kernel.org>
From: Rafał Miłecki <rafal@milecki.pl>
[ Upstream commit 0484594be733d5cdf976f55a2d4e8d887f351b69 ]
This matches nand-controller.yaml requirements.
Signed-off-by: Rafał Miłecki <rafal@milecki.pl>
Signed-off-by: Florian Fainelli <f.fainelli@gmail.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>
---
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 b395cb195db2..71918d208fb3 100644
--- a/arch/arm/boot/dts/bcm-nsp.dtsi
+++ b/arch/arm/boot/dts/bcm-nsp.dtsi
@@ -259,7 +259,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 f9dd342cc2ae..56f9181975b1 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 374508a9cfbf..93a3e23ec7ae 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 403250c5ad8e..fad974212d8a 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 ecd05e26c262..76ff9c50f62c 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 f5e85b301497..c2c90ea328a1 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 ea3fc194f8f3..6d0179acab38 100644
--- a/arch/arm/boot/dts/bcm958625hr.dts
+++ b/arch/arm/boot/dts/bcm958625hr.dts
@@ -76,8 +76,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 3ea5f739e90b..579a88ce5b7f 100644
--- a/arch/arm/boot/dts/bcm958625k.dts
+++ b/arch/arm/boot/dts/bcm958625k.dts
@@ -69,8 +69,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 ea9a0806b446..a03224c54bbb 100644
--- a/arch/arm/boot/dts/bcm988312hr.dts
+++ b/arch/arm/boot/dts/bcm988312hr.dts
@@ -78,8 +78,8 @@ &ehci0 {
status = "okay";
};
-&nand {
- nandcs@0 {
+&nand_controller {
+ nand@0 {
compatible = "brcm,nandcs";
reg = <0>;
nand-on-flash-bbt;
--
2.30.2
next prev parent reply other threads:[~2021-07-14 19:59 UTC|newest]
Thread overview: 40+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-07-14 19:45 [PATCH AUTOSEL 4.19 01/39] ARM: dts: gemini: rename mdio to the right name Sasha Levin
2021-07-14 19:45 ` [PATCH AUTOSEL 4.19 02/39] ARM: dts: gemini: add device_type on pci Sasha Levin
2021-07-14 19:45 ` [PATCH AUTOSEL 4.19 03/39] ARM: dts: rockchip: fix pinctrl sleep nodename for rk3036-kylin and rk3288 Sasha Levin
2021-07-14 19:45 ` [PATCH AUTOSEL 4.19 04/39] arm64: dts: rockchip: fix pinctrl sleep nodename for rk3399.dtsi Sasha Levin
2021-07-14 19:45 ` [PATCH AUTOSEL 4.19 05/39] ARM: dts: rockchip: Fix the timer clocks order Sasha Levin
2021-07-14 19:45 ` [PATCH AUTOSEL 4.19 06/39] ARM: dts: rockchip: Fix IOMMU nodes properties on rk322x Sasha Levin
2021-07-14 19:45 ` [PATCH AUTOSEL 4.19 07/39] ARM: dts: rockchip: Fix power-controller node names for rk3288 Sasha Levin
2021-07-14 19:45 ` [PATCH AUTOSEL 4.19 08/39] arm64: dts: rockchip: Fix power-controller node names for rk3328 Sasha Levin
2021-07-14 19:45 ` [PATCH AUTOSEL 4.19 09/39] reset: ti-syscon: fix to_ti_syscon_reset_data macro Sasha Levin
2021-07-14 19:45 ` [PATCH AUTOSEL 4.19 10/39] ARM: brcmstb: dts: fix NAND nodes names Sasha Levin
2021-07-14 19:45 ` [PATCH AUTOSEL 4.19 11/39] ARM: Cygnus: " Sasha Levin
2021-07-14 19:45 ` Sasha Levin [this message]
2021-07-14 19:45 ` [PATCH AUTOSEL 4.19 13/39] ARM: dts: BCM63xx: Fix " Sasha Levin
2021-07-14 19:45 ` [PATCH AUTOSEL 4.19 14/39] ARM: dts: Hurricane 2: " Sasha Levin
2021-07-14 19:46 ` [PATCH AUTOSEL 4.19 15/39] ARM: dts: imx25-pinfunc: Fix gpio function name for pads GPIO_[A-F] Sasha Levin
2021-07-14 19:46 ` [PATCH AUTOSEL 4.19 16/39] ARM: dts: imx6: phyFLEX: Fix UART hardware flow control Sasha Levin
2021-07-14 19:46 ` [PATCH AUTOSEL 4.19 17/39] ARM: imx: pm-imx5: Fix references to imx5_cpu_suspend_info Sasha Levin
2021-07-14 19:46 ` [PATCH AUTOSEL 4.19 18/39] rtc: mxc_v2: add missing MODULE_DEVICE_TABLE Sasha Levin
2021-07-14 19:46 ` [PATCH AUTOSEL 4.19 19/39] ARM: dts: am335x: align GPIO hog names with dt-schema Sasha Levin
2021-07-14 19:46 ` [PATCH AUTOSEL 4.19 20/39] ARM: dts: am437x: align gpio " Sasha Levin
2021-07-14 19:46 ` [PATCH AUTOSEL 4.19 21/39] ARM: dts: omap5-board-common: " Sasha Levin
2021-07-14 19:46 ` [PATCH AUTOSEL 4.19 22/39] ARM: dts: dra7x-evm: Align GPIO " Sasha Levin
2021-07-14 19:46 ` [PATCH AUTOSEL 4.19 23/39] ARM: dts: stm32: fix gpio-keys node on STM32 MCU boards Sasha Levin
2021-07-14 19:46 ` [PATCH AUTOSEL 4.19 24/39] ARM: dts: stm32: fix RCC node name on stm32f429 MCU Sasha Levin
2021-07-14 19:46 ` [PATCH AUTOSEL 4.19 25/39] ARM: dts: stm32: fix timer nodes on STM32 MCU to prevent warnings Sasha Levin
2021-07-14 19:46 ` [PATCH AUTOSEL 4.19 26/39] arm64: dts: juno: Update SCPI nodes as per the YAML schema Sasha Levin
2021-07-14 19:46 ` [PATCH AUTOSEL 4.19 27/39] ARM: dts: rockchip: fix supply properties in io-domains nodes Sasha Levin
2021-07-14 19:46 ` [PATCH AUTOSEL 4.19 28/39] ARM: dts: stm32: fix i2c node name on stm32f746 to prevent warnings Sasha Levin
2021-07-14 19:46 ` [PATCH AUTOSEL 4.19 29/39] ARM: dts: stm32: move stmmac axi config in ethernet node on stm32mp15 Sasha Levin
2021-07-14 19:46 ` [PATCH AUTOSEL 4.19 30/39] soc/tegra: fuse: Fix Tegra234-only builds Sasha Levin
2021-07-14 19:46 ` [PATCH AUTOSEL 4.19 31/39] arm64: dts: ls208xa: remove bus-num from dspi node Sasha Levin
2021-07-23 20:11 ` Pavel Machek
2021-07-14 19:46 ` [PATCH AUTOSEL 4.19 32/39] thermal/core: Correct function name thermal_zone_device_unregister() Sasha Levin
2021-07-14 19:46 ` [PATCH AUTOSEL 4.19 33/39] kbuild: mkcompile_h: consider timestamp if KBUILD_BUILD_TIMESTAMP is set Sasha Levin
2021-07-14 19:46 ` [PATCH AUTOSEL 4.19 34/39] rtc: max77686: Do not enforce (incorrect) interrupt trigger type Sasha Levin
2021-07-14 19:46 ` [PATCH AUTOSEL 4.19 35/39] scsi: aic7xxx: Fix unintentional sign extension issue on left shift of u8 Sasha Levin
2021-07-14 19:46 ` [PATCH AUTOSEL 4.19 36/39] scsi: libsas: Add LUN number check in .slave_alloc callback Sasha Levin
2021-07-14 19:46 ` [PATCH AUTOSEL 4.19 37/39] scsi: be2iscsi: Fix some missing space in some messages Sasha Levin
2021-07-14 19:46 ` [PATCH AUTOSEL 4.19 38/39] scsi: libfc: Fix array index out of bound exception Sasha Levin
2021-07-14 19:46 ` [PATCH AUTOSEL 4.19 39/39] sched/fair: Fix CFS bandwidth hrtimer expiry type Sasha Levin
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20210714194625.55303-12-sashal@kernel.org \
--to=sashal@kernel.org \
--cc=devicetree@vger.kernel.org \
--cc=f.fainelli@gmail.com \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=rafal@milecki.pl \
--cc=stable@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).