diff options
author | Shawn Guo <shawn.guo@linaro.org> | 2013-03-25 10:57:14 -0400 |
---|---|---|
committer | Shawn Guo <shawn.guo@linaro.org> | 2013-04-01 04:30:02 -0400 |
commit | 2efb950465e9180c3ff657a755b8a973f7b9ae42 (patch) | |
tree | 4df37150ebe557496ec75841137ec3a44c52f8bc /arch/arm | |
parent | 633ef4c7d18982d184242d42056c622a433d93fe (diff) |
ARM: mxs: look up timrot clock from device tree
Change call clk_get_sys() to of_clk_get() to look up timrot clock from
device tree, so that the clk_register_clkdev() call for timrot can be
saved in clock driver.
Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
Diffstat (limited to 'arch/arm')
-rw-r--r-- | arch/arm/boot/dts/imx23.dtsi | 1 | ||||
-rw-r--r-- | arch/arm/boot/dts/imx28.dtsi | 1 | ||||
-rw-r--r-- | arch/arm/mach-mxs/timer.c | 2 |
3 files changed, 3 insertions, 1 deletions
diff --git a/arch/arm/boot/dts/imx23.dtsi b/arch/arm/boot/dts/imx23.dtsi index 56afcf41aae0..27ce8070e187 100644 --- a/arch/arm/boot/dts/imx23.dtsi +++ b/arch/arm/boot/dts/imx23.dtsi | |||
@@ -426,6 +426,7 @@ | |||
426 | compatible = "fsl,imx23-timrot", "fsl,timrot"; | 426 | compatible = "fsl,imx23-timrot", "fsl,timrot"; |
427 | reg = <0x80068000 0x2000>; | 427 | reg = <0x80068000 0x2000>; |
428 | interrupts = <28 29 30 31>; | 428 | interrupts = <28 29 30 31>; |
429 | clocks = <&clks 28>; | ||
429 | }; | 430 | }; |
430 | 431 | ||
431 | auart0: serial@8006c000 { | 432 | auart0: serial@8006c000 { |
diff --git a/arch/arm/boot/dts/imx28.dtsi b/arch/arm/boot/dts/imx28.dtsi index 7ba49662b9bc..c2f10d381f03 100644 --- a/arch/arm/boot/dts/imx28.dtsi +++ b/arch/arm/boot/dts/imx28.dtsi | |||
@@ -838,6 +838,7 @@ | |||
838 | compatible = "fsl,imx28-timrot", "fsl,timrot"; | 838 | compatible = "fsl,imx28-timrot", "fsl,timrot"; |
839 | reg = <0x80068000 0x2000>; | 839 | reg = <0x80068000 0x2000>; |
840 | interrupts = <48 49 50 51>; | 840 | interrupts = <48 49 50 51>; |
841 | clocks = <&clks 26>; | ||
841 | }; | 842 | }; |
842 | 843 | ||
843 | auart0: serial@8006a000 { | 844 | auart0: serial@8006a000 { |
diff --git a/arch/arm/mach-mxs/timer.c b/arch/arm/mach-mxs/timer.c index fe2903d7939a..f5142aa234a3 100644 --- a/arch/arm/mach-mxs/timer.c +++ b/arch/arm/mach-mxs/timer.c | |||
@@ -247,7 +247,7 @@ static void __init mxs_timer_init(struct device_node *np) | |||
247 | struct clk *timer_clk; | 247 | struct clk *timer_clk; |
248 | int irq; | 248 | int irq; |
249 | 249 | ||
250 | timer_clk = clk_get_sys("timrot", NULL); | 250 | timer_clk = of_clk_get(np, 0); |
251 | if (IS_ERR(timer_clk)) { | 251 | if (IS_ERR(timer_clk)) { |
252 | pr_err("%s: failed to get clk\n", __func__); | 252 | pr_err("%s: failed to get clk\n", __func__); |
253 | return; | 253 | return; |