| Message ID | 1353014906-31566-5-git-send-email-andrew@lunn.ch (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
Dear Andrew Lunn, Title should be "clocksource: convert time-armada-370-xp to the clk framework". On Thu, 15 Nov 2012 22:28:23 +0100, Andrew Lunn wrote: > diff --git a/drivers/clocksource/time-armada-370-xp.c b/drivers/clocksource/time-armada-370-xp.c > index 4674f94..a4605fd 100644 > --- a/drivers/clocksource/time-armada-370-xp.c > +++ b/drivers/clocksource/time-armada-370-xp.c > @@ -18,6 +18,7 @@ > #include <linux/init.h> > #include <linux/platform_device.h> > #include <linux/kernel.h> > +#include <linux/clk.h> > #include <linux/timer.h> > #include <linux/clockchips.h> > #include <linux/interrupt.h> > @@ -167,7 +168,6 @@ void __init armada_370_xp_timer_init(void) > u32 u; > struct device_node *np; > unsigned int timer_clk; > - int ret; > np = of_find_compatible_node(NULL, NULL, "marvell,armada-370-xp-timer"); > timer_base = of_iomap(np, 0); > WARN_ON(!timer_base); > @@ -179,13 +179,14 @@ void __init armada_370_xp_timer_init(void) > timer_base + TIMER_CTRL_OFF); > timer_clk = 25000000; > } else { > - u32 clk = 0; > - ret = of_property_read_u32(np, "clock-frequency", &clk); > - WARN_ON(!clk || ret < 0); > + unsigned long rate = 0; > + struct clk *clk = of_clk_get(np, 0); > + WARN_ON(IS_ERR(clk)); > + rate = clk_get_rate(clk); > u = readl(timer_base + TIMER_CTRL_OFF); > writel(u & ~(TIMER0_25MHZ | TIMER1_25MHZ), > timer_base + TIMER_CTRL_OFF); > - timer_clk = clk / TIMER_DIVIDER; > + timer_clk = rate / TIMER_DIVIDER; > } > > /* We use timer 0 as clocksource, and timer 1 for This change requires an update to Documentation/devicetree/bindings/arm/armada-370-xp-timer.txt. The previous clock-frequency property was not documented, but maybe the new clocks property should. Thomas
diff --git a/arch/arm/boot/dts/armada-370-db.dts b/arch/arm/boot/dts/armada-370-db.dts index fffd5c2..4a31b03 100644 --- a/arch/arm/boot/dts/armada-370-db.dts +++ b/arch/arm/boot/dts/armada-370-db.dts @@ -34,9 +34,5 @@ clock-frequency = <200000000>; status = "okay"; }; - timer@d0020300 { - clock-frequency = <600000000>; - status = "okay"; - }; }; }; diff --git a/arch/arm/boot/dts/armada-370-xp.dtsi b/arch/arm/boot/dts/armada-370-xp.dtsi index 16cc82c..94b4b9e 100644 --- a/arch/arm/boot/dts/armada-370-xp.dtsi +++ b/arch/arm/boot/dts/armada-370-xp.dtsi @@ -62,6 +62,7 @@ compatible = "marvell,armada-370-xp-timer"; reg = <0xd0020300 0x30>; interrupts = <37>, <38>, <39>, <40>; + clocks = <&coreclk 2>; }; addr-decoding@d0020000 { diff --git a/drivers/clocksource/time-armada-370-xp.c b/drivers/clocksource/time-armada-370-xp.c index 4674f94..a4605fd 100644 --- a/drivers/clocksource/time-armada-370-xp.c +++ b/drivers/clocksource/time-armada-370-xp.c @@ -18,6 +18,7 @@ #include <linux/init.h> #include <linux/platform_device.h> #include <linux/kernel.h> +#include <linux/clk.h> #include <linux/timer.h> #include <linux/clockchips.h> #include <linux/interrupt.h> @@ -167,7 +168,6 @@ void __init armada_370_xp_timer_init(void) u32 u; struct device_node *np; unsigned int timer_clk; - int ret; np = of_find_compatible_node(NULL, NULL, "marvell,armada-370-xp-timer"); timer_base = of_iomap(np, 0); WARN_ON(!timer_base); @@ -179,13 +179,14 @@ void __init armada_370_xp_timer_init(void) timer_base + TIMER_CTRL_OFF); timer_clk = 25000000; } else { - u32 clk = 0; - ret = of_property_read_u32(np, "clock-frequency", &clk); - WARN_ON(!clk || ret < 0); + unsigned long rate = 0; + struct clk *clk = of_clk_get(np, 0); + WARN_ON(IS_ERR(clk)); + rate = clk_get_rate(clk); u = readl(timer_base + TIMER_CTRL_OFF); writel(u & ~(TIMER0_25MHZ | TIMER1_25MHZ), timer_base + TIMER_CTRL_OFF); - timer_clk = clk / TIMER_DIVIDER; + timer_clk = rate / TIMER_DIVIDER; } /* We use timer 0 as clocksource, and timer 1 for