From: Maxime Ripard <maxime.ripard@free-electrons.com>
To: linux@maxim.org.za, Nicolas Ferre <nicolas.ferre@atmel.com>,
Jean-Christophe Plagniol-Villard <plagnioj@jcrosoft.com>,
Daniel Lezcano <daniel.lezcano@linaro.org>
Cc: Boris Brezillon <boris@free-electrons.com>,
Alexandre Belloni <alexandre.belloni@free-electrons.com>,
Thomas Petazzoni <thomas@free-electrons.com>,
linux-arm-kernel@lists.infradead.org,
linux-kernel@vger.kernel.org,
Maxime Ripard <maxime.ripard@free-electrons.com>
Subject: [PATCH v2 04/14] AT91: PIT: Use of_have_populated_dt instead of CONFIG_OF
Date: Tue, 1 Jul 2014 11:33:17 +0200 [thread overview]
Message-ID: <1404207208-14513-5-git-send-email-maxime.ripard@free-electrons.com> (raw)
In-Reply-To: <1404207208-14513-1-git-send-email-maxime.ripard@free-electrons.com>
Until now, the machines, even when CONFIG_OF was enabled, were calling
at91sam926x_ioremap_pit to try to map the PIT address using the defined
physical address.
Obviously, with DT, it's not appropriate anymore, and some code was added to
the function to deal with this case.
Unfortunately, this code was conditionned on CONFIG_OF, which can be enabled,
even though no DT was actually used, which would result in such a case, to this
code being executed, without any reason.
Moreover, the logic that was here before to bail out of the function just check
in the DT to see if the PIT node is there, which is the case in all our DTSI.
All this can be made much more straightforward just by using
of_have_populated_dt to bail out.
Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
---
arch/arm/mach-at91/at91sam926x_time.c | 10 ++--------
1 file changed, 2 insertions(+), 8 deletions(-)
diff --git a/arch/arm/mach-at91/at91sam926x_time.c b/arch/arm/mach-at91/at91sam926x_time.c
index 2e6f1a37ab90..b87a12f05540 100644
--- a/arch/arm/mach-at91/at91sam926x_time.c
+++ b/arch/arm/mach-at91/at91sam926x_time.c
@@ -279,15 +279,9 @@ void __init at91sam926x_pit_init(void)
void __init at91sam926x_ioremap_pit(u32 addr)
{
-#if defined(CONFIG_OF)
- struct device_node *np =
- of_find_matching_node(NULL, pit_timer_ids);
-
- if (np) {
- of_node_put(np);
+ if (of_have_populated_dt())
return;
- }
-#endif
+
pit_base_addr = ioremap(addr, 16);
if (!pit_base_addr)
--
2.0.0
next prev parent reply other threads:[~2014-07-01 9:35 UTC|newest]
Thread overview: 22+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-07-01 9:33 [PATCH v2 00/14] AT91: PIT: Cleanups and move to drivers/clocksource Maxime Ripard
2014-07-01 9:33 ` [PATCH v2 01/14] AT91: PIT: Follow the general coding rules Maxime Ripard
2014-07-01 9:33 ` [PATCH v2 02/14] AT91: generic.h: Add include safe guards Maxime Ripard
2014-07-01 9:33 ` [PATCH v2 03/14] AT91: PIT: Use DIV_ROUND_CLOSEST to compute the cycles Maxime Ripard
2014-07-01 9:33 ` Maxime Ripard [this message]
2014-07-01 9:33 ` [PATCH v2 05/14] AT91: PIT: Rework probe functions Maxime Ripard
2014-07-01 9:33 ` [PATCH v2 06/14] AT91: dt: Remove init_time definitions Maxime Ripard
2014-07-01 9:33 ` [PATCH v2 07/14] AT91: PIT: Use consistent exit path in probe Maxime Ripard
2014-07-01 9:33 ` [PATCH v2 08/14] AT91: PIT: Use pr_fmt Maxime Ripard
2014-07-01 9:33 ` [PATCH v2 09/14] AT91: PIT: use request_irq instead of setup_irq Maxime Ripard
2014-07-01 9:33 ` [PATCH v2 10/14] AT91: PIT: (Almost) remove the global variables Maxime Ripard
2014-07-01 9:33 ` [PATCH v2 11/14] AT91: soc: Add init_time callback Maxime Ripard
2014-07-01 9:33 ` [PATCH v2 12/14] AT91: Convert the boards to the " Maxime Ripard
2014-07-01 9:33 ` [PATCH v2 13/14] AT91: PIT: Convert to an early_platform_device Maxime Ripard
2014-07-01 9:33 ` [PATCH v2 14/14] AT91: PIT: Move the driver to drivers/clocksource Maxime Ripard
2014-07-01 9:52 ` [PATCH v2 00/14] AT91: PIT: Cleanups and move " Boris BREZILLON
2014-07-01 16:01 ` Alexandre Belloni
2014-07-10 7:51 ` Maxime Ripard
2014-07-17 9:50 ` Maxime Ripard
2014-07-17 10:31 ` Daniel Lezcano
2014-07-17 13:45 ` Maxime Ripard
2014-07-21 9:14 ` Daniel Lezcano
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=1404207208-14513-5-git-send-email-maxime.ripard@free-electrons.com \
--to=maxime.ripard@free-electrons.com \
--cc=alexandre.belloni@free-electrons.com \
--cc=boris@free-electrons.com \
--cc=daniel.lezcano@linaro.org \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux@maxim.org.za \
--cc=nicolas.ferre@atmel.com \
--cc=plagnioj@jcrosoft.com \
--cc=thomas@free-electrons.com \
/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
all inboxes | Powered by JetHome®