* [PATCH 2/2] clksrc: delete nomadik MTU non-DT boot path
@ 2013-11-19 21:28 Linus Walleij
2013-11-19 22:44 ` Daniel Lezcano
2013-11-20 8:56 ` Lee Jones
0 siblings, 2 replies; 7+ messages in thread
From: Linus Walleij @ 2013-11-19 21:28 UTC (permalink / raw)
To: linux-arm-kernel
Both platforms using the MTU (Nomadik and Ux500) have now been
converted to use device tree exclusively, thus let us delete
this platform data header and make this driver a fully
self-contained DT-only driver.
Cc: Daniel Lezcano <daniel.lezcano@linaro.org>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: Lee Jones <lee.jones@linaro.org>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
---
Daniel/tglx: seeking an ACK from either of you guys to take this
in the ux500-devicetree branch where the last user is deleted.
---
drivers/clocksource/nomadik-mtu.c | 23 +++++-----------------
.../linux/platform_data/clocksource-nomadik-mtu.h | 9 ---------
2 files changed, 5 insertions(+), 27 deletions(-)
delete mode 100644 include/linux/platform_data/clocksource-nomadik-mtu.h
diff --git a/drivers/clocksource/nomadik-mtu.c b/drivers/clocksource/nomadik-mtu.c
index ed7b73b508e0..f00b5c9ce8b6 100644
--- a/drivers/clocksource/nomadik-mtu.c
+++ b/drivers/clocksource/nomadik-mtu.c
@@ -20,7 +20,6 @@
#include <linux/jiffies.h>
#include <linux/delay.h>
#include <linux/err.h>
-#include <linux/platform_data/clocksource-nomadik-mtu.h>
#include <linux/sched_clock.h>
#include <asm/mach/time.h>
@@ -103,7 +102,7 @@ static int nmdk_clkevt_next(unsigned long evt, struct clock_event_device *ev)
return 0;
}
-void nmdk_clkevt_reset(void)
+static void nmdk_clkevt_reset(void)
{
if (clkevt_periodic) {
/* Timer: configure load and background-load, and fire it up */
@@ -144,7 +143,7 @@ static void nmdk_clkevt_mode(enum clock_event_mode mode,
}
}
-void nmdk_clksrc_reset(void)
+static void nmdk_clksrc_reset(void)
{
/* Disable */
writel(0, mtu_base + MTU_CR(0));
@@ -192,8 +191,8 @@ static struct irqaction nmdk_timer_irq = {
.dev_id = &nmdk_clkevt,
};
-static void __init __nmdk_timer_init(void __iomem *base, int irq,
- struct clk *pclk, struct clk *clk)
+static void __init nmdk_timer_init(void __iomem *base, int irq,
+ struct clk *pclk, struct clk *clk)
{
unsigned long rate;
@@ -245,18 +244,6 @@ static void __init __nmdk_timer_init(void __iomem *base, int irq,
register_current_timer_delay(&mtu_delay_timer);
}
-void __init nmdk_timer_init(void __iomem *base, int irq)
-{
- struct clk *clk0, *pclk0;
-
- pclk0 = clk_get_sys("mtu0", "apb_pclk");
- BUG_ON(IS_ERR(pclk0));
- clk0 = clk_get_sys("mtu0", NULL);
- BUG_ON(IS_ERR(clk0));
-
- __nmdk_timer_init(base, irq, pclk0, clk0);
-}
-
static void __init nmdk_timer_of_init(struct device_node *node)
{
struct clk *pclk;
@@ -280,7 +267,7 @@ static void __init nmdk_timer_of_init(struct device_node *node)
if (irq <= 0)
panic("Can't parse IRQ");
- __nmdk_timer_init(base, irq, pclk, clk);
+ nmdk_timer_init(base, irq, pclk, clk);
}
CLOCKSOURCE_OF_DECLARE(nomadik_mtu, "st,nomadik-mtu",
nmdk_timer_of_init);
diff --git a/include/linux/platform_data/clocksource-nomadik-mtu.h b/include/linux/platform_data/clocksource-nomadik-mtu.h
deleted file mode 100644
index 80088973b734..000000000000
--- a/include/linux/platform_data/clocksource-nomadik-mtu.h
+++ /dev/null
@@ -1,9 +0,0 @@
-#ifndef __PLAT_MTU_H
-#define __PLAT_MTU_H
-
-void nmdk_timer_init(void __iomem *base, int irq);
-void nmdk_clkevt_reset(void);
-void nmdk_clksrc_reset(void);
-
-#endif /* __PLAT_MTU_H */
-
--
1.8.3.1
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [PATCH 2/2] clksrc: delete nomadik MTU non-DT boot path
2013-11-19 21:28 [PATCH 2/2] clksrc: delete nomadik MTU non-DT boot path Linus Walleij
@ 2013-11-19 22:44 ` Daniel Lezcano
2013-11-20 8:52 ` Lee Jones
2013-11-20 8:56 ` Lee Jones
1 sibling, 1 reply; 7+ messages in thread
From: Daniel Lezcano @ 2013-11-19 22:44 UTC (permalink / raw)
To: linux-arm-kernel
On 11/19/2013 10:28 PM, Linus Walleij wrote:
> Both platforms using the MTU (Nomadik and Ux500) have now been
> converted to use device tree exclusively, thus let us delete
> this platform data header and make this driver a fully
> self-contained DT-only driver.
>
> Cc: Daniel Lezcano <daniel.lezcano@linaro.org>
> Cc: Thomas Gleixner <tglx@linutronix.de>
> Cc: Lee Jones <lee.jones@linaro.org>
> Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
Acked-by: Daniel Lezcano <daniel.lezcano@linaro.org>
A sidenote: there is a comment in arch/arm/mach-ux500/timer.c
"/* TODO: Once MTU has been DT:ed place code above into else. */"
but I did not see any changes related to this TODO.
> ---
> Daniel/tglx: seeking an ACK from either of you guys to take this
> in the ux500-devicetree branch where the last user is deleted.
> ---
> drivers/clocksource/nomadik-mtu.c | 23 +++++-----------------
> .../linux/platform_data/clocksource-nomadik-mtu.h | 9 ---------
> 2 files changed, 5 insertions(+), 27 deletions(-)
> delete mode 100644 include/linux/platform_data/clocksource-nomadik-mtu.h
>
> diff --git a/drivers/clocksource/nomadik-mtu.c b/drivers/clocksource/nomadik-mtu.c
> index ed7b73b508e0..f00b5c9ce8b6 100644
> --- a/drivers/clocksource/nomadik-mtu.c
> +++ b/drivers/clocksource/nomadik-mtu.c
> @@ -20,7 +20,6 @@
> #include <linux/jiffies.h>
> #include <linux/delay.h>
> #include <linux/err.h>
> -#include <linux/platform_data/clocksource-nomadik-mtu.h>
> #include <linux/sched_clock.h>
> #include <asm/mach/time.h>
>
> @@ -103,7 +102,7 @@ static int nmdk_clkevt_next(unsigned long evt, struct clock_event_device *ev)
> return 0;
> }
>
> -void nmdk_clkevt_reset(void)
> +static void nmdk_clkevt_reset(void)
> {
> if (clkevt_periodic) {
> /* Timer: configure load and background-load, and fire it up */
> @@ -144,7 +143,7 @@ static void nmdk_clkevt_mode(enum clock_event_mode mode,
> }
> }
>
> -void nmdk_clksrc_reset(void)
> +static void nmdk_clksrc_reset(void)
> {
> /* Disable */
> writel(0, mtu_base + MTU_CR(0));
> @@ -192,8 +191,8 @@ static struct irqaction nmdk_timer_irq = {
> .dev_id = &nmdk_clkevt,
> };
>
> -static void __init __nmdk_timer_init(void __iomem *base, int irq,
> - struct clk *pclk, struct clk *clk)
> +static void __init nmdk_timer_init(void __iomem *base, int irq,
> + struct clk *pclk, struct clk *clk)
> {
> unsigned long rate;
>
> @@ -245,18 +244,6 @@ static void __init __nmdk_timer_init(void __iomem *base, int irq,
> register_current_timer_delay(&mtu_delay_timer);
> }
>
> -void __init nmdk_timer_init(void __iomem *base, int irq)
> -{
> - struct clk *clk0, *pclk0;
> -
> - pclk0 = clk_get_sys("mtu0", "apb_pclk");
> - BUG_ON(IS_ERR(pclk0));
> - clk0 = clk_get_sys("mtu0", NULL);
> - BUG_ON(IS_ERR(clk0));
> -
> - __nmdk_timer_init(base, irq, pclk0, clk0);
> -}
> -
> static void __init nmdk_timer_of_init(struct device_node *node)
> {
> struct clk *pclk;
> @@ -280,7 +267,7 @@ static void __init nmdk_timer_of_init(struct device_node *node)
> if (irq <= 0)
> panic("Can't parse IRQ");
>
> - __nmdk_timer_init(base, irq, pclk, clk);
> + nmdk_timer_init(base, irq, pclk, clk);
> }
> CLOCKSOURCE_OF_DECLARE(nomadik_mtu, "st,nomadik-mtu",
> nmdk_timer_of_init);
> diff --git a/include/linux/platform_data/clocksource-nomadik-mtu.h b/include/linux/platform_data/clocksource-nomadik-mtu.h
> deleted file mode 100644
> index 80088973b734..000000000000
> --- a/include/linux/platform_data/clocksource-nomadik-mtu.h
> +++ /dev/null
> @@ -1,9 +0,0 @@
> -#ifndef __PLAT_MTU_H
> -#define __PLAT_MTU_H
> -
> -void nmdk_timer_init(void __iomem *base, int irq);
> -void nmdk_clkevt_reset(void);
> -void nmdk_clksrc_reset(void);
> -
> -#endif /* __PLAT_MTU_H */
> -
>
--
<http://www.linaro.org/> Linaro.org ? Open source software for ARM SoCs
Follow Linaro: <http://www.facebook.com/pages/Linaro> Facebook |
<http://twitter.com/#!/linaroorg> Twitter |
<http://www.linaro.org/linaro-blog/> Blog
^ permalink raw reply [flat|nested] 7+ messages in thread
* [PATCH 2/2] clksrc: delete nomadik MTU non-DT boot path
2013-11-19 22:44 ` Daniel Lezcano
@ 2013-11-20 8:52 ` Lee Jones
2013-11-20 8:59 ` Daniel Lezcano
0 siblings, 1 reply; 7+ messages in thread
From: Lee Jones @ 2013-11-20 8:52 UTC (permalink / raw)
To: linux-arm-kernel
On Tue, 19 Nov 2013, Daniel Lezcano wrote:
> On 11/19/2013 10:28 PM, Linus Walleij wrote:
> >Both platforms using the MTU (Nomadik and Ux500) have now been
> >converted to use device tree exclusively, thus let us delete
> >this platform data header and make this driver a fully
> >self-contained DT-only driver.
> >
> >Cc: Daniel Lezcano <daniel.lezcano@linaro.org>
> >Cc: Thomas Gleixner <tglx@linutronix.de>
> >Cc: Lee Jones <lee.jones@linaro.org>
> >Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
>
> Acked-by: Daniel Lezcano <daniel.lezcano@linaro.org>
>
> A sidenote: there is a comment in arch/arm/mach-ux500/timer.c
> "/* TODO: Once MTU has been DT:ed place code above into else. */"
> but I did not see any changes related to this TODO.
You mean similar to this one:
https://lkml.org/lkml/2013/11/6/118
--
Lee Jones
Linaro STMicroelectronics Landing Team Lead
Linaro.org ? Open source software for ARM SoCs
Follow Linaro: Facebook | Twitter | Blog
^ permalink raw reply [flat|nested] 7+ messages in thread
* [PATCH 2/2] clksrc: delete nomadik MTU non-DT boot path
2013-11-19 21:28 [PATCH 2/2] clksrc: delete nomadik MTU non-DT boot path Linus Walleij
2013-11-19 22:44 ` Daniel Lezcano
@ 2013-11-20 8:56 ` Lee Jones
1 sibling, 0 replies; 7+ messages in thread
From: Lee Jones @ 2013-11-20 8:56 UTC (permalink / raw)
To: linux-arm-kernel
On Tue, 19 Nov 2013, Linus Walleij wrote:
> Both platforms using the MTU (Nomadik and Ux500) have now been
> converted to use device tree exclusively, thus let us delete
> this platform data header and make this driver a fully
> self-contained DT-only driver.
>
> Cc: Daniel Lezcano <daniel.lezcano@linaro.org>
> Cc: Thomas Gleixner <tglx@linutronix.de>
> Cc: Lee Jones <lee.jones@linaro.org>
> Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
Acked-by: Lee Jones <lee.jones@linaro.org>
--
Lee Jones
Linaro STMicroelectronics Landing Team Lead
Linaro.org ? Open source software for ARM SoCs
Follow Linaro: Facebook | Twitter | Blog
^ permalink raw reply [flat|nested] 7+ messages in thread
* [PATCH 2/2] clksrc: delete nomadik MTU non-DT boot path
2013-11-20 8:52 ` Lee Jones
@ 2013-11-20 8:59 ` Daniel Lezcano
2013-11-20 9:01 ` Linus Walleij
0 siblings, 1 reply; 7+ messages in thread
From: Daniel Lezcano @ 2013-11-20 8:59 UTC (permalink / raw)
To: linux-arm-kernel
On 11/20/2013 09:52 AM, Lee Jones wrote:
> On Tue, 19 Nov 2013, Daniel Lezcano wrote:
>
>> On 11/19/2013 10:28 PM, Linus Walleij wrote:
>>> Both platforms using the MTU (Nomadik and Ux500) have now been
>>> converted to use device tree exclusively, thus let us delete
>>> this platform data header and make this driver a fully
>>> self-contained DT-only driver.
>>>
>>> Cc: Daniel Lezcano <daniel.lezcano@linaro.org>
>>> Cc: Thomas Gleixner <tglx@linutronix.de>
>>> Cc: Lee Jones <lee.jones@linaro.org>
>>> Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
>>
>> Acked-by: Daniel Lezcano <daniel.lezcano@linaro.org>
>>
>> A sidenote: there is a comment in arch/arm/mach-ux500/timer.c
>> "/* TODO: Once MTU has been DT:ed place code above into else. */"
>> but I did not see any changes related to this TODO.
>
> You mean similar to this one:
> https://lkml.org/lkml/2013/11/6/118
Yes :)
--
<http://www.linaro.org/> Linaro.org ? Open source software for ARM SoCs
Follow Linaro: <http://www.facebook.com/pages/Linaro> Facebook |
<http://twitter.com/#!/linaroorg> Twitter |
<http://www.linaro.org/linaro-blog/> Blog
^ permalink raw reply [flat|nested] 7+ messages in thread
* [PATCH 2/2] clksrc: delete nomadik MTU non-DT boot path
2013-11-20 8:59 ` Daniel Lezcano
@ 2013-11-20 9:01 ` Linus Walleij
2013-11-20 9:03 ` Daniel Lezcano
0 siblings, 1 reply; 7+ messages in thread
From: Linus Walleij @ 2013-11-20 9:01 UTC (permalink / raw)
To: linux-arm-kernel
On Wed, Nov 20, 2013 at 9:59 AM, Daniel Lezcano
<daniel.lezcano@linaro.org> wrote:
> On 11/20/2013 09:52 AM, Lee Jones wrote:
>>> A sidenote: there is a comment in arch/arm/mach-ux500/timer.c
>>> "/* TODO: Once MTU has been DT:ed place code above into else. */"
>>> but I did not see any changes related to this TODO.
>>
>> You mean similar to this one:
>> https://lkml.org/lkml/2013/11/6/118
>
> Yes :)
It's applied in my tree as well, problem solved!
Yours,
Linus Walleij
^ permalink raw reply [flat|nested] 7+ messages in thread
* [PATCH 2/2] clksrc: delete nomadik MTU non-DT boot path
2013-11-20 9:01 ` Linus Walleij
@ 2013-11-20 9:03 ` Daniel Lezcano
0 siblings, 0 replies; 7+ messages in thread
From: Daniel Lezcano @ 2013-11-20 9:03 UTC (permalink / raw)
To: linux-arm-kernel
On 11/20/2013 10:01 AM, Linus Walleij wrote:
> On Wed, Nov 20, 2013 at 9:59 AM, Daniel Lezcano
> <daniel.lezcano@linaro.org> wrote:
>> On 11/20/2013 09:52 AM, Lee Jones wrote:
>
>>>> A sidenote: there is a comment in arch/arm/mach-ux500/timer.c
>>>> "/* TODO: Once MTU has been DT:ed place code above into else. */"
>>>> but I did not see any changes related to this TODO.
>>>
>>> You mean similar to this one:
>>> https://lkml.org/lkml/2013/11/6/118
>>
>> Yes :)
>
> It's applied in my tree as well, problem solved!
Ok, cool.
Thanks !
-- Daniel
--
<http://www.linaro.org/> Linaro.org ? Open source software for ARM SoCs
Follow Linaro: <http://www.facebook.com/pages/Linaro> Facebook |
<http://twitter.com/#!/linaroorg> Twitter |
<http://www.linaro.org/linaro-blog/> Blog
^ permalink raw reply [flat|nested] 7+ messages in thread
end of thread, other threads:[~2013-11-20 9:03 UTC | newest]
Thread overview: 7+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2013-11-19 21:28 [PATCH 2/2] clksrc: delete nomadik MTU non-DT boot path Linus Walleij
2013-11-19 22:44 ` Daniel Lezcano
2013-11-20 8:52 ` Lee Jones
2013-11-20 8:59 ` Daniel Lezcano
2013-11-20 9:01 ` Linus Walleij
2013-11-20 9:03 ` Daniel Lezcano
2013-11-20 8:56 ` Lee Jones
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).