diff options
| author | Robert Jarzmik <robert.jarzmik@free.fr> | 2016-04-10 21:29:59 +0200 |
|---|---|---|
| committer | Robert Jarzmik <robert.jarzmik@free.fr> | 2016-08-09 08:16:59 +0200 |
| commit | d9edae44d76a20d1b999070d911e58dca53f9906 (patch) | |
| tree | 3b84d131e86096219618485b3019be3b1c7cc761 /arch/arm/mach-pxa/pxa25x.c | |
| parent | ca5be4c678a402b7a35b2ce9a1a480b79d53f36e (diff) | |
| download | linux-d9edae44d76a20d1b999070d911e58dca53f9906.tar.gz linux-d9edae44d76a20d1b999070d911e58dca53f9906.tar.bz2 linux-d9edae44d76a20d1b999070d911e58dca53f9906.zip | |
ARM: pxa: add pxa25x device-tree support
Add a device-tree machine entry (DT_MACHINE_START) for pxa25x based
platforms.
Take the opportunity to sort the file machine descriptions by
alphabetical order.
Signed-off-by: Robert Jarzmik <robert.jarzmik@free.fr>
Diffstat (limited to 'arch/arm/mach-pxa/pxa25x.c')
| -rw-r--r-- | arch/arm/mach-pxa/pxa25x.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/arch/arm/mach-pxa/pxa25x.c b/arch/arm/mach-pxa/pxa25x.c index 3aa7acab2ccd..30b4270adc02 100644 --- a/arch/arm/mach-pxa/pxa25x.c +++ b/arch/arm/mach-pxa/pxa25x.c @@ -209,12 +209,12 @@ static int __init pxa25x_init(void) register_syscore_ops(&pxa_irq_syscore_ops); register_syscore_ops(&pxa2xx_mfp_syscore_ops); - pxa2xx_set_dmac_info(16, 40); - pxa_register_device(&pxa25x_device_gpio, &pxa25x_gpio_info); - ret = platform_add_devices(pxa25x_devices, - ARRAY_SIZE(pxa25x_devices)); - if (ret) - return ret; + if (!of_have_populated_dt()) { + pxa2xx_set_dmac_info(16, 40); + pxa_register_device(&pxa25x_device_gpio, &pxa25x_gpio_info); + ret = platform_add_devices(pxa25x_devices, + ARRAY_SIZE(pxa25x_devices)); + } } return ret; |