[PATCH] DT: if dt is available don't use s3c_arch_init

[Mateusz Krawczuk]

It prevents from executing platform code, when booting from device tree.

Signed-off-by: Mateusz Krawczuk <m.krawczuk@xxxxxxxxxxxxxxxxxxx>
Signed-off-by: Kyungmin Park <kyungmin.park@xxxxxxxxxxx>
---
 arch/arm/plat-samsung/init.c | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/arch/arm/plat-samsung/init.c b/arch/arm/plat-samsung/init.c
index aa9511b..0ace02d 100644
--- a/arch/arm/plat-samsung/init.c
+++ b/arch/arm/plat-samsung/init.c
@@ -20,6 +20,7 @@
 #include <linux/module.h>
 #include <linux/interrupt.h>
 #include <linux/ioport.h>
+#include <linux/of.h>
 #include <linux/serial_core.h>
 #include <linux/platform_device.h>
 #include <linux/of.h>
@@ -152,6 +153,8 @@ static int __init s3c_arch_init(void)
 {
 	int ret;
 
+	if (of_have_populated_dt())
+		return 0;
 	// do the correct init for cpu
 
 	if (cpu == NULL) {
-- 
1.8.1.2

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/