Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-11-28 07:01:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

clksrc: delete nomadik MTU non-DT boot path

Browse Source 
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: Thomas Gleixner <tglx@linutronix.de>
Cc: Lee Jones <lee.jones@linaro.org>
Acked-by: Daniel Lezcano <daniel.lezcano@linaro.org>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
This commit is contained in:
Linus Walleij 2013-11-19 22:23:21 +01:00
parent 8da15e1740
commit 7172c19a24
2 changed files with 5 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
drivers/clocksource/nomadik-mtu.c
View File

@ -20,7 +20,6 @@
#include <linux/jiffies.h> #include <linux/jiffies.h>
#include <linux/delay.h> #include <linux/delay.h>
#include <linux/err.h> #include <linux/err.h>
#include <linux/platform_data/clocksource-nomadik-mtu.h>
#include <linux/sched_clock.h> #include <linux/sched_clock.h>
#include <asm/mach/time.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; return 0;
} }
void nmdk_clkevt_reset(void) static void nmdk_clkevt_reset(void)
{ {
if (clkevt_periodic) { if (clkevt_periodic) {
/* Timer: configure load and background-load, and fire it up */ /* 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 */ /* Disable */
writel(0, mtu_base + MTU_CR(0)); writel(0, mtu_base + MTU_CR(0));
@ -192,8 +191,8 @@ static struct irqaction nmdk_timer_irq = {
.dev_id = &nmdk_clkevt, .dev_id = &nmdk_clkevt,
}; };
static void __init __nmdk_timer_init(void __iomem *base, int irq, static void __init nmdk_timer_init(void __iomem *base, int irq,
struct clk *pclk, struct clk *clk) struct clk *pclk, struct clk *clk)
{ {
unsigned long rate; 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); 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) static void __init nmdk_timer_of_init(struct device_node *node)
{ {
struct clk *pclk; struct clk *pclk;
@ -280,7 +267,7 @@ static void __init nmdk_timer_of_init(struct device_node *node)
if (irq <= 0) if (irq <= 0)
panic("Can't parse IRQ"); 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", CLOCKSOURCE_OF_DECLARE(nomadik_mtu, "st,nomadik-mtu",
nmdk_timer_of_init); nmdk_timer_of_init);

9
include/linux/platform_data/clocksource-nomadik-mtu.h
View File

@ -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 */