Merge tag 'soc-for-linus-3' of git://git.kernel.org/pub/scm/linux/kernel/git/arm...

[linux-2.6-block.git] / arch / arm / mach-imx / src.c

diff --git a/arch/arm/mach-imx/src.c b/arch/arm/mach-imx/src.c
index 4e0236c89c5ed2a3dbf8870b48ccb641ae6c2b80..10a6b1a8c5acee611c2ae0c74766866b70cffd67 100644 (file)
--- a/arch/arm/mach-imx/src.c
+++ b/arch/arm/mach-imx/src.c
@@ -17,6 +17,7 @@
 #include <linux/reset-controller.h>
 #include <linux/smp.h>
 #include <asm/smp_plat.h>
+#include "common.h"
 
 #define SRC_SCR                                0x000
 #define SRC_GPR1                       0x020
@@ -133,7 +134,9 @@ void __init imx_src_init(void)
        struct device_node *np;
        u32 val;
 
-       np = of_find_compatible_node(NULL, NULL, "fsl,imx6q-src");
+       np = of_find_compatible_node(NULL, NULL, "fsl,imx51-src");
+       if (!np)
+               return;
        src_base = of_iomap(np, 0);
        WARN_ON(!src_base);