From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Thu, 2 Aug 2012 18:48:54 +0000 (-0700)
Subject: Merge tag 'pm2' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc
X-Git-Tag: v3.12-rc1~2585
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=bfdf85dfce1f203f8fcca034b8efe339542033fa;p=kernel%2Fkernel-generic.git

Merge tag 'pm2' of git://git./linux/kernel/git/arm/arm-soc

Pull arm-soc cpuidle enablement for OMAP from Olof Johansson:
 "Coupled cpuidle was meant to merge for 3.5 through Len Brown's tree,
  but didn't go in because the pull request ended up rejected.  So it
  just got merged, and we got this staged branch that enables the
  coupled cpuidle code on OMAP.

  With a stable git workflow from the other maintainer we could have
  staged this earlier, but that wasn't the case so we have had to merge
  it late.

  The alternative is to hold it off until 3.7 but given that the code is
  well-isolated to OMAP and they are eager to see it go in, I didn't
  push back hard in that direction."

* tag 'pm2' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc:
  ARM: OMAP4: CPUidle: Open broadcast clock-event device.
  ARM: OMAP4: CPUidle: add synchronization for coupled idle states
  ARM: OMAP4: CPUidle: Use coupled cpuidle states to implement SMP cpuidle.
  ARM: OMAP: timer: allow gp timer clock-event to be used on both cpus
---

bfdf85dfce1f203f8fcca034b8efe339542033fa
diff --cc arch/arm/mach-omap2/Kconfig
index dd0fbf7,cc83f5e..dd2db02
--- a/arch/arm/mach-omap2/Kconfig
+++ b/arch/arm/mach-omap2/Kconfig
@@@ -62,13 -55,8 +62,14 @@@ config ARCH_OMAP
  	select PM_OPP if PM
  	select USB_ARCH_HAS_EHCI if USB_SUPPORT
  	select ARM_CPU_SUSPEND if PM
+ 	select ARCH_NEEDS_CPU_IDLE_COUPLED
  
 +config SOC_OMAP5
 +	bool "TI OMAP5"
 +	select CPU_V7
 +	select ARM_GIC
 +	select HAVE_SMP
 +
  comment "OMAP Core Type"
  	depends on ARCH_OMAP2
  
diff --cc arch/arm/mach-omap2/cpuidle44xx.c
index 02d15bb,45e6a54..ee05e19
--- a/arch/arm/mach-omap2/cpuidle44xx.c
+++ b/arch/arm/mach-omap2/cpuidle44xx.c
@@@ -21,7 -21,10 +21,8 @@@
  #include "common.h"
  #include "pm.h"
  #include "prm.h"
+ #include "clockdomain.h"
  
 -#ifdef CONFIG_CPU_IDLE
 -
  /* Machine specific information */
  struct omap4_idle_statedata {
  	u32 cpu_state;