From: Olof Johansson <olof@lixom.net>
Date: Sat, 30 Jun 2012 23:13:15 +0000 (-0700)
Subject: Merge branch 'imx/cpuidle' into next/pm
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=839ab0c18fe4cf83dd99ca814f2b4cf822cd99be;p=GitHub%2Fexynos8895%2Fandroid_kernel_samsung_universal8895.git

Merge branch 'imx/cpuidle' into next/pm

* imx/cpuidle:
  ARM: imx: Add imx6q cpuidle driver
  ARM: imx: Add imx5 cpuidle
  ARM: imx: Add common imx cpuidle init functionality.
  ARM: imx: Enable imx53 low power idle
  ARM: imx: clean and consolidate imx5 suspend and idle code
  ARM: imx: Add comments to tzic_enable_waker()
  ARM: imx: Modify IMX_IO_P2V macro

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

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

839ab0c18fe4cf83dd99ca814f2b4cf822cd99be
diff --cc arch/arm/plat-mxc/include/mach/common.h
index e429ca1b814a,3314e6952556..7ca15044154f
--- a/arch/arm/plat-mxc/include/mach/common.h
+++ b/arch/arm/plat-mxc/include/mach/common.h
@@@ -54,8 -54,9 +54,9 @@@ extern void imx50_soc_init(void)
  extern void imx51_soc_init(void);
  extern void imx53_soc_init(void);
  extern void imx51_init_late(void);
+ extern void imx53_init_late(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 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);