diff options
Diffstat (limited to 'arch/arm/mach-pxa/pxa3xx.c')
-rw-r--r-- | arch/arm/mach-pxa/pxa3xx.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/arch/arm/mach-pxa/pxa3xx.c b/arch/arm/mach-pxa/pxa3xx.c index 1827d3ce2d5b..4a9d04a57de5 100644 --- a/arch/arm/mach-pxa/pxa3xx.c +++ b/arch/arm/mach-pxa/pxa3xx.c | |||
@@ -19,6 +19,7 @@ | |||
19 | #include <linux/platform_device.h> | 19 | #include <linux/platform_device.h> |
20 | #include <linux/irq.h> | 20 | #include <linux/irq.h> |
21 | #include <linux/io.h> | 21 | #include <linux/io.h> |
22 | #include <linux/of.h> | ||
22 | #include <linux/syscore_ops.h> | 23 | #include <linux/syscore_ops.h> |
23 | #include <linux/i2c/pxa-i2c.h> | 24 | #include <linux/i2c/pxa-i2c.h> |
24 | 25 | ||
@@ -479,7 +480,8 @@ static int __init pxa3xx_init(void) | |||
479 | register_syscore_ops(&pxa3xx_mfp_syscore_ops); | 480 | register_syscore_ops(&pxa3xx_mfp_syscore_ops); |
480 | register_syscore_ops(&pxa3xx_clock_syscore_ops); | 481 | register_syscore_ops(&pxa3xx_clock_syscore_ops); |
481 | 482 | ||
482 | ret = platform_add_devices(devices, ARRAY_SIZE(devices)); | 483 | if (!of_have_populated_dt()) |
484 | ret = platform_add_devices(devices, ARRAY_SIZE(devices)); | ||
483 | } | 485 | } |
484 | 486 | ||
485 | return ret; | 487 | return ret; |