From: zonque@gmail.com (Daniel Mack)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH 5/7] ARM: pxa3xx: skip default device initialization when booting via DT
Date: Wed, 25 Jul 2012 18:17:44 +0200 [thread overview]
Message-ID: <1343233066-15397-6-git-send-email-zonque@gmail.com> (raw)
In-Reply-To: <1343233066-15397-1-git-send-email-zonque@gmail.com>
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: Daniel Mack <zonque@gmail.com>
---
arch/arm/mach-pxa/pxa3xx.c | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/arch/arm/mach-pxa/pxa3xx.c b/arch/arm/mach-pxa/pxa3xx.c
index 1827d3c..4a9d04a 100644
--- a/arch/arm/mach-pxa/pxa3xx.c
+++ b/arch/arm/mach-pxa/pxa3xx.c
@@ -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,7 +480,8 @@ static int __init pxa3xx_init(void)
register_syscore_ops(&pxa3xx_mfp_syscore_ops);
register_syscore_ops(&pxa3xx_clock_syscore_ops);
- ret = platform_add_devices(devices, ARRAY_SIZE(devices));
+ if (!of_have_populated_dt())
+ ret = platform_add_devices(devices, ARRAY_SIZE(devices));
}
return ret;
--
1.7.10.4
next prev parent reply other threads:[~2012-07-25 16:17 UTC|newest]
Thread overview: 19+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-07-25 16:17 [PATCH 0/7] Assorted PXA3xx DT patches Daniel Mack
2012-07-25 16:17 ` [PATCH 1/7] RTC: add DT bindings to pxa-rtc Daniel Mack
2012-07-25 17:18 ` Arnd Bergmann
2012-07-26 12:51 ` Sergei Shtylyov
2012-07-25 16:17 ` [PATCH 2/7] MMC: pxa-mci: add DT bindings Daniel Mack
2012-07-25 16:47 ` Chris Ball
2012-07-25 19:09 ` Daniel Mack
2012-07-25 16:17 ` [PATCH 3/7] MTD: pxa3xx-nand: add devicetree bindings Daniel Mack
2012-07-26 0:59 ` Marek Vasut
2012-07-26 6:30 ` Arnd Bergmann
2012-07-26 6:53 ` Daniel Mack
2012-07-26 6:33 ` Daniel Mack
2012-07-25 16:17 ` [PATCH 4/7] ARM: pxa: add devicetree code for irq handling Daniel Mack
2012-07-25 16:17 ` Daniel Mack [this message]
2012-07-25 16:17 ` [PATCH 6/7] ARM: pxa3xx: add generic DT machine code Daniel Mack
2012-07-25 17:34 ` Arnd Bergmann
2012-07-25 18:07 ` Daniel Mack
2012-07-25 19:04 ` Arnd Bergmann
2012-07-25 16:17 ` [PATCH 7/7] ARM: pxa: add .dtsi files Daniel Mack
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1343233066-15397-6-git-send-email-zonque@gmail.com \
--to=zonque@gmail.com \
--cc=linux-arm-kernel@lists.infradead.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
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).