* [PATCH] ARM: pxa: pxa27x skip default device initialization with DT
@ 2015-02-07 21:18 Robert Jarzmik
2015-02-07 22:32 ` Daniel Mack
0 siblings, 1 reply; 4+ messages in thread
From: Robert Jarzmik @ 2015-02-07 21:18 UTC (permalink / raw)
To: linux-arm-kernel
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>
---
arch/arm/mach-pxa/pxa27x.c | 8 ++++++--
1 file changed, 6 insertions(+), 2 deletions(-)
diff --git a/arch/arm/mach-pxa/pxa27x.c b/arch/arm/mach-pxa/pxa27x.c
index 0485248..b5abdeb 100644
--- a/arch/arm/mach-pxa/pxa27x.c
+++ b/arch/arm/mach-pxa/pxa27x.c
@@ -307,8 +307,12 @@ static int __init pxa27x_init(void)
register_syscore_ops(&pxa_irq_syscore_ops);
register_syscore_ops(&pxa2xx_mfp_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;
--
2.1.0
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [PATCH] ARM: pxa: pxa27x skip default device initialization with DT
2015-02-07 21:18 [PATCH] ARM: pxa: pxa27x skip default device initialization with DT Robert Jarzmik
@ 2015-02-07 22:32 ` Daniel Mack
2015-02-14 21:36 ` Robert Jarzmik
0 siblings, 1 reply; 4+ messages in thread
From: Daniel Mack @ 2015-02-07 22:32 UTC (permalink / raw)
To: linux-arm-kernel
On 02/07/2015 10:18 PM, Robert Jarzmik wrote:
> 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>
Looks good to me - thanks!
Acked-by: Daniel Mack <daniel@zonque.org>
> ---
> arch/arm/mach-pxa/pxa27x.c | 8 ++++++--
> 1 file changed, 6 insertions(+), 2 deletions(-)
>
> diff --git a/arch/arm/mach-pxa/pxa27x.c b/arch/arm/mach-pxa/pxa27x.c
> index 0485248..b5abdeb 100644
> --- a/arch/arm/mach-pxa/pxa27x.c
> +++ b/arch/arm/mach-pxa/pxa27x.c
> @@ -307,8 +307,12 @@ static int __init pxa27x_init(void)
> register_syscore_ops(&pxa_irq_syscore_ops);
> register_syscore_ops(&pxa2xx_mfp_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;
>
^ permalink raw reply [flat|nested] 4+ messages in thread
* [PATCH] ARM: pxa: pxa27x skip default device initialization with DT
2015-02-07 22:32 ` Daniel Mack
@ 2015-02-14 21:36 ` Robert Jarzmik
0 siblings, 0 replies; 4+ messages in thread
From: Robert Jarzmik @ 2015-02-14 21:36 UTC (permalink / raw)
To: linux-arm-kernel
Daniel Mack <daniel@zonque.org> writes:
> On 02/07/2015 10:18 PM, Robert Jarzmik wrote:
>> 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>
>
> Looks good to me - thanks!
>
> Acked-by: Daniel Mack <daniel@zonque.org>
Thanks, queued to pxa/for-next.
Cheers.
--
Robert
^ permalink raw reply [flat|nested] 4+ messages in thread
* [PATCH] ARM: pxa: pxa27x skip default device initialization with DT
@ 2015-01-31 22:36 Robert Jarzmik
0 siblings, 0 replies; 4+ messages in thread
From: Robert Jarzmik @ 2015-01-31 22:36 UTC (permalink / raw)
To: linux-arm-kernel
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>
---
arch/arm/mach-pxa/pxa27x.c | 8 ++++++--
1 file changed, 6 insertions(+), 2 deletions(-)
diff --git a/arch/arm/mach-pxa/pxa27x.c b/arch/arm/mach-pxa/pxa27x.c
index 0485248..b5abdeb 100644
--- a/arch/arm/mach-pxa/pxa27x.c
+++ b/arch/arm/mach-pxa/pxa27x.c
@@ -307,8 +307,12 @@ static int __init pxa27x_init(void)
register_syscore_ops(&pxa_irq_syscore_ops);
register_syscore_ops(&pxa2xx_mfp_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;
--
2.1.0
^ permalink raw reply related [flat|nested] 4+ messages in thread
end of thread, other threads:[~2015-02-14 21:36 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2015-02-07 21:18 [PATCH] ARM: pxa: pxa27x skip default device initialization with DT Robert Jarzmik
2015-02-07 22:32 ` Daniel Mack
2015-02-14 21:36 ` Robert Jarzmik
-- strict thread matches above, loose matches on Subject: below --
2015-01-31 22:36 Robert Jarzmik
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).