diff options
| author | Robert Jarzmik <robert.jarzmik@free.fr> | 2015-02-07 22:18:34 +0100 |
|---|---|---|
| committer | Robert Jarzmik <robert.jarzmik@free.fr> | 2015-05-12 23:26:39 +0200 |
| commit | 24e32a5528fb5f398f0844759568e14f2c7ed3e9 (patch) | |
| tree | f0ebf5f9297f783adaa66b5ff7526890688ff98f /arch/arm/mach-pxa | |
| parent | clk: pxa: add missing pxa27x clocks for Irda and sa1100-rtc (diff) | |
| download | linux-24e32a5528fb5f398f0844759568e14f2c7ed3e9.tar.xz linux-24e32a5528fb5f398f0844759568e14f2c7ed3e9.zip | |
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 82ce44d104dc ("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>
Diffstat (limited to 'arch/arm/mach-pxa')
| -rw-r--r-- | arch/arm/mach-pxa/pxa27x.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/arch/arm/mach-pxa/pxa27x.c b/arch/arm/mach-pxa/pxa27x.c index af423a48c2e3..a40f2ac80199 100644 --- a/arch/arm/mach-pxa/pxa27x.c +++ b/arch/arm/mach-pxa/pxa27x.c @@ -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; |