Merge tag 'imx-clk-common-fixes' of git://git.pengutronix.de/git/imx/linux-2.6 into...

From Sascha Hauer: "Some fixes for the fresh i.MX common clock support"

Resolved trivial conflict in arch/arm/plat-mxc/include/mach/common.h.

* tag 'imx-clk-common-fixes' of git://git.pengutronix.de/git/imx/linux-2.6:
  ARM: imx6q: prepare and enable init on clks directly instead of clk_get first
  ARM i.MX: remove now unnecessary argument from mxc_timer_init
  ARM: i.MX: change timer clock from ipg to perclk
  ARM i.MX5: fix gpt peripheral clock path

Signed-off-by: Olof Johansson <olof@lixom.net>

diff --cc arch/arm/mach-imx/clk-imx51-imx53.c
Simple merge

diff --cc arch/arm/mach-imx/clk-imx6q.c
index cab02d0,7b4751d..17dc66a
--- 1/arch/arm/mach-imx/clk-imx6q.c
--- 2/arch/arm/mach-imx/clk-imx6q.c
+++ b/arch/arm/mach-imx/clk-imx6q.c
@@@ -419,20 -417,9 +418,13 @@@ int __init mx6q_clocks_init(void
        clk_register_clkdev(clk[sdma], NULL, "20ec000.sdma");
        clk_register_clkdev(clk[dummy], NULL, "20bc000.wdog");
        clk_register_clkdev(clk[dummy], NULL, "20c0000.wdog");
 +      clk_register_clkdev(clk[ssi1_ipg], NULL, "2028000.ssi");
 +      clk_register_clkdev(clk[cko1_sel], "cko1_sel", NULL);
 +      clk_register_clkdev(clk[ahb], "ahb", NULL);
 +      clk_register_clkdev(clk[cko1], "cko1", NULL);
  
-       for (i = 0; i < ARRAY_SIZE(clks_init_on); i++) {
-               c = clk_get_sys(clks_init_on[i], NULL);
-               if (IS_ERR(c)) {
-                       pr_err("%s: failed to get clk %s", __func__,
-                              clks_init_on[i]);
-                       return PTR_ERR(c);
-               }
-               clk_prepare_enable(c);
-       }
+       for (i = 0; i < ARRAY_SIZE(clks_init_on); i++)
+               clk_prepare_enable(clk[clks_init_on[i]]);
  
        np = of_find_compatible_node(NULL, NULL, "fsl,imx6q-gpt");
        base = of_iomap(np, 0);

diff --cc arch/arm/plat-mxc/include/mach/common.h
index cf663d8,da02540..e429ca1
--- 1/arch/arm/plat-mxc/include/mach/common.h
--- 2/arch/arm/plat-mxc/include/mach/common.h
+++ b/arch/arm/plat-mxc/include/mach/common.h
@@@ -53,9 -53,8 +53,9 @@@ extern void imx35_soc_init(void)
  extern void imx50_soc_init(void);
  extern void imx51_soc_init(void);
  extern void imx53_soc_init(void);
- extern void epit_timer_init(struct clk *timer_clk, void __iomem *base, int irq);
- extern void mxc_timer_init(struct clk *timer_clk, void __iomem *, int);
 +extern void imx51_init_late(void);
+ extern void epit_timer_init(void __iomem *base, int irq);
+ extern void mxc_timer_init(void __iomem *, int);
  extern int mx1_clocks_init(unsigned long fref);
  extern int mx21_clocks_init(unsigned long lref, unsigned long fref);
  extern int mx25_clocks_init(void);