ARM: ixp4xx: Add device tree boot support

[linux.git] / arch / arm / mach-ixp4xx / ixp4xx_npe.c

diff --git a/arch/arm/mach-ixp4xx/ixp4xx_npe.c b/arch/arm/mach-ixp4xx/ixp4xx_npe.c
index d4eb09a62863639ebb8205e2d203d4c9d089462f..e0ce22cd9bfcfd87b95d99653c7d15d70a8a4a63 100644 (file)
--- a/arch/arm/mach-ixp4xx/ixp4xx_npe.c
+++ b/arch/arm/mach-ixp4xx/ixp4xx_npe.c
@@ -20,6 +20,7 @@
 #include <linux/io.h>
 #include <linux/kernel.h>
 #include <linux/module.h>
+#include <linux/of.h>
 #include <mach/npe.h>
 
 #define DEBUG_MSG                      0
@@ -688,6 +689,10 @@ static int __init npe_init_module(void)
 
        int i, found = 0;
 
+       /* This driver does not work with device tree */
+       if (of_have_populated_dt())
+               return -ENODEV;
+
        for (i = 0; i < NPE_COUNT; i++) {
                struct npe *npe = &npe_tab[i];
                if (!(ixp4xx_read_feature_bits() &