From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Mon, 9 Sep 2013 23:08:13 +0000 (-0700)
Subject: Merge tag 'drivers-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm... 
X-Git-Tag: v3.12-rc1~77
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=a35c6322e52c550b61a04a44df27d22394ee0a2c;p=profile%2Fcommon%2Fkernel-common.git

Merge tag 'drivers-for-linus' of git://git./linux/kernel/git/arm/arm-soc

Pull ARM SoC driver update from Kevin Hilman:
 "This contains the ARM SoC related driver updates for v3.12.  The only
  thing this cycle are core PM updates and CPUidle support for ARM's TC2
  big.LITTLE development platform"

* tag 'drivers-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc:
  cpuidle: big.LITTLE: vexpress-TC2 CPU idle driver
  ARM: vexpress: tc2: disable GIC CPU IF in tc2_pm_suspend
  drivers: irq-chip: irq-gic: introduce gic_cpu_if_down()
---

a35c6322e52c550b61a04a44df27d22394ee0a2c
diff --cc drivers/cpuidle/Kconfig.arm
index b330219,0000000..8e36603
mode 100644,000000..100644
--- a/drivers/cpuidle/Kconfig.arm
+++ b/drivers/cpuidle/Kconfig.arm
@@@ -1,29 -1,0 +1,39 @@@
 +#
 +# ARM CPU Idle drivers
 +#
 +
 +config ARM_HIGHBANK_CPUIDLE
 +	bool "CPU Idle Driver for Calxeda processors"
 +	depends on ARCH_HIGHBANK
 +	select ARM_CPU_SUSPEND
 +	help
 +	  Select this to enable cpuidle on Calxeda processors.
 +
 +config ARM_KIRKWOOD_CPUIDLE
 +	bool "CPU Idle Driver for Marvell Kirkwood SoCs"
 +	depends on ARCH_KIRKWOOD
 +	help
 +	  This adds the CPU Idle driver for Marvell Kirkwood SoCs.
 +
 +config ARM_ZYNQ_CPUIDLE
 +	bool "CPU Idle Driver for Xilinx Zynq processors"
 +	depends on ARCH_ZYNQ
 +	help
 +	  Select this to enable cpuidle on Xilinx Zynq processors.
 +
 +config ARM_U8500_CPUIDLE
 +	bool "Cpu Idle Driver for the ST-E u8500 processors"
 +	depends on ARCH_U8500
 +	help
 +	  Select this to enable cpuidle for ST-E u8500 processors
 +
++config CPU_IDLE_BIG_LITTLE
++	bool "Support for ARM big.LITTLE processors"
++	depends on ARCH_VEXPRESS_TC2_PM
++	select ARM_CPU_SUSPEND
++	select CPU_IDLE_MULTIPLE_DRIVERS
++	help
++	  Select this option to enable CPU idle driver for big.LITTLE based
++	  ARM systems. Driver manages CPUs coordination through MCPM and
++	  define different C-states for little and big cores through the
++	  multiple CPU idle drivers infrastructure.
diff --cc drivers/cpuidle/Makefile
index 0b9d200,3b6445c..cea5ef5
--- a/drivers/cpuidle/Makefile
+++ b/drivers/cpuidle/Makefile
@@@ -5,9 -5,7 +5,10 @@@
  obj-y += cpuidle.o driver.o governor.o sysfs.o governors/
  obj-$(CONFIG_ARCH_NEEDS_CPU_IDLE_COUPLED) += coupled.o
  
 -obj-$(CONFIG_CPU_IDLE_CALXEDA) += cpuidle-calxeda.o
 -obj-$(CONFIG_ARCH_KIRKWOOD) += cpuidle-kirkwood.o
 -obj-$(CONFIG_CPU_IDLE_ZYNQ) += cpuidle-zynq.o
 -obj-$(CONFIG_CPU_IDLE_BIG_LITTLE) += cpuidle-big_little.o
 +##################################################################################
 +# ARM SoC drivers
 +obj-$(CONFIG_ARM_HIGHBANK_CPUIDLE)	+= cpuidle-calxeda.o
 +obj-$(CONFIG_ARM_KIRKWOOD_CPUIDLE)	+= cpuidle-kirkwood.o
 +obj-$(CONFIG_ARM_ZYNQ_CPUIDLE)		+= cpuidle-zynq.o
 +obj-$(CONFIG_ARM_U8500_CPUIDLE)         += cpuidle-ux500.o
++obj-$(CONFIG_CPU_IDLE_BIG_LITTLE)	+= cpuidle-big_little.o