From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Tue, 24 Jul 2012 00:43:53 +0000 (-0700)
Subject: Merge tag 'pm' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc
X-Git-Tag: v3.6~380
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=a5ebba6b54bc8038a38d3eacac3a79bbeaf3ee24;p=platform%2Fkernel%2Flinux-amlogic.git

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

Pull arm-soc power management changes from Arnd Bergmann:
 "These are various power management related changes, mainly concerning
  cpuidle on i.MX and OMAP, as well as a the move of the omap
  smartreflex driver to live in the power subsystem."

Fix up conflicts in arch/arm/mach-{imx/mach-imx6q.c,omap2/prm2xxx_3xxx.h}

* tag 'pm' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (37 commits)
  ARM: OMAP2+: PM: fix IRQ_NOAUTOEN removal by mis-merge
  ARM: OMAP2+: do not allow SmartReflex to be built as a module
  ARM: OMAP2: Use hwmod to initialize mmc for 2420
  ARM: OMAP3: PM: cpuidle: optimize the clkdm idle latency in C1 state
  ARM: OMAP3: PM: cpuidle: optimize the PER latency in C1 state
  ARM: OMAP3: PM: cpuidle: default to C1 in next_valid_state
  ARM: OMAP3: PM: cleanup cam_pwrdm leftovers
  ARM: OMAP3: PM: call pre/post transition per powerdomain
  ARM: OMAP2+: powerdomain: allow pre/post transtion to be per pwrdm
  ARM: OMAP3: PM: Remove IO Daisychain control from cpuidle
  ARM: OMAP3PLUS: hwmod: reconfigure IO Daisychain during hwmod mux
  ARM: OMAP3+: PRM: Enable IO wake up
  ARM: OMAP4: PRM: Add IO Daisychain support
  ARM: OMAP3: PM: Move IO Daisychain function to omap3 prm file
  ARM: OMAP3: PM: correct enable/disable of daisy io chain
  ARM: OMAP2+: PRM: fix compile for OMAP4-only build
  W1: OMAP HDQ1W: use runtime PM
  ARM: OMAP2+: HDQ1W: use omap_device
  W1: OMAP HDQ1W: use 32-bit register accesses
  W1: OMAP HDQ1W: allow driver to be built on all OMAP2+
  ...
---

a5ebba6b54bc8038a38d3eacac3a79bbeaf3ee24
diff --cc arch/arm/mach-imx/mach-imx6q.c
index 426d208,d4ca2c4..5ec0608
--- a/arch/arm/mach-imx/mach-imx6q.c
+++ b/arch/arm/mach-imx/mach-imx6q.c
@@@ -23,7 -26,7 +25,8 @@@
  #include <linux/pinctrl/machine.h>
  #include <linux/phy.h>
  #include <linux/micrel_phy.h>
 +#include <linux/mfd/anatop.h>
+ #include <asm/cpuidle.h>
  #include <asm/smp_twd.h>
  #include <asm/hardware/cache-l2x0.h>
  #include <asm/hardware/gic.h>
@@@ -166,9 -132,21 +171,22 @@@ static void __init imx6q_init_machine(v
  	of_platform_populate(NULL, of_default_bus_match_table, NULL, NULL);
  
  	imx6q_pm_init();
 +	imx6q_usb_init();
  }
  
+ static struct cpuidle_driver imx6q_cpuidle_driver = {
+ 	.name			= "imx6q_cpuidle",
+ 	.owner			= THIS_MODULE,
+ 	.en_core_tk_irqen	= 1,
+ 	.states[0]		= ARM_CPUIDLE_WFI_STATE,
+ 	.state_count		= 1,
+ };
+ 
+ static void __init imx6q_init_late(void)
+ {
+ 	imx_cpuidle_init(&imx6q_cpuidle_driver);
+ }
+ 
  static void __init imx6q_map_io(void)
  {
  	imx_lluart_map_io();
diff --cc arch/arm/mach-omap2/Makefile
index 19b771d,f74e975..b7a4ab6
--- a/arch/arm/mach-omap2/Makefile
+++ b/arch/arm/mach-omap2/Makefile
@@@ -71,11 -66,13 +71,12 @@@ ifeq ($(CONFIG_PM),y
  obj-$(CONFIG_ARCH_OMAP2)		+= pm24xx.o
  obj-$(CONFIG_ARCH_OMAP2)		+= sleep24xx.o
  obj-$(CONFIG_ARCH_OMAP3)		+= pm34xx.o sleep34xx.o
 -obj-$(CONFIG_ARCH_OMAP3)		+= cpuidle34xx.o
  obj-$(CONFIG_ARCH_OMAP4)		+= pm44xx.o omap-mpuss-lowpower.o
 -obj-$(CONFIG_ARCH_OMAP4)		+= cpuidle44xx.o
 +obj-$(CONFIG_SOC_OMAP5)			+= omap-mpuss-lowpower.o
  obj-$(CONFIG_PM_DEBUG)			+= pm-debug.o
- obj-$(CONFIG_OMAP_SMARTREFLEX)          += sr_device.o smartreflex.o
- obj-$(CONFIG_OMAP_SMARTREFLEX_CLASS3)	+= smartreflex-class3.o
+ 
+ obj-$(CONFIG_POWER_AVS_OMAP)		+= sr_device.o
+ obj-$(CONFIG_POWER_AVS_OMAP_CLASS3)    += smartreflex-class3.o
  
  AFLAGS_sleep24xx.o			:=-Wa,-march=armv6
  AFLAGS_sleep34xx.o			:=-Wa,-march=armv7-a$(plus_sec)
diff --cc arch/arm/mach-omap2/prm2xxx_3xxx.h
index f7bb57f,a8c946f..c19d249
--- a/arch/arm/mach-omap2/prm2xxx_3xxx.h
+++ b/arch/arm/mach-omap2/prm2xxx_3xxx.h
@@@ -258,7 -324,8 +260,8 @@@ extern void omap3xxx_prm_read_pending_i
  extern void omap3xxx_prm_ocp_barrier(void);
  extern void omap3xxx_prm_save_and_clear_irqen(u32 *saved_mask);
  extern void omap3xxx_prm_restore_irqen(u32 *saved_mask);
- #endif
+ 
 -#endif
++#endif /* __ASSEMBLER */
  
  /*
   * Bits common to specific registers