ARM: dts: mvebu: 98dx3236: Rename nand controller node

Update the 98dx3236 SoC and dependent boards to use
"nand-controller" instead of "nand".

Signed-off-by: Chris Packham <chris.packham@alliedtelesis.co.nz>
Signed-off-by: Gregory CLEMENT <gregory.clement@bootlin.com>

diff --git a/arch/arm/boot/dts/armada-xp-98dx3236.dtsi b/arch/arm/boot/dts/armada-xp-98dx3236.dtsi
index 8d708cc224958865a3c208b1ec29c03118c0852f..eb03a5773903e21d5f0345972438260cedd0f4d3 100644 (file)
--- a/arch/arm/boot/dts/armada-xp-98dx3236.dtsi
+++ b/arch/arm/boot/dts/armada-xp-98dx3236.dtsi
@@ -189,7 +189,7 @@ xor11 {
                                };
                        };
 
-                       nand: nand@d0000 {
+                       nand_controller: nand-controller@d0000 {
                                clocks = <&dfx_coredivclk 0>;
                        };
 

diff --git a/arch/arm/boot/dts/armada-xp-db-dxbc2.dts b/arch/arm/boot/dts/armada-xp-db-dxbc2.dts
index f42fc6118b7c296c582c6a2f56d904f929f40237..944e0a9c9dac96d3c457356344340318bd360e6c 100644 (file)
--- a/arch/arm/boot/dts/armada-xp-db-dxbc2.dts
+++ b/arch/arm/boot/dts/armada-xp-db-dxbc2.dts
@@ -68,7 +68,7 @@ &uart1 {
        status = "okay";
 };
 
-&nand {
+&nand_controller {
        status = "okay";
        label = "pxa3xx_nand-0";
        num-cs = <1>;

diff --git a/arch/arm/boot/dts/armada-xp-db-xc3-24g4xg.dts b/arch/arm/boot/dts/armada-xp-db-xc3-24g4xg.dts
index 8432f517e346124cb82e0c2eed896680c022891f..d58ea48cb151d88467a2f2600224591bfd11eb82 100644 (file)
--- a/arch/arm/boot/dts/armada-xp-db-xc3-24g4xg.dts
+++ b/arch/arm/boot/dts/armada-xp-db-xc3-24g4xg.dts
@@ -67,7 +67,7 @@ &i2c0 {
        status = "okay";
 };
 
-&nand {
+&nand_controller {
        status = "okay";
        label = "pxa3xx_nand-0";
        num-cs = <1>;