From fdfc09835a276e69e7a6dca6ebe921cf5a4db7db Mon Sep 17 00:00:00 2001
From: Daniel Mack <zonque@gmail.com>
Date: Wed, 25 Jul 2012 17:52:52 +0200
Subject: [PATCH] --- yaml --- r: 326697 b: refs/heads/master c:
 82ce44d104dc97f4f7fbd035ca34f723f0fb7287 h: refs/heads/master i:   326695:
 00df50668dc95f345c238f15566a72443596d016 v: v3

---
 [refs]                           | 2 +-
 trunk/arch/arm/mach-pxa/pxa3xx.c | 4 +++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index c58cdd6c16dd..e1acaef1daa5 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 089d03629b04ebe8163905a2398742b426e35085
+refs/heads/master: 82ce44d104dc97f4f7fbd035ca34f723f0fb7287
diff --git a/trunk/arch/arm/mach-pxa/pxa3xx.c b/trunk/arch/arm/mach-pxa/pxa3xx.c
index 1827d3ce2d5b..4a9d04a57de5 100644
--- a/trunk/arch/arm/mach-pxa/pxa3xx.c
+++ b/trunk/arch/arm/mach-pxa/pxa3xx.c
@@ -19,6 +19,7 @@
 #include <linux/platform_device.h>
 #include <linux/irq.h>
 #include <linux/io.h>
+#include <linux/of.h>
 #include <linux/syscore_ops.h>
 #include <linux/i2c/pxa-i2c.h>
 
@@ -479,7 +480,8 @@ static int __init pxa3xx_init(void)
 		register_syscore_ops(&pxa3xx_mfp_syscore_ops);
 		register_syscore_ops(&pxa3xx_clock_syscore_ops);
 
-		ret = platform_add_devices(devices, ARRAY_SIZE(devices));
+		if (!of_have_populated_dt())
+			ret = platform_add_devices(devices, ARRAY_SIZE(devices));
 	}
 
 	return ret;