From 6e40610d519f5f2d0135559715ce7d8916db7018 Mon Sep 17 00:00:00 2001 From: Sebastian Hesselbarth Date: Tue, 2 Jul 2013 20:30:41 +0200 Subject: [PATCH] clocksource: orion: lookup clock by physbase This converts Kirkwood and Dove SoC init to register tclk alias for timer by physbase instead of name. Signed-off-by: Sebastian Hesselbarth Signed-off-by: Sascha Hauer --- arch/arm/mach-mvebu/dove.c | 3 ++- arch/arm/mach-mvebu/kirkwood.c | 3 ++- drivers/clocksource/orion.c | 2 +- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/arch/arm/mach-mvebu/dove.c b/arch/arm/mach-mvebu/dove.c index ee63917d2..3909bf4c3 100644 --- a/arch/arm/mach-mvebu/dove.c +++ b/arch/arm/mach-mvebu/dove.c @@ -114,7 +114,7 @@ static int dove_init_clocks(void) } tclk = clk_fixed("tclk", rate); - return clk_register_clkdev(tclk, NULL, "orion-timer"); + return 0; } static int dove_init_soc(void) @@ -123,6 +123,7 @@ static int dove_init_soc(void) dove_remap_mc_regs(); dove_init_clocks(); + clkdev_add_physbase(tclk, (unsigned int)DOVE_TIMER_BASE, NULL); add_generic_device("orion-timer", DEVICE_ID_SINGLE, NULL, (unsigned int)DOVE_TIMER_BASE, 0x30, IORESOURCE_MEM, NULL); diff --git a/arch/arm/mach-mvebu/kirkwood.c b/arch/arm/mach-mvebu/kirkwood.c index 9e43dae60..2ec175a5b 100644 --- a/arch/arm/mach-mvebu/kirkwood.c +++ b/arch/arm/mach-mvebu/kirkwood.c @@ -78,7 +78,7 @@ static int kirkwood_init_clocks(void) rate = 200000000; tclk = clk_fixed("tclk", rate); - return clk_register_clkdev(tclk, NULL, "orion-timer"); + return 0; } static int kirkwood_init_soc(void) @@ -86,6 +86,7 @@ static int kirkwood_init_soc(void) unsigned long phys_base, phys_size; kirkwood_init_clocks(); + clkdev_add_physbase(tclk, (unsigned int)KIRKWOOD_TIMER_BASE, NULL); add_generic_device("orion-timer", DEVICE_ID_SINGLE, NULL, (unsigned int)KIRKWOOD_TIMER_BASE, 0x30, IORESOURCE_MEM, NULL); diff --git a/drivers/clocksource/orion.c b/drivers/clocksource/orion.c index e3db845de..8817dfeef 100644 --- a/drivers/clocksource/orion.c +++ b/drivers/clocksource/orion.c @@ -49,7 +49,7 @@ static int orion_timer_probe(struct device_d *dev) uint32_t val; timer_base = dev_request_mem_region(dev, 0); - tclk = clk_get(dev, "tclk"); + tclk = clk_get(dev, NULL); /* setup TIMER0 as free-running clock source */ __raw_writel(~0, timer_base + TIMER0_VAL);