* [PATCH] clocksource: kona: adapt to CLOCKSOURCE_OF_DECLARE change
2013-04-23 15:54 [PATCH] ARM: allmodconfig regressions in linux-next Arnd Bergmann
@ 2013-04-23 15:54 ` Arnd Bergmann
2013-04-26 15:42 ` Christian Daudt
0 siblings, 1 reply; 5+ messages in thread
From: Arnd Bergmann @ 2013-04-23 15:54 UTC (permalink / raw)
To: linux-arm-kernel
The CLOCKSOURCE_OF_DECLARE functions now take a device_node pointer
as their argument, as of the clksrc/cleanup branch in arm-soc.
This patch adapts the bcm_kona_timer driver to the new interface.
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Cc: Christian Daudt <csd@broadcom.com>
Cc: John Stultz <john.stultz@linaro.org>
---
drivers/clocksource/bcm_kona_timer.c | 15 ++++-----------
1 file changed, 4 insertions(+), 11 deletions(-)
diff --git a/drivers/clocksource/bcm_kona_timer.c b/drivers/clocksource/bcm_kona_timer.c
index 350f493..ba3d859 100644
--- a/drivers/clocksource/bcm_kona_timer.c
+++ b/drivers/clocksource/bcm_kona_timer.c
@@ -103,16 +103,10 @@ static const struct of_device_id bcm_timer_ids[] __initconst = {
{},
};
-static void __init kona_timers_init(void)
+static void __init kona_timers_init(struct device_node *node)
{
- struct device_node *node;
u32 freq;
- node = of_find_matching_node(NULL, bcm_timer_ids);
-
- if (!node)
- panic("No timer");
-
if (!of_property_read_u32(node, "clock-frequency", &freq))
arch_timer_rate = freq;
else
@@ -199,13 +193,12 @@ static struct irqaction kona_timer_irq = {
.handler = kona_timer_interrupt,
};
-static void __init kona_timer_init(void)
+static void __init kona_timer_init(struct device_node *node)
{
- kona_timers_init();
+ kona_timers_init(node);
kona_timer_clockevents_init();
setup_irq(timers.tmr_irq, &kona_timer_irq);
kona_timer_set_next_event((arch_timer_rate / HZ), NULL);
}
-CLOCKSOURCE_OF_DECLARE(bcm_kona, "bcm,kona-timer",
- kona_timer_init);
+CLOCKSOURCE_OF_DECLARE(bcm_kona, "bcm,kona-timer", kona_timer_init);
--
1.8.1.2
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [PATCH] clocksource: kona: adapt to CLOCKSOURCE_OF_DECLARE change
2013-04-23 15:54 ` [PATCH] clocksource: kona: adapt to CLOCKSOURCE_OF_DECLARE change Arnd Bergmann
@ 2013-04-26 15:42 ` Christian Daudt
0 siblings, 0 replies; 5+ messages in thread
From: Christian Daudt @ 2013-04-26 15:42 UTC (permalink / raw)
To: linux-arm-kernel
On 13-04-23 08:54 AM, Arnd Bergmann wrote:
> The CLOCKSOURCE_OF_DECLARE functions now take a device_node pointer
> as their argument, as of the clksrc/cleanup branch in arm-soc.
> This patch adapts the bcm_kona_timer driver to the new interface.
>
> Signed-off-by: Arnd Bergmann <arnd@arndb.de>
> Cc: Christian Daudt <csd@broadcom.com>
> Cc: John Stultz <john.stultz@linaro.org>
> ---
> drivers/clocksource/bcm_kona_timer.c | 15 ++++-----------
> 1 file changed, 4 insertions(+), 11 deletions(-)
>
> diff --git a/drivers/clocksource/bcm_kona_timer.c b/drivers/clocksource/bcm_kona_timer.c
> ...
>
> -CLOCKSOURCE_OF_DECLARE(bcm_kona, "bcm,kona-timer",
> - kona_timer_init);
> +CLOCKSOURCE_OF_DECLARE(bcm_kona, "bcm,kona-timer", kona_timer_init);
acked-by: Christian Daudt <csd@broadcom.com>
tested-by: Christian Daudt <csd@broadcom.com>
thanks,
csd
^ permalink raw reply [flat|nested] 5+ messages in thread
* [PATCH] clocksource: kona: adapt to CLOCKSOURCE_OF_DECLARE change
@ 2013-05-31 20:59 Arnd Bergmann
2013-06-11 18:47 ` Christian Daudt
0 siblings, 1 reply; 5+ messages in thread
From: Arnd Bergmann @ 2013-05-31 20:59 UTC (permalink / raw)
To: linux-arm-kernel
The CLOCKSOURCE_OF_DECLARE functions now take a device_node pointer
as their argument, as of the clksrc/cleanup branch in arm-soc.
This patch adapts the bcm_kona_timer driver to the new interface.
This causes an annoying but harmless build-time warning, it would
be nice to have this fixed in 3.10.
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Cc: Christian Daudt <csd@broadcom.com>
Cc: John Stultz <john.stultz@linaro.org>
---
diff --git a/drivers/clocksource/bcm_kona_timer.c b/drivers/clocksource/bcm_kona_timer.c
index 350f493..ba3d859 100644
--- a/drivers/clocksource/bcm_kona_timer.c
+++ b/drivers/clocksource/bcm_kona_timer.c
@@ -103,16 +103,10 @@ static const struct of_device_id bcm_timer_ids[] __initconst = {
{},
};
-static void __init kona_timers_init(void)
+static void __init kona_timers_init(struct device_node *node)
{
- struct device_node *node;
u32 freq;
- node = of_find_matching_node(NULL, bcm_timer_ids);
-
- if (!node)
- panic("No timer");
-
if (!of_property_read_u32(node, "clock-frequency", &freq))
arch_timer_rate = freq;
else
@@ -199,13 +193,12 @@ static struct irqaction kona_timer_irq = {
.handler = kona_timer_interrupt,
};
-static void __init kona_timer_init(void)
+static void __init kona_timer_init(struct device_node *node)
{
- kona_timers_init();
+ kona_timers_init(node);
kona_timer_clockevents_init();
setup_irq(timers.tmr_irq, &kona_timer_irq);
kona_timer_set_next_event((arch_timer_rate / HZ), NULL);
}
-CLOCKSOURCE_OF_DECLARE(bcm_kona, "bcm,kona-timer",
- kona_timer_init);
+CLOCKSOURCE_OF_DECLARE(bcm_kona, "bcm,kona-timer", kona_timer_init);
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [PATCH] clocksource: kona: adapt to CLOCKSOURCE_OF_DECLARE change
2013-05-31 20:59 [PATCH] clocksource: kona: adapt to CLOCKSOURCE_OF_DECLARE change Arnd Bergmann
@ 2013-06-11 18:47 ` Christian Daudt
2013-06-19 23:47 ` Arnd Bergmann
0 siblings, 1 reply; 5+ messages in thread
From: Christian Daudt @ 2013-06-11 18:47 UTC (permalink / raw)
To: linux-arm-kernel
On 13-05-31 01:59 PM, Arnd Bergmann wrote:
> The CLOCKSOURCE_OF_DECLARE functions now take a device_node pointer
> as their argument, as of the clksrc/cleanup branch in arm-soc.
> This patch adapts the bcm_kona_timer driver to the new interface.
>
> This causes an annoying but harmless build-time warning, it would
> be nice to have this fixed in 3.10.
>
> Signed-off-by: Arnd Bergmann <arnd@arndb.de>
> Cc: Christian Daudt <csd@broadcom.com>
> Cc: John Stultz <john.stultz@linaro.org>
> ---
> diff --git a/drivers/clocksource/bcm_kona_timer.c b/drivers/clocksource/bcm_kona_timer.c
> index 350f493..ba3d859 100644
> --- a/drivers/clocksource/bcm_kona_timer.c
> +++ b/drivers/clocksource/bcm_kona_timer.c
> @@ -103,16 +103,10 @@ static const struct of_device_id bcm_timer_ids[] __initconst = {
> {},
> };
>
> -static void __init kona_timers_init(void)
> +static void __init kona_timers_init(struct device_node *node)
> {
> - struct device_node *node;
> u32 freq;
>
> - node = of_find_matching_node(NULL, bcm_timer_ids);
> -
> - if (!node)
> - panic("No timer");
> -
> if (!of_property_read_u32(node, "clock-frequency", &freq))
> arch_timer_rate = freq;
> else
> @@ -199,13 +193,12 @@ static struct irqaction kona_timer_irq = {
> .handler = kona_timer_interrupt,
> };
>
> -static void __init kona_timer_init(void)
> +static void __init kona_timer_init(struct device_node *node)
> {
> - kona_timers_init();
> + kona_timers_init(node);
> kona_timer_clockevents_init();
> setup_irq(timers.tmr_irq, &kona_timer_irq);
> kona_timer_set_next_event((arch_timer_rate / HZ), NULL);
> }
>
> -CLOCKSOURCE_OF_DECLARE(bcm_kona, "bcm,kona-timer",
> - kona_timer_init);
> +CLOCKSOURCE_OF_DECLARE(bcm_kona, "bcm,kona-timer", kona_timer_init);
>
>
Acked-by: Christian Daudt <csd@broadcom.com>
Do you want this for 3.10 or should I add to my 3.11 tree ?
Thanks,
csd
^ permalink raw reply [flat|nested] 5+ messages in thread
* [PATCH] clocksource: kona: adapt to CLOCKSOURCE_OF_DECLARE change
2013-06-11 18:47 ` Christian Daudt
@ 2013-06-19 23:47 ` Arnd Bergmann
0 siblings, 0 replies; 5+ messages in thread
From: Arnd Bergmann @ 2013-06-19 23:47 UTC (permalink / raw)
To: linux-arm-kernel
On Tuesday 11 June 2013, Christian Daudt wrote:
> >
> Acked-by: Christian Daudt <csd@broadcom.com>
>
> Do you want this for 3.10 or should I add to my 3.11 tree ?
I've applied it to the next/fixes-non-critical branch with your ack now,
scheduled for 3.11.
Arnd
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2013-06-19 23:47 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2013-05-31 20:59 [PATCH] clocksource: kona: adapt to CLOCKSOURCE_OF_DECLARE change Arnd Bergmann
2013-06-11 18:47 ` Christian Daudt
2013-06-19 23:47 ` Arnd Bergmann
-- strict thread matches above, loose matches on Subject: below --
2013-04-23 15:54 [PATCH] ARM: allmodconfig regressions in linux-next Arnd Bergmann
2013-04-23 15:54 ` [PATCH] clocksource: kona: adapt to CLOCKSOURCE_OF_DECLARE change Arnd Bergmann
2013-04-26 15:42 ` Christian Daudt
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).