Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 82ce44d1 authored by Daniel Mack's avatar Daniel Mack Committed by Haojian Zhuang
Browse files

ARM: pxa3xx: skip default device initialization when booting via DT 



When booting via DT, the default PXA devices must not have been probed
before, otherwise the augmented information from the device tree is
ignored.

Signed-off-by: default avatarDaniel Mack <zonque@gmail.com>
Acked-by: default avatarArnd Bergmann <arnd@arndb.de>
Signed-off-by: default avatarHaojian Zhuang <haojian.zhuang@gmail.com>
parent 089d0362

arch/arm/mach-pxa/pxa3xx.c

+3 −1
Original line number Diff line number Diff line
@@ -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,6 +480,7 @@ static int __init pxa3xx_init(void) 
		register_syscore_ops(&pxa3xx_mfp_syscore_ops);

		register_syscore_ops(&pxa3xx_clock_syscore_ops);



		if (!of_have_populated_dt())

			ret = platform_add_devices(devices, ARRAY_SIZE(devices));

	}