Commit 24e32a55 authored Feb 07, 2015 by Robert Jarzmik

ARM: pxa: pxa27x skip default device initialization with 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.

This is the twin commit of commit 82ce44d1 ("ARM: pxa3xx: skip
default device initialization when booting via DT").

Signed-off-by: Robert Jarzmik <robert.jarzmik@free.fr>
Acked-by: Daniel Mack <daniel@zonque.org>

parent 8b6d1034

arch/arm/mach-pxa/pxa27x.c

+6 −2

Original line number	Diff line number	Diff line
		@@ -477,8 +477,12 @@ static int __init pxa27x_init(void)
		register_syscore_ops(&pxa2xx_mfp_syscore_ops);
		register_syscore_ops(&pxa2xx_clock_syscore_ops);

		pxa_register_device(&pxa27x_device_gpio, &pxa27x_gpio_info);
		ret = platform_add_devices(devices, ARRAY_SIZE(devices));
		if (!of_have_populated_dt()) {
		pxa_register_device(&pxa27x_device_gpio,
		&pxa27x_gpio_info);
		ret = platform_add_devices(devices,
		ARRAY_SIZE(devices));
		}
		}

		return ret;