Merge branch 'work.misc' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs

[sfrench/cifs-2.6.git] / arch / arm / boot / dts / armada-xp-98dx3236.dtsi

diff --git a/arch/arm/boot/dts/armada-xp-98dx3236.dtsi b/arch/arm/boot/dts/armada-xp-98dx3236.dtsi
index 8d708cc224958865a3c208b1ec29c03118c0852f..59753470cd34733dd44fb0398b7275bc2553b8eb 100644 (file)
--- a/arch/arm/boot/dts/armada-xp-98dx3236.dtsi
+++ b/arch/arm/boot/dts/armada-xp-98dx3236.dtsi
@@ -189,7 +189,7 @@
                                };
                        };
 
-                       nand: nand@d0000 {
+                       nand_controller: nand-controller@d0000 {
                                clocks = <&dfx_coredivclk 0>;
                        };
 
@@ -243,7 +243,7 @@
                        ranges = <0 MBUS_ID(0x03, 0x00) 0 0x100000>;
 
                        pp0: packet-processor@0 {
-                               compatible = "marvell,prestera-98dx3236";
+                               compatible = "marvell,prestera-98dx3236", "marvell,prestera";
                                reg = <0 0x4000000>;
                                interrupts = <33>, <34>, <35>;
                                dfx = <&dfx>;