提交 ddc2ea9f 编写于 作者: R Rafał Miłecki 提交者: Zheng Zengkai

ARM: NSP: dts: fix NAND nodes names

stable inclusion
from stable-5.10.53
commit b5fc6b9ab427839fef07a427fe4a8af7067ebfcd
bugzilla: 175574 https://gitee.com/openeuler/kernel/issues/I4DTUX

Reference: https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?id=b5fc6b9ab427839fef07a427fe4a8af7067ebfcd

--------------------------------

[ Upstream commit 0484594b ]

This matches nand-controller.yaml requirements.
Signed-off-by: NRafał Miłecki <rafal@milecki.pl>
Signed-off-by: NFlorian Fainelli <f.fainelli@gmail.com>
Signed-off-by: NSasha Levin <sashal@kernel.org>
Signed-off-by: NChen Jun <chenjun102@huawei.com>
Acked-by: NWeilong Chen <chenweilong@huawei.com>
Signed-off-by: NChen Jun <chenjun102@huawei.com>
Signed-off-by: NZheng Zengkai <zhengzengkai@huawei.com>
上级 d3eb733c
...@@ -269,7 +269,7 @@ ...@@ -269,7 +269,7 @@
dma-coherent; dma-coherent;
}; };
nand: nand@26000 { nand_controller: nand-controller@26000 {
compatible = "brcm,nand-iproc", "brcm,brcmnand-v6.1"; compatible = "brcm,nand-iproc", "brcm,brcmnand-v6.1";
reg = <0x026000 0x600>, reg = <0x026000 0x600>,
<0x11b408 0x600>, <0x11b408 0x600>,
......
...@@ -74,8 +74,8 @@ ...@@ -74,8 +74,8 @@
status = "okay"; status = "okay";
}; };
&nand { &nand_controller {
nandcs@0 { nand@0 {
compatible = "brcm,nandcs"; compatible = "brcm,nandcs";
reg = <0>; reg = <0>;
nand-on-flash-bbt; nand-on-flash-bbt;
......
...@@ -74,8 +74,8 @@ ...@@ -74,8 +74,8 @@
status = "okay"; status = "okay";
}; };
&nand { &nand_controller {
nandcs@0 { nand@0 {
compatible = "brcm,nandcs"; compatible = "brcm,nandcs";
reg = <0>; reg = <0>;
nand-on-flash-bbt; nand-on-flash-bbt;
......
...@@ -90,8 +90,8 @@ ...@@ -90,8 +90,8 @@
}; };
}; };
&nand { &nand_controller {
nandcs@0 { nand@0 {
compatible = "brcm,nandcs"; compatible = "brcm,nandcs";
reg = <0>; reg = <0>;
nand-on-flash-bbt; nand-on-flash-bbt;
......
...@@ -78,8 +78,8 @@ ...@@ -78,8 +78,8 @@
status = "okay"; status = "okay";
}; };
&nand { &nand_controller {
nandcs@0 { nand@0 {
compatible = "brcm,nandcs"; compatible = "brcm,nandcs";
reg = <0>; reg = <0>;
nand-on-flash-bbt; nand-on-flash-bbt;
......
...@@ -78,8 +78,8 @@ ...@@ -78,8 +78,8 @@
status = "okay"; status = "okay";
}; };
&nand { &nand_controller {
nandcs@0 { nand@0 {
compatible = "brcm,nandcs"; compatible = "brcm,nandcs";
reg = <0>; reg = <0>;
nand-on-flash-bbt; nand-on-flash-bbt;
......
...@@ -89,8 +89,8 @@ ...@@ -89,8 +89,8 @@
status = "okay"; status = "okay";
}; };
&nand { &nand_controller {
nandcs@0 { nand@0 {
compatible = "brcm,nandcs"; compatible = "brcm,nandcs";
reg = <0>; reg = <0>;
nand-on-flash-bbt; nand-on-flash-bbt;
......
...@@ -68,8 +68,8 @@ ...@@ -68,8 +68,8 @@
status = "okay"; status = "okay";
}; };
&nand { &nand_controller {
nandcs@0 { nand@0 {
compatible = "brcm,nandcs"; compatible = "brcm,nandcs";
reg = <0>; reg = <0>;
nand-on-flash-bbt; nand-on-flash-bbt;
......
...@@ -74,8 +74,8 @@ ...@@ -74,8 +74,8 @@
status = "okay"; status = "okay";
}; };
&nand { &nand_controller {
nandcs@0 { nand@0 {
compatible = "brcm,nandcs"; compatible = "brcm,nandcs";
reg = <0>; reg = <0>;
nand-on-flash-bbt; nand-on-flash-bbt;
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册