diff options
| author | Shawn Guo | 2015-05-15 05:41:39 +0200 |
|---|---|---|
| committer | Shawn Guo | 2015-06-03 08:52:26 +0200 |
| commit | 0931aff7226abb7e1dab018488e363294385fa66 (patch) | |
| tree | 608a40c038ae0d8934b7f931e0af221247cda44e /drivers/clk/imx/clk-imx31.c | |
| parent | ARM: imx: move timer resources into a structure (diff) | |
| download | kernel-qcow2-linux-0931aff7226abb7e1dab018488e363294385fa66.tar.gz kernel-qcow2-linux-0931aff7226abb7e1dab018488e363294385fa66.tar.xz kernel-qcow2-linux-0931aff7226abb7e1dab018488e363294385fa66.zip | |
ARM: imx: define an enum for gpt timer device type
Define an enum for gpt timer device type in include/soc/imx/timer.h to
tell the gpt block differences among SoCs. Update non-DT users (clock
drivers) to pass the device type.
As we now have include/soc/imx/timer.h, the declaration of
mxc_timer_init() is moved into there as the best fit.
Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
Diffstat (limited to 'drivers/clk/imx/clk-imx31.c')
| -rw-r--r-- | drivers/clk/imx/clk-imx31.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/clk/imx/clk-imx31.c b/drivers/clk/imx/clk-imx31.c index a55290c1c264..fe66c40b7be2 100644 --- a/drivers/clk/imx/clk-imx31.c +++ b/drivers/clk/imx/clk-imx31.c @@ -22,6 +22,7 @@ #include <linux/err.h> #include <linux/of.h> #include <soc/imx/revision.h> +#include <soc/imx/timer.h> #include <asm/irq.h> #include "clk.h" @@ -198,7 +199,7 @@ int __init mx31_clocks_init(unsigned long fref) mx31_revision(); clk_disable_unprepare(clk[iim_gate]); - mxc_timer_init(MX31_GPT1_BASE_ADDR, MX31_INT_GPT); + mxc_timer_init(MX31_GPT1_BASE_ADDR, MX31_INT_GPT, GPT_TYPE_IMX31); return 0; } |