diff options
| author | Olof Johansson <olof@lixom.net> | 2012-09-13 09:54:16 +0400 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2012-09-13 09:54:16 +0400 |
| commit | 36246a820075b65907112891b77ff7915fdb06a5 (patch) | |
| tree | 1c716d9d11158582d6d986821fee5a9b61430286 /drivers/clk/mxs | |
| parent | d9875690d9b89a866022ff49e3fcea892345ad92 (diff) | |
| parent | 6608f13fabdb1f9ecbd502763ba33ca2646834c8 (diff) | |
| download | linux-36246a820075b65907112891b77ff7915fdb06a5.tar.xz | |
Merge tag 'mxs-sparse-irq' of git://git.linaro.org/people/shawnguo/linux-2.6 into next/soc2
The series adds irqdomain support for mach-mxs and then enables
sparse-irq. It dependes on pull request mxs-dt-3.7.
* tag 'mxs-sparse-irq' of git://git.linaro.org/people/shawnguo/linux-2.6:
ARM: mxs: remove mach/irqs.h
ARM: mxs: select SPARSE_IRQ
ARM: mxs: adopt irq_domain support for icoll driver
ARM: mxs: select MULTI_IRQ_HANDLER
ARM: mxs: retrieve timer irq from device tree
gpio/mxs: adopt irq_domain support for mxs gpio driver
Diffstat (limited to 'drivers/clk/mxs')
| -rw-r--r-- | drivers/clk/mxs/clk-imx23.c | 2 | ||||
| -rw-r--r-- | drivers/clk/mxs/clk-imx28.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/drivers/clk/mxs/clk-imx23.c b/drivers/clk/mxs/clk-imx23.c index 844043ad0fe4..e0dc3f8d9866 100644 --- a/drivers/clk/mxs/clk-imx23.c +++ b/drivers/clk/mxs/clk-imx23.c @@ -200,7 +200,7 @@ int __init mx23_clocks_init(void) for (i = 0; i < ARRAY_SIZE(clks_init_on); i++) clk_prepare_enable(clks[clks_init_on[i]]); - mxs_timer_init(MX23_INT_TIMER0); + mxs_timer_init(); return 0; } diff --git a/drivers/clk/mxs/clk-imx28.c b/drivers/clk/mxs/clk-imx28.c index e3aab67b3eb7..9df864dc65a3 100644 --- a/drivers/clk/mxs/clk-imx28.c +++ b/drivers/clk/mxs/clk-imx28.c @@ -337,7 +337,7 @@ int __init mx28_clocks_init(void) for (i = 0; i < ARRAY_SIZE(clks_init_on); i++) clk_prepare_enable(clks[clks_init_on[i]]); - mxs_timer_init(MX28_INT_TIMER0); + mxs_timer_init(); return 0; } |