Merge tag 'drivers-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm...

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()

diff --combined MAINTAINERS
index 233ddce8eeff5ea83b5a53ac5c540db1365cd7f2,a0001ef1b07174a116ace9ba82de2b01f00139e2..7a78b9f2aae2b9ed9af790e074cdb3c59ddcb79d
--- 1/MAINTAINERS
--- 2/MAINTAINERS
+++ b/MAINTAINERS
@@@ -580,24 -580,12 +580,24 @@@ L:      [email protected]
  S:    Maintained
  F:    drivers/media/i2c/ad9389b*
  
 +ANALOG DEVICES INC ADV7511 DRIVER
 +M:    Hans Verkuil <[email protected]>
 +L:    [email protected]
 +S:    Maintained
 +F:    drivers/media/i2c/adv7511*
 +
  ANALOG DEVICES INC ADV7604 DRIVER
  M:    Hans Verkuil <[email protected]>
  L:    [email protected]
  S:    Maintained
  F:    drivers/media/i2c/adv7604*
  
 +ANALOG DEVICES INC ADV7842 DRIVER
 +M:    Hans Verkuil <[email protected]>
 +L:    [email protected]
 +S:    Maintained
 +F:    drivers/media/i2c/adv7842*
 +
  ANALOG DEVICES INC ASOC CODEC DRIVERS
  M:    Lars-Peter Clausen <[email protected]>
  L:    [email protected]
@@@ -607,7 -595,6 +607,7 @@@ S: Supporte
  F:    sound/soc/codecs/adau*
  F:    sound/soc/codecs/adav*
  F:    sound/soc/codecs/ad1*
 +F:    sound/soc/codecs/ad7*
  F:    sound/soc/codecs/ssm*
  F:    sound/soc/codecs/sigmadsp.*
  
@@@ -651,12 -638,6 +651,12 @@@ S:       Maintaine
  F:    drivers/net/appletalk/
  F:    net/appletalk/
  
 +APTINA CAMERA SENSOR PLL
 +M:    Laurent Pinchart <[email protected]>
 +L:    [email protected]
 +S:    Maintained
 +F:    drivers/media/i2c/aptina-pll.*
 +
  ARASAN COMPACT FLASH PATA CONTROLLER
  M:    Viresh Kumar <[email protected]>
  L:    [email protected]
@@@ -832,7 -813,7 +832,7 @@@ F: arch/arm/mach-prima2
  F:    drivers/dma/sirf-dma.c
  F:    drivers/i2c/busses/i2c-sirf.c
  F:    drivers/mmc/host/sdhci-sirf.c
 -F:    drivers/pinctrl/pinctrl-sirf.c
 +F:    drivers/pinctrl/sirf/
  F:    drivers/spi/spi-sirf.c
  
  ARM/EBSA110 MACHINE SUPPORT
@@@ -1320,6 -1301,7 +1320,6 @@@ L:      [email protected]
  S:    Maintained
  F:    arch/arm/mach-vt8500/
  F:    drivers/clocksource/vt8500_timer.c
 -F:    drivers/gpio/gpio-vt8500.c
  F:    drivers/i2c/busses/i2c-wmt.c
  F:    drivers/mmc/host/wmt-sdmmc.c
  F:    drivers/pwm/pwm-vt8500.c
@@@ -1565,13 -1547,6 +1565,13 @@@ W:    http://atmelwlandriver.sourceforge.n
  S:    Maintained
  F:    drivers/net/wireless/atmel*
  
 +ATTO EXPRESSSAS SAS/SATA RAID SCSI DRIVER
 +M:      Bradley Grove <[email protected]>
 +L:      [email protected]
 +W:      http://www.attotech.com
 +S:      Supported
 +F:      drivers/scsi/esas2r
 +
  AUDIT SUBSYSTEM
  M:    Al Viro <[email protected]>
  M:    Eric Paris <[email protected]>
@@@ -1848,12 -1823,6 +1848,12 @@@ L:    [email protected]
  S:    Supported
  F:    drivers/scsi/bnx2fc/
  
 +BROADCOM BNX2I 1/10 GIGABIT iSCSI DRIVER
 +M:    Eddie Wai <[email protected]>
 +L:    [email protected]
 +S:    Supported
 +F:    drivers/scsi/bnx2i/
 +
  BROADCOM SPECIFIC AMBA DRIVER (BCMA)
  M:    Rafał Miłecki <[email protected]>
  L:    [email protected]
@@@ -2107,8 -2076,7 +2107,8 @@@ F:      drivers/usb/chipidea
  
  CISCO VIC ETHERNET NIC DRIVER
  M:    Christian Benvenuti <[email protected]>
 -M:    Roopa Prabhu <[email protected]>
 +M:    Sujith Sankar <[email protected]>
 +M:    Govindarajulu Varadarajan <[email protected]>
  M:    Neel Patel <[email protected]>
  M:    Nishank Trivedi <[email protected]>
  S:    Supported
@@@ -2144,13 -2112,6 +2144,13 @@@ M:    Russell King <[email protected]
  S:    Maintained
  F:    include/linux/clk.h
  
 +CLOCKSOURCE, CLOCKEVENT DRIVERS
 +M:    Daniel Lezcano <[email protected]>
 +M:    Thomas Gleixner <[email protected]>
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git timers/core
 +S:    Supported
 +F:    drivers/clocksource
 +
  CISCO FCOE HBA DRIVER
  M:    Hiral Patel <[email protected]>
  M:    Suma Ramars <[email protected]>
@@@ -2307,6 -2268,15 +2307,15 @@@ F:    drivers/cpufreq/arm_big_little.
  F:    drivers/cpufreq/arm_big_little.c
  F:    drivers/cpufreq/arm_big_little_dt.c
  
+ CPUIDLE DRIVER - ARM BIG LITTLE
+ M:      Lorenzo Pieralisi <[email protected]>
+ M:      Daniel Lezcano <[email protected]>
+ L:      [email protected]
+ L:      [email protected]
+ T:      git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm.git
+ S:      Maintained
+ F:      drivers/cpuidle/cpuidle-big_little.c
+ 
  CPUIDLE DRIVERS
  M:    Rafael J. Wysocki <[email protected]>
  M:    Daniel Lezcano <[email protected]>
@@@ -2493,9 -2463,9 +2502,9 @@@ S:      Maintaine
  F:    drivers/media/common/cypress_firmware*
  
  CYTTSP TOUCHSCREEN DRIVER
 -M:    Javier Martinez Canillas <[email protected]>
 +M:    Ferruh Yigit <[email protected]>
  L:    [email protected]
 -S:    Maintained
 +S:    Supported
  F:    drivers/input/touchscreen/cyttsp*
  F:    include/linux/input/cyttsp.h
  
@@@ -4140,13 -4110,6 +4149,13 @@@ W:    http://launchpad.net/ideapad-lapto
  S:    Maintained
  F:    drivers/platform/x86/ideapad-laptop.c
  
 +IDEAPAD LAPTOP SLIDEBAR DRIVER
 +M:    Andrey Moiseev <[email protected]>
 +L:    [email protected]
 +W:    https://github.com/o2genum/ideapad-slidebar
 +S:    Maintained
 +F:    drivers/input/misc/ideapad_slidebar.c
 +
  IDE/ATAPI DRIVERS
  M:    Borislav Petkov <[email protected]>
  L:    [email protected]
@@@ -4411,7 -4374,7 +4420,7 @@@ F:      drivers/net/wireless/iwlegacy
  
  INTEL WIRELESS WIFI LINK (iwlwifi)
  M:    Johannes Berg <[email protected]>
 -M:    Wey-Yi Guy <wey-yi.w.guy@intel.com>
 +M:    Emmanuel Grumbach <emmanuel.grumbach@intel.com>
  M:    Intel Linux Wireless <[email protected]>
  L:    [email protected]
  W:    http://intellinuxwireless.org
@@@ -5442,7 -5405,6 +5451,7 @@@ F:      drivers/watchdog/mena21_wdt.
  
  METAG ARCHITECTURE
  M:    James Hogan <[email protected]>
 +L:    [email protected]
  S:    Supported
  F:    arch/metag/
  F:    Documentation/metag/
@@@ -5544,7 -5506,7 +5553,7 @@@ L:      [email protected]
  S:    Supported
  F:    drivers/platform/x86/msi-wmi.c
  
 -MT9M032 SENSOR DRIVER
 +MT9M032 APTINA SENSOR DRIVER
  M:    Laurent Pinchart <[email protected]>
  L:    [email protected]
  T:    git git://linuxtv.org/media_tree.git
@@@ -5552,7 -5514,7 +5561,7 @@@ S:      Maintaine
  F:    drivers/media/i2c/mt9m032.c
  F:    include/media/mt9m032.h
  
 -MT9P031 SENSOR DRIVER
 +MT9P031 APTINA CAMERA SENSOR
  M:    Laurent Pinchart <[email protected]>
  L:    [email protected]
  T:    git git://linuxtv.org/media_tree.git
@@@ -5560,7 -5522,7 +5569,7 @@@ S:      Maintaine
  F:    drivers/media/i2c/mt9p031.c
  F:    include/media/mt9p031.h
  
 -MT9T001 SENSOR DRIVER
 +MT9T001 APTINA CAMERA SENSOR
  M:    Laurent Pinchart <[email protected]>
  L:    [email protected]
  T:    git git://linuxtv.org/media_tree.git
@@@ -5568,7 -5530,7 +5577,7 @@@ S:      Maintaine
  F:    drivers/media/i2c/mt9t001.c
  F:    include/media/mt9t001.h
  
 -MT9V032 SENSOR DRIVER
 +MT9V032 APTINA CAMERA SENSOR
  M:    Laurent Pinchart <[email protected]>
  L:    [email protected]
  T:    git git://linuxtv.org/media_tree.git
@@@ -5839,7 -5801,7 +5848,7 @@@ M:      Aloisio Almeida Jr <aloisio.almeida@
  M:    Samuel Ortiz <[email protected]>
  L:    [email protected]
  L:    [email protected] (moderated for non-subscribers)
 -S:    Maintained
 +S:    Supported
  F:    net/nfc/
  F:    include/net/nfc/
  F:    include/uapi/linux/nfc.h
@@@ -5890,8 -5852,6 +5899,8 @@@ F:      drivers/scsi/nsp32
  NTB DRIVER
  M:    Jon Mason <[email protected]>
  S:    Supported
 +W:    https://github.com/jonmason/ntb/wiki
 +T:    git git://github.com/jonmason/ntb.git
  F:    drivers/ntb/
  F:    drivers/net/ntb_netdev.c
  F:    include/linux/ntb.h
@@@ -5933,7 -5893,7 +5942,7 @@@ F:      drivers/i2c/busses/i2c-omap.
  F:    include/linux/i2c-omap.h
  
  OMAP DEVICE TREE SUPPORT
 -M:    Benoît Cousson <b-cousson@ti.com>
 +M:    Benoît Cousson <bcousson@baylibre.com>
  M:    Tony Lindgren <[email protected]>
  L:    [email protected]
  L:    [email protected]
@@@ -6013,14 -5973,14 +6022,14 @@@ S:   Maintaine
  F:    drivers/char/hw_random/omap-rng.c
  
  OMAP HWMOD SUPPORT
 -M:    Benoît Cousson <b-cousson@ti.com>
 +M:    Benoît Cousson <bcousson@baylibre.com>
  M:    Paul Walmsley <[email protected]>
  L:    [email protected]
  S:    Maintained
  F:    arch/arm/mach-omap2/omap_hwmod.*
  
  OMAP HWMOD DATA FOR OMAP4-BASED DEVICES
 -M:    Benoît Cousson <b-cousson@ti.com>
 +M:    Benoît Cousson <bcousson@baylibre.com>
  L:    [email protected]
  S:    Maintained
  F:    arch/arm/mach-omap2/omap_hwmod_44xx_data.c
@@@ -6115,7 -6075,7 +6124,7 @@@ M:      Rob Herring <[email protected]
  M:    Pawel Moll <[email protected]>
  M:    Mark Rutland <[email protected]>
  M:    Stephen Warren <[email protected]>
 -M:    Ian Campbell <i[email protected]>
 +M:    Ian Campbell <i[email protected]>
  L:    [email protected]
  S:    Maintained
  F:    Documentation/devicetree/
@@@ -6324,13 -6284,6 +6333,13 @@@ F:    Documentation/PCI
  F:    drivers/pci/
  F:    include/linux/pci*
  
 +PCI DRIVER FOR NVIDIA TEGRA
 +M:    Thierry Reding <[email protected]>
 +L:    [email protected]
 +S:    Supported
 +F:    Documentation/devicetree/bindings/pci/nvidia,tegra20-pcie.txt
 +F:    drivers/pci/host/pci-tegra.c
 +
  PCMCIA SUBSYSTEM
  P:    Linux PCMCIA Team
  L:    [email protected]
@@@ -6732,11 -6685,11 +6741,11 @@@ F:   Documentation/scsi/LICENSE.qla2xx
  F:    drivers/scsi/qla2xxx/
  
  QLOGIC QLA4XXX iSCSI DRIVER
 -M:    Ravi Anand <[email protected]>
  M:    Vikas Chaudhary <[email protected]>
  M:    [email protected]
  L:    [email protected]
  S:    Supported
 +F:    Documentation/scsi/LICENSE.qla4xxx
  F:    drivers/scsi/qla4xxx/
  
  QLOGIC QLA3XXX NETWORK DRIVER
@@@ -6977,14 -6930,6 +6986,14 @@@ M:    Maxim Levitsky <maximlevitsky@gmail.
  S:    Maintained
  F:    drivers/memstick/host/r592.*
  
 +ROCCAT DRIVERS
 +M:    Stefan Achatz <[email protected]>
 +W:    http://sourceforge.net/projects/roccat/
 +S:    Maintained
 +F:    drivers/hid/hid-roccat*
 +F:    include/linux/hid-roccat*
 +F:    Documentation/ABI/*/sysfs-driver-hid-roccat*
 +
  ROCKETPORT DRIVER
  P:    Comtrol Corp.
  W:    http://www.comtrol.com
@@@ -7207,7 -7152,7 +7216,7 @@@ S:      Maintaine
  F:    include/linux/mmc/dw_mmc.h
  F:    drivers/mmc/host/dw_mmc*
  
 -TIMEKEEPING, NTP
 +TIMEKEEPING, CLOCKSOURCE CORE, NTP
  M:    John Stultz <[email protected]>
  M:    Thomas Gleixner <[email protected]>
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git timers/core
@@@ -7220,6 -7165,7 +7229,6 @@@ F:      include/uapi/linux/timex.
  F:    kernel/time/clocksource.c
  F:    kernel/time/time*.c
  F:    kernel/time/ntp.c
 -F:    drivers/clocksource
  
  TLG2300 VIDEO4LINUX-2 DRIVER
  M:    Huang Shijie <[email protected]>
@@@ -7299,7 -7245,6 +7308,7 @@@ W:      http://lksctp.sourceforge.ne
  S:    Maintained
  F:    Documentation/networking/sctp.txt
  F:    include/linux/sctp.h
 +F:    include/uapi/linux/sctp.h
  F:    include/net/sctp/
  F:    net/sctp/
  
@@@ -7739,17 -7684,6 +7748,17 @@@ F:    include/sound
  F:    include/uapi/sound/
  F:    sound/
  
 +SOUND - COMPRESSED AUDIO
 +M:    Vinod Koul <[email protected]>
 +L:    [email protected] (moderated for non-subscribers)
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound.git
 +S:    Supported
 +F:    Documentation/sound/alsa/compress_offload.txt
 +F:    include/sound/compress_driver.h
 +F:    include/uapi/sound/compress_*
 +F:    sound/core/compress_offload.c
 +F:    sound/soc/soc-compress.c
 +
  SOUND - SOC LAYER / DYNAMIC AUDIO POWER MANAGEMENT (ASoC)
  M:    Liam Girdwood <[email protected]>
  M:    Mark Brown <[email protected]>
@@@ -7757,7 -7691,6 +7766,7 @@@ T:      git git://git.kernel.org/pub/scm/lin
  L:    [email protected] (moderated for non-subscribers)
  W:    http://alsa-project.org/main/index.php/ASoC
  S:    Supported
 +F:    Documentation/sound/alsa/soc/
  F:    sound/soc/
  F:    include/sound/soc*
  
@@@ -7966,11 -7899,11 +7975,11 @@@ S:   Maintaine
  F:    drivers/staging/nvec/
  
  STAGING - OLPC SECONDARY DISPLAY CONTROLLER (DCON)
 -M:    Andres Salomon <[email protected]>
 -M:    Chris Ball <cjb@laptop.org>
 +M:    Jens Frederich <[email protected]>
 +M:    Daniel Drake <dsd@laptop.org>
  M:    Jon Nettleton <[email protected]>
  W:    http://wiki.laptop.org/go/DCON
 -S:    Odd Fixes
 +S:    Maintained
  F:    drivers/staging/olpc_dcon/
  
  STAGING - OZMO DEVICES USB OVER WIFI DRIVER
@@@ -8048,12 -7981,6 +8057,12 @@@ F:    arch/m68k/sun3*
  F:    arch/m68k/include/asm/sun3*
  F:    drivers/net/ethernet/i825xx/sun3*
  
 +SUNDANCE NETWORK DRIVER
 +M:    Denis Kirjanov <[email protected]>
 +L:    [email protected]
 +S:    Maintained
 +F:    drivers/net/ethernet/dlink/sundance.c
 +
  SUPERH
  M:    Paul Mundt <[email protected]>
  L:    [email protected]
@@@ -8389,14 -8316,9 +8398,14 @@@ M:    Chris Metcalf <[email protected]
  W:    http://www.tilera.com/scm/
  S:    Supported
  F:    arch/tile/
 -F:    drivers/tty/hvc/hvc_tile.c
 -F:    drivers/net/ethernet/tile/
 +F:    drivers/char/tile-srom.c
  F:    drivers/edac/tile_edac.c
 +F:    drivers/net/ethernet/tile/
 +F:    drivers/rtc/rtc-tile.c
 +F:    drivers/tty/hvc/hvc_tile.c
 +F:    drivers/tty/serial/tilegx.c
 +F:    drivers/usb/host/*-tilegx.c
 +F:    include/linux/usb/tilegx.h
  
  TLAN NETWORK DRIVER
  M:    Samuel Chessman <[email protected]>
@@@ -8890,6 -8812,7 +8899,6 @@@ W:      http://www.linux-usb.or
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb.git
  S:    Supported
  F:    Documentation/usb/
 -F:    drivers/net/usb/
  F:    drivers/usb/
  F:    include/linux/usb.h
  F:    include/linux/usb/
@@@ -9112,12 -9035,6 +9121,12 @@@ F:    drivers/staging/vme
  F:    drivers/vme/
  F:    include/linux/vme*
  
 +VMWARE HYPERVISOR INTERFACE
 +M:    Alok Kataria <[email protected]>
 +L:    [email protected]
 +S:    Supported
 +F:    arch/x86/kernel/cpu/vmware.c
 +
  VMWARE VMXNET3 ETHERNET DRIVER
  M:    Shreyas Bhatewara <[email protected]>
  M:    "VMware, Inc." <[email protected]>
@@@ -9339,9 -9256,9 +9348,9 @@@ F:      drivers/media/tuners/tuner-xc2028.
  
  XEN HYPERVISOR INTERFACE
  M:    Konrad Rzeszutek Wilk <[email protected]>
 -M:    Jeremy Fitzhardinge <[email protected]>
 -L:    [email protected] (moderated for non-subscribers)
 -L:    [email protected]
 +M:    Boris Ostrovsky <[email protected]>
 +M:    David Vrabel <[email protected]>
 +L:    [email protected] (moderated for non-subscribers)
  S:    Supported
  F:    arch/x86/xen/
  F:    drivers/*/xen-*front.c
@@@ -9352,35 -9269,35 +9361,35 @@@ F:   include/uapi/xen
  
  XEN HYPERVISOR ARM
  M:    Stefano Stabellini <[email protected]>
 -L:    [email protected]source.com (moderated for non-subscribers)
 +L:    [email protected]project.org (moderated for non-subscribers)
  S:    Supported
  F:    arch/arm/xen/
  F:    arch/arm/include/asm/xen/
  
  XEN HYPERVISOR ARM64
  M:    Stefano Stabellini <[email protected]>
 -L:    [email protected]source.com (moderated for non-subscribers)
 +L:    [email protected]project.org (moderated for non-subscribers)
  S:    Supported
  F:    arch/arm64/xen/
  F:    arch/arm64/include/asm/xen/
  
  XEN NETWORK BACKEND DRIVER
  M:    Ian Campbell <[email protected]>
 -L:    [email protected]source.com (moderated for non-subscribers)
 +L:    [email protected]project.org (moderated for non-subscribers)
  L:    [email protected]
  S:    Supported
  F:    drivers/net/xen-netback/*
  
  XEN PCI SUBSYSTEM
  M:    Konrad Rzeszutek Wilk <[email protected]>
 -L:    [email protected]source.com (moderated for non-subscribers)
 +L:    [email protected]project.org (moderated for non-subscribers)
  S:    Supported
  F:    arch/x86/pci/*xen*
  F:    drivers/pci/*xen*
  
  XEN SWIOTLB SUBSYSTEM
  M:    Konrad Rzeszutek Wilk <[email protected]>
 -L:    [email protected]source.com (moderated for non-subscribers)
 +L:    [email protected]project.org (moderated for non-subscribers)
  S:    Supported
  F:    arch/x86/xen/*swiotlb*
  F:    drivers/xen/*swiotlb*

diff --combined arch/arm/mach-vexpress/tc2_pm.c
index 2b7c93a724ede88c7f755f5fcd4750ad77e0e8ad,68adb40d2c712a3e2cf5b792eb3e4a5fd874378e..7aeb5d60e484642d08ed119ecfd083b3c4074a46
--- 1/arch/arm/mach-vexpress/tc2_pm.c
--- 2/arch/arm/mach-vexpress/tc2_pm.c
+++ b/arch/arm/mach-vexpress/tc2_pm.c
@@@ -18,6 -18,7 +18,7 @@@
  #include <linux/of_address.h>
  #include <linux/spinlock.h>
  #include <linux/errno.h>
+ #include <linux/irqchip/arm-gic.h>
  
  #include <asm/mcpm.h>
  #include <asm/proc-fns.h>
@@@ -150,13 -151,8 +151,13 @@@ static void tc2_pm_down(u64 residency
                 * Let's do it in the safest possible way i.e. with
                 * no memory access within the following sequence
                 * including the stack.
 +               *
 +               * Note: fp is preserved to the stack explicitly prior doing
 +               * this since adding it to the clobber list is incompatible
 +               * with having CONFIG_FRAME_POINTER=y.
                 */
                asm volatile(
 +              "str    fp, [sp, #-4]! \n\t"
                "mrc    p15, 0, r0, c1, c0, 0   @ get CR \n\t"
                "bic    r0, r0, #"__stringify(CR_C)" \n\t"
                "mcr    p15, 0, r0, c1, c0, 0   @ set CR \n\t"
@@@ -167,10 -163,9 +168,10 @@@
                "bic    r0, r0, #(1 << 6)       @ disable local coherency \n\t"
                "mcr    p15, 0, r0, c1, c0, 1   @ set AUXCR \n\t"
                "isb    \n\t"
 -              "dsb    "
 +              "dsb    \n\t"
 +              "ldr    fp, [sp], #4"
                : : : "r0","r1","r2","r3","r4","r5","r6","r7",
 -                    "r9","r10","r11","lr","memory");
 +                    "r9","r10","lr","memory");
  
                cci_disable_port_by_cpu(mpidr);
  
@@@ -191,7 -186,6 +192,7 @@@
                 * Let's do it in the safest possible way as above.
                 */
                asm volatile(
 +              "str    fp, [sp, #-4]! \n\t"
                "mrc    p15, 0, r0, c1, c0, 0   @ get CR \n\t"
                "bic    r0, r0, #"__stringify(CR_C)" \n\t"
                "mcr    p15, 0, r0, c1, c0, 0   @ set CR \n\t"
@@@ -202,10 -196,9 +203,10 @@@
                "bic    r0, r0, #(1 << 6)       @ disable local coherency \n\t"
                "mcr    p15, 0, r0, c1, c0, 1   @ set AUXCR \n\t"
                "isb    \n\t"
 -              "dsb    "
 +              "dsb    \n\t"
 +              "ldr    fp, [sp], #4"
                : : : "r0","r1","r2","r3","r4","r5","r6","r7",
 -                    "r9","r10","r11","lr","memory");
 +                    "r9","r10","lr","memory");
        }
  
        __mcpm_cpu_down(cpu, cluster);
@@@ -230,6 -223,7 +231,7 @@@ static void tc2_pm_suspend(u64 residenc
        cpu = MPIDR_AFFINITY_LEVEL(mpidr, 0);
        cluster = MPIDR_AFFINITY_LEVEL(mpidr, 1);
        ve_spc_set_resume_addr(cluster, cpu, virt_to_phys(mcpm_entry_point));
+       gic_cpu_if_down();
        tc2_pm_down(residency);
  }
  

diff --combined drivers/cpuidle/Kconfig.arm
index b3302193c15a73861422c9bdff9b100efbca6713,0000000000000000000000000000000000000000..8e366032230893dc35c0d03f55138a20e0a33f07
mode 100644,000000..100644
--- 1/drivers/cpuidle/Kconfig.arm
--- /dev/null
+++ 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 --combined drivers/cpuidle/Makefile
index 0b9d200c7e454eefd4864abbc83bfee7f7dcb129,3b6445c106df5df28a1d5316ce083b38a84cc214..cea5ef58876d8202521545008afb9026565fbe7e
--- 1/drivers/cpuidle/Makefile
--- 2/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