Merge tag 'armsoc-soc' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc
authorLinus Torvalds <torvalds@linux-foundation.org>
Sun, 20 Mar 2016 21:57:08 +0000 (14:57 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sun, 20 Mar 2016 21:57:08 +0000 (14:57 -0700)
Pull ARM SoC platform updates from Arnd Bergmann:
 "Newly added support for additional SoCs:
   - Axis Artpec-6 SoC family
   - Allwinner A83T SoC
   - Mediatek MT7623
   - NXP i.MX6QP SoC
   - ST Microelectronics stm32f469 microcontroller

  New features:
   - SMP support for Mediatek mt2701
   - Big-endian support for NXP i.MX
   - DaVinci now uses the new DMA engine dma_slave_map
   - OMAP now uses the new DMA engine dma_slave_map
   - earlyprintk support for palmchip uart on mach-tango
   - delay timer support for orion

  Other:
   - Exynos PMU driver moved out to drivers/soc/
   - Various smaller updates for Renesas, Xilinx, PXA, AT91, OMAP,
     uniphier"

* tag 'armsoc-soc' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (83 commits)
  ARM: uniphier: rework SMP code to support new System Bus binding
  ARM: uniphier: add missing of_node_put()
  ARM: at91: avoid defining CONFIG_* symbols in source code
  ARM: DRA7: hwmod: Add data for eDMA tpcc, tptc0, tptc1
  ARM: imx: Make reset_control_ops const
  ARM: imx: Do L2 errata only if the L2 cache isn't enabled
  ARM: imx: select ARM_CPU_SUSPEND only for imx6
  dmaengine: pxa_dma: fix the maximum requestor line
  ARM: alpine: select the Alpine MSI controller driver
  ARM: pxa: add the number of DMA requestor lines
  dmaengine: mmp-pdma: add number of requestors
  dma: mmp_pdma: Add the #dma-requests DT property documentation
  ARM: OMAP2+: Add rtc hwmod configuration for ti81xx
  ARM: s3c24xx: Avoid warning for inb/outb
  ARM: zynq: Move early printk virtual address to vmalloc area
  ARM: DRA7: hwmod: Add custom reset handler for PCIeSS
  ARM: SAMSUNG: Remove unused register offset definition
  ARM: EXYNOS: Cleanup header files inclusion
  drivers: soc: samsung: Enable COMPILE_TEST
  MAINTAINERS: Add maintainers entry for drivers/soc/samsung
  ...

1  2 
MAINTAINERS
arch/arm/Kconfig
arch/arm/Makefile
arch/arm/mach-exynos/Kconfig
arch/arm/mach-imx/mach-mx27ads.c
arch/arm/mach-omap2/omap_hwmod_81xx_data.c
arch/arm/mach-shmobile/Kconfig
arch/arm/mach-shmobile/smp-emev2.c
drivers/dma/pxa_dma.c

diff --combined MAINTAINERS
@@@ -151,7 -151,7 +151,7 @@@ S: Maintaine
  F:    drivers/scsi/53c700*
  
  6LOWPAN GENERIC (BTLE/IEEE 802.15.4)
 -M:    Alexander Aring <alex.aring@gmail.com>
 +M:    Alexander Aring <aar@pengutronix.de>
  M:    Jukka Rissanen <jukka.rissanen@linux.intel.com>
  L:    linux-bluetooth@vger.kernel.org
  L:    linux-wpan@vger.kernel.org
@@@ -238,12 -238,6 +238,12 @@@ L:       lm-sensors@lm-sensors.or
  S:    Maintained
  F:    drivers/hwmon/abituguru3.c
  
 +ACCES 104-DIO-48E GPIO DRIVER
 +M:    William Breathitt Gray <vilhelm.gray@gmail.com>
 +L:    linux-gpio@vger.kernel.org
 +S:    Maintained
 +F:    drivers/gpio/gpio-104-dio-48e.c
 +
  ACCES 104-IDI-48 GPIO DRIVER
  M:    "William Breathitt Gray" <vilhelm.gray@gmail.com>
  L:    linux-gpio@vger.kernel.org
@@@ -775,12 -769,6 +775,12 @@@ L:       alsa-devel@alsa-project.org (moderat
  S:    Maintained
  F:    sound/aoa/
  
 +APEX EMBEDDED SYSTEMS STX104 DAC DRIVER
 +M:    William Breathitt Gray <vilhelm.gray@gmail.com>
 +L:    linux-iio@vger.kernel.org
 +S:    Maintained
 +F:    drivers/iio/dac/stx104.c
 +
  APM DRIVER
  M:    Jiri Kosina <jikos@kernel.org>
  S:    Odd fixes
@@@ -932,25 -920,28 +932,35 @@@ M:      Emilio López <emilio@elopez.com.ar
  S:    Maintained
  F:    drivers/clk/sunxi/
  
 -ARM/Amlogic MesonX SoC support
 +ARM/Amlogic Meson SoC support
  M:    Carlo Caione <carlo@caione.org>
  L:    linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
 +L:    linux-meson@googlegroups.com
 +W:    http://linux-meson.com/
  S:    Maintained
 -F:    drivers/media/rc/meson-ir.c
 -N:    meson[x68]
 +F:    arch/arm/mach-meson/
 +F:    arch/arm/boot/dts/meson*
 +N:    meson
  
  ARM/Annapurna Labs ALPINE ARCHITECTURE
  M:    Tsahee Zidenberg <tsahee@annapurnalabs.com>
 +M:    Antoine Tenart <antoine.tenart@free-electrons.com>
  S:    Maintained
  F:    arch/arm/mach-alpine/
 +F:    arch/arm/boot/dts/alpine*
 +F:    arch/arm64/boot/dts/al/
 +F:    drivers/*/*alpine*
  
+ ARM/ARTPEC MACHINE SUPPORT
+ M:    Jesper Nilsson <jesper.nilsson@axis.com>
+ M:    Lars Persson <lars.persson@axis.com>
+ M:    Niklas Cassel <niklas.cassel@axis.com>
+ S:    Maintained
+ L:    linux-arm-kernel@axis.com
+ F:    arch/arm/mach-artpec
+ F:    arch/arm/boot/dts/artpec6*
+ F:    drivers/clk/clk-artpec6.c
  ARM/ATMEL AT91RM9200, AT91SAM9 AND SAMA5 SOC SUPPORT
  M:    Nicolas Ferre <nicolas.ferre@atmel.com>
  M:    Alexandre Belloni <alexandre.belloni@free-electrons.com>
@@@ -1461,8 -1452,8 +1471,8 @@@ S:      Maintaine
  ARM/RENESAS ARM64 ARCHITECTURE
  M:    Simon Horman <horms@verge.net.au>
  M:    Magnus Damm <magnus.damm@gmail.com>
 -L:    linux-sh@vger.kernel.org
 -Q:    http://patchwork.kernel.org/project/linux-sh/list/
 +L:    linux-renesas-soc@vger.kernel.org
 +Q:    http://patchwork.kernel.org/project/linux-renesas-soc/list/
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas.git next
  S:    Supported
  F:    arch/arm64/boot/dts/renesas/
@@@ -1515,6 -1506,7 +1525,7 @@@ F:      arch/arm/mach-s5p*
  F:    arch/arm/mach-exynos*/
  F:    drivers/*/*s3c2410*
  F:    drivers/*/*/*s3c2410*
+ F:    drivers/soc/samsung/*
  F:    drivers/spi/spi-s3c*
  F:    sound/soc/samsung/*
  F:    Documentation/arm/Samsung/
@@@ -1968,12 -1960,6 +1979,12 @@@ M:    Nicolas Ferre <nicolas.ferre@atmel.c
  S:    Supported
  F:    drivers/tty/serial/atmel_serial.c
  
 +ATMEL SAMA5D2 ADC DRIVER
 +M:    Ludovic Desroches <ludovic.desroches@atmel.com>
 +L:    linux-iio@vger.kernel.org
 +S:    Supported
 +F:    drivers/iio/adc/at91-sama5d2_adc.c
 +
  ATMEL Audio ALSA driver
  M:    Nicolas Ferre <nicolas.ferre@atmel.com>
  L:    alsa-devel@alsa-project.org (moderated for non-subscribers)
@@@ -2176,8 -2162,7 +2187,8 @@@ M:      Marek Lindner <mareklindner@neomailb
  M:    Simon Wunderlich <sw@simonwunderlich.de>
  M:    Antonio Quartulli <a@unstable.cc>
  L:    b.a.t.m.a.n@lists.open-mesh.org
 -W:    http://www.open-mesh.org/
 +W:    https://www.open-mesh.org/
 +Q:    https://patchwork.open-mesh.org/project/batman/list/
  S:    Maintained
  F:    net/batman-adv/
  
@@@ -2388,6 -2373,14 +2399,6 @@@ T:     git git://git.kernel.org/pub/scm/lin
  S:    Maintained
  N:    bcm2835
  
 -BROADCOM BCM33XX MIPS ARCHITECTURE
 -M:    Kevin Cernekee <cernekee@gmail.com>
 -L:    linux-mips@linux-mips.org
 -S:    Maintained
 -F:    arch/mips/bcm3384/*
 -F:    arch/mips/include/asm/mach-bcm3384/*
 -F:    arch/mips/kernel/*bmips*
 -
  BROADCOM BCM47XX MIPS ARCHITECTURE
  M:    Hauke Mehrtens <hauke@hauke-m.de>
  M:    Rafał Miłecki <zajec5@gmail.com>
@@@ -2406,8 -2399,9 +2417,9 @@@ F:      arch/arm/boot/dts/bcm470
  
  BROADCOM BCM63XX ARM ARCHITECTURE
  M:    Florian Fainelli <f.fainelli@gmail.com>
- L:    linux-arm-kernel@lists.infradead.org
- T:    git git://github.com/broadcom/arm-bcm63xx.git
+ L:    linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
+ L:    bcm-kernel-feedback-list@broadcom.com
+ T:    git git://github.com/broadcom/stblinux.git
  S:    Maintained
  F:    arch/arm/mach-bcm/bcm63xx.c
  F:    arch/arm/include/debug/bcm63xx.S
@@@ -2441,14 -2435,12 +2453,14 @@@ F:   arch/mips/bmips/
  F:    arch/mips/include/asm/mach-bmips/*
  F:    arch/mips/kernel/*bmips*
  F:    arch/mips/boot/dts/brcm/bcm*.dts*
 +F:    drivers/irqchip/irq-bcm63*
  F:    drivers/irqchip/irq-bcm7*
  F:    drivers/irqchip/irq-brcmstb*
  F:    include/linux/bcm963xx_nvram.h
  F:    include/linux/bcm963xx_tag.h
  
  BROADCOM TG3 GIGABIT ETHERNET DRIVER
 +M:    Siva Reddy Kallam <siva.kallam@broadcom.com>
  M:    Prashant Sreedharan <prashant@broadcom.com>
  M:    Michael Chan <mchan@broadcom.com>
  L:    netdev@vger.kernel.org
@@@ -3472,6 -3464,7 +3484,6 @@@ F:      drivers/usb/dwc2
  DESIGNWARE USB3 DRD IP DRIVER
  M:    Felipe Balbi <balbi@kernel.org>
  L:    linux-usb@vger.kernel.org
 -L:    linux-omap@vger.kernel.org
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/balbi/usb.git
  S:    Maintained
  F:    drivers/usb/dwc3/
@@@ -3525,14 -3518,6 +3537,14 @@@ F:    include/linux/device-mapper.
  F:    include/linux/dm-*.h
  F:    include/uapi/linux/dm-*.h
  
 +DEVLINK
 +M:    Jiri Pirko <jiri@mellanox.com>
 +L:    netdev@vger.kernel.org
 +S:    Supported
 +F:    net/core/devlink.c
 +F:    include/net/devlink.h
 +F:    include/uapi/linux/devlink.h
 +
  DIALOG SEMICONDUCTOR DRIVERS
  M:    Support Opensource <support.opensource@diasemi.com>
  W:    http://www.dialog-semiconductor.com/products
@@@ -3570,6 -3555,13 +3582,6 @@@ L:     driverdev-devel@linuxdriverproject.o
  S:    Maintained
  F:    drivers/staging/dgnc/
  
 -DIGI EPCA PCI PRODUCTS
 -M:    Lidza Louina <lidza.louina@gmail.com>
 -M:    Daeseok Youn <daeseok.youn@gmail.com>
 -L:    driverdev-devel@linuxdriverproject.org
 -S:    Maintained
 -F:    drivers/staging/dgap/
 -
  DIOLAN U2C-12 I2C DRIVER
  M:    Guenter Roeck <linux@roeck-us.net>
  L:    linux-i2c@vger.kernel.org
@@@ -4250,6 -4242,13 +4262,6 @@@ M:     Maxim Levitsky <maximlevitsky@gmail.
  S:    Maintained
  F:    drivers/media/rc/ene_ir.*
  
 -ENHANCED ERROR HANDLING (EEH)
 -M:    Gavin Shan <shangw@linux.vnet.ibm.com>
 -L:    linuxppc-dev@lists.ozlabs.org
 -S:    Supported
 -F:    Documentation/powerpc/eeh-pci-error-recovery.txt
 -F:    arch/powerpc/kernel/eeh*.c
 -
  EPSON S1D13XXX FRAMEBUFFER DRIVER
  M:    Kristoffer Ericson <kristoffer.ericson@gmail.com>
  S:    Maintained
@@@ -4533,12 -4532,6 +4545,12 @@@ L:    linuxppc-dev@lists.ozlabs.or
  S:    Maintained
  F:    drivers/dma/fsldma.*
  
 +FREESCALE GPMI NAND DRIVER
 +M:    Han Xu <han.xu@nxp.com>
 +L:    linux-mtd@lists.infradead.org
 +S:    Maintained
 +F:    drivers/mtd/nand/gpmi-nand/*
 +
  FREESCALE I2C CPM DRIVER
  M:    Jochen Friedrich <jochen@scram.de>
  L:    linuxppc-dev@lists.ozlabs.org
@@@ -4555,7 -4548,7 +4567,7 @@@ F:      include/linux/platform_data/video-im
  F:    drivers/video/fbdev/imxfb.c
  
  FREESCALE QUAD SPI DRIVER
 -M:    Han Xu <han.xu@freescale.com>
 +M:    Han Xu <han.xu@nxp.com>
  L:    linux-mtd@lists.infradead.org
  S:    Maintained
  F:    drivers/mtd/spi-nor/fsl-quadspi.c
@@@ -4569,15 -4562,6 +4581,15 @@@ S:    Maintaine
  F:    drivers/net/ethernet/freescale/fs_enet/
  F:    include/linux/fs_enet_pd.h
  
 +FREESCALE IMX / MXC FEC DRIVER
 +M:    Fugang Duan <fugang.duan@nxp.com>
 +L:    netdev@vger.kernel.org
 +S:    Maintained
 +F:    drivers/net/ethernet/freescale/fec_main.c
 +F:    drivers/net/ethernet/freescale/fec_ptp.c
 +F:    drivers/net/ethernet/freescale/fec.h
 +F:    Documentation/devicetree/bindings/net/fsl-fec.txt
 +
  FREESCALE QUICC ENGINE LIBRARY
  L:    linuxppc-dev@lists.ozlabs.org
  S:    Orphan
@@@ -4841,14 -4825,10 +4853,14 @@@ L:   linux-gpio@vger.kernel.or
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-gpio.git
  S:    Maintained
  F:    Documentation/gpio/
 +F:    Documentation/ABI/testing/gpio-cdev
 +F:    Documentation/ABI/obsolete/sysfs-gpio
  F:    drivers/gpio/
  F:    include/linux/gpio/
  F:    include/linux/gpio.h
  F:    include/asm-generic/gpio.h
 +F:    include/uapi/linux/gpio.h
 +F:    tools/gpio/
  
  GRE DEMULTIPLEXER DRIVER
  M:    Dmitry Kozlov <xeb@mail.ru>
@@@ -4997,7 -4977,6 +5009,7 @@@ F:      include/linux/hw_random.
  
  HARDWARE SPINLOCK CORE
  M:    Ohad Ben-Cohen <ohad@wizery.com>
 +M:    Bjorn Andersson <bjorn.andersson@linaro.org>
  S:    Maintained
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/ohad/hwspinlock.git
  F:    Documentation/hwspinlock.txt
@@@ -5019,10 -4998,16 +5031,10 @@@ T:   git git://linuxtv.org/anttip/media_t
  S:    Maintained
  F:    drivers/media/dvb-frontends/hd29l2*
  
 -HEWLETT-PACKARD SMART2 RAID DRIVER
 -L:    iss_storagedev@hp.com
 -S:    Orphan
 -F:    Documentation/blockdev/cpqarray.txt
 -F:    drivers/block/cpqarray.*
 -
  HEWLETT-PACKARD SMART ARRAY RAID DRIVER (hpsa)
 -M:    Don Brace <don.brace@pmcs.com>
 +M:    Don Brace <don.brace@microsemi.com>
  L:    iss_storagedev@hp.com
 -L:    storagedev@pmcs.com
 +L:    esc.storagedev@microsemi.com
  L:    linux-scsi@vger.kernel.org
  S:    Supported
  F:    Documentation/scsi/hpsa.txt
@@@ -5031,9 -5016,9 +5043,9 @@@ F:      include/linux/cciss*.
  F:    include/uapi/linux/cciss*.h
  
  HEWLETT-PACKARD SMART CISS RAID DRIVER (cciss)
 -M:    Don Brace <don.brace@pmcs.com>
 +M:    Don Brace <don.brace@microsemi.com>
  L:    iss_storagedev@hp.com
 -L:    storagedev@pmcs.com
 +L:    esc.storagedev@microsemi.com
  L:    linux-scsi@vger.kernel.org
  S:    Supported
  F:    Documentation/blockdev/cciss.txt
@@@ -5218,7 -5203,6 +5230,7 @@@ F:      arch/x86/kernel/cpu/mshyperv.
  F:    drivers/hid/hid-hyperv.c
  F:    drivers/hv/
  F:    drivers/input/serio/hyperv-keyboard.c
 +F:    drivers/pci/host/pci-hyperv.c
  F:    drivers/net/hyperv/
  F:    drivers/scsi/storvsc_drv.c
  F:    drivers/video/fbdev/hyperv_fb.c
@@@ -5450,11 -5434,10 +5462,11 @@@ S:   Supporte
  F:    drivers/idle/i7300_idle.c
  
  IEEE 802.15.4 SUBSYSTEM
 -M:    Alexander Aring <alex.aring@gmail.com>
 +M:    Alexander Aring <aar@pengutronix.de>
  L:    linux-wpan@vger.kernel.org
 -W:    https://github.com/linux-wpan
 -T:    git git://github.com/linux-wpan/linux-wpan-next.git
 +W:    http://wpan.cakelab.org/
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/bluetooth/bluetooth.git
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/bluetooth/bluetooth-next.git
  S:    Maintained
  F:    net/ieee802154/
  F:    net/mac802154/
@@@ -5584,7 -5567,6 +5596,7 @@@ F:      drivers/input
  F:    include/linux/input.h
  F:    include/uapi/linux/input.h
  F:    include/linux/input/
 +F:    Documentation/devicetree/bindings/input/
  
  INPUT MULTITOUCH (MT) PROTOCOL
  M:    Henrik Rydberg <rydberg@bitmath.org>
@@@ -5779,7 -5761,6 +5791,7 @@@ S:      Supporte
  F:    include/uapi/linux/mei.h
  F:    include/linux/mei_cl_bus.h
  F:    drivers/misc/mei/*
 +F:    drivers/watchdog/mei_wdt.c
  F:    Documentation/misc-devices/mei/*
  
  INTEL MIC DRIVERS (mic)
@@@ -6082,7 -6063,7 +6094,7 @@@ S:      Maintaine
  F:    drivers/media/platform/rcar_jpu.c
  
  JSM Neo PCI based serial card
 -M:    Thadeu Lima de Souza Cascardo <cascardo@linux.vnet.ibm.com>
 +M:    Gabriel Krisman Bertazi <krisman@linux.vnet.ibm.com>
  L:    linux-serial@vger.kernel.org
  S:    Maintained
  F:    drivers/tty/serial/jsm/
@@@ -6167,7 -6148,7 +6179,7 @@@ F:      include/uapi/linux/sunrpc
  
  KERNEL SELFTEST FRAMEWORK
  M:    Shuah Khan <shuahkh@osg.samsung.com>
 -L:    linux-api@vger.kernel.org
 +L:    linux-kselftest@vger.kernel.org
  T:    git git://git.kernel.org/pub/scm/shuah/linux-kselftest
  S:    Maintained
  F:    tools/testing/selftests
@@@ -6600,10 -6581,9 +6612,10 @@@ F:    drivers/platform/x86/hp_accel.
  
  LIVE PATCHING
  M:    Josh Poimboeuf <jpoimboe@redhat.com>
 -M:    Seth Jennings <sjenning@redhat.com>
 +M:    Jessica Yu <jeyu@redhat.com>
  M:    Jiri Kosina <jikos@kernel.org>
 -M:    Vojtech Pavlik <vojtech@suse.com>
 +M:    Miroslav Benes <mbenes@suse.cz>
 +R:    Petr Mladek <pmladek@suse.com>
  S:    Maintained
  F:    kernel/livepatch/
  F:    include/linux/livepatch.h
@@@ -6614,11 -6594,6 +6626,11 @@@ F:    samples/livepatch
  L:    live-patching@vger.kernel.org
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/jikos/livepatching.git
  
 +LINUX KERNEL DUMP TEST MODULE (LKDTM)
 +M:    Kees Cook <keescook@chromium.org>
 +S:    Maintained
 +F:    drivers/misc/lkdtm.c
 +
  LLC (802.2)
  M:    Arnaldo Carvalho de Melo <acme@ghostprotocols.net>
  S:    Maintained
@@@ -6704,12 -6679,13 +6716,12 @@@ S:   Maintaine
  F:    arch/arm/mach-lpc32xx/
  
  LSILOGIC MPT FUSION DRIVERS (FC/SAS/SPI)
 -M:    Nagalakshmi Nandigama <nagalakshmi.nandigama@avagotech.com>
 -M:    Praveen Krishnamoorthy <praveen.krishnamoorthy@avagotech.com>
 -M:    Sreekanth Reddy <sreekanth.reddy@avagotech.com>
 -M:    Abhijit Mahajan <abhijit.mahajan@avagotech.com>
 -L:    MPT-FusionLinux.pdl@avagotech.com
 +M:    Sathya Prakash <sathya.prakash@broadcom.com>
 +M:    Chaitra P B <chaitra.basappa@broadcom.com>
 +M:    Suganath Prabu Subramani <suganath-prabu.subramani@broadcom.com>
 +L:    MPT-FusionLinux.pdl@broadcom.com
  L:    linux-scsi@vger.kernel.org
 -W:    http://www.lsilogic.com/support
 +W:    http://www.avagotech.com/support/
  S:    Supported
  F:    drivers/message/fusion/
  F:    drivers/scsi/mpt2sas/
@@@ -6802,7 -6778,6 +6814,7 @@@ S:      Maintaine
  F:    Documentation/networking/mac80211-injection.txt
  F:    include/net/mac80211.h
  F:    net/mac80211/
 +F:    drivers/net/wireless/mac80211_hwsim.[ch]
  
  MACVLAN DRIVER
  M:    Patrick McHardy <kaber@trash.net>
@@@ -6932,7 -6907,7 +6944,7 @@@ MAXIM MAX77802 MULTIFUNCTION PMIC DEVIC
  M:    Javier Martinez Canillas <javier@osg.samsung.com>
  L:    linux-kernel@vger.kernel.org
  S:    Supported
 -F:    drivers/*/*max77802.c
 +F:    drivers/*/*max77802*.c
  F:    Documentation/devicetree/bindings/*/*max77802.txt
  F:    include/dt-bindings/*/*max77802.h
  
@@@ -6942,7 -6917,7 +6954,7 @@@ M:      Krzysztof Kozlowski <k.kozlowski@sam
  L:    linux-kernel@vger.kernel.org
  S:    Supported
  F:    drivers/*/max14577.c
 -F:    drivers/*/max77686.c
 +F:    drivers/*/max77686*.c
  F:    drivers/*/max77693.c
  F:    drivers/extcon/extcon-max14577.c
  F:    drivers/extcon/extcon-max77693.c
@@@ -7047,13 -7022,6 +7059,13 @@@ F:    include/uapi/linux/meye.
  F:    include/uapi/linux/ivtv*
  F:    include/uapi/linux/uvcvideo.h
  
 +MEDIATEK ETHERNET DRIVER
 +M:    Felix Fietkau <nbd@openwrt.org>
 +M:    John Crispin <blogic@openwrt.org>
 +L:    netdev@vger.kernel.org
 +S:    Maintained
 +F:    drivers/net/ethernet/mediatek/
 +
  MEDIATEK MT7601U WIRELESS LAN DRIVER
  M:    Jakub Kicinski <kubakici@wp.pl>
  L:    linux-wireless@vger.kernel.org
@@@ -7265,8 -7233,10 +7277,8 @@@ L:     linux-media@vger.kernel.or
  W:    https://linuxtv.org
  W:    http://palosaari.fi/linux/
  Q:    http://patchwork.linuxtv.org/project/linux-media/list/
 -T:    git git://linuxtv.org/anttip/media_tree.git
  S:    Maintained
 -F:    drivers/staging/media/mn88473/
 -F:    drivers/media/dvb-frontends/mn88473.h
 +F:    drivers/media/dvb-frontends/mn88473*
  
  MODULE SUPPORT
  M:    Rusty Russell <rusty@rustcorp.com.au>
@@@ -7404,7 -7374,7 +7416,7 @@@ F:      drivers/tty/isicom.
  F:    include/linux/isicom.h
  
  MUSB MULTIPOINT HIGH SPEED DUAL-ROLE CONTROLLER
 -M:    Felipe Balbi <balbi@kernel.org>
 +M:    Bin Liu <b-liu@ti.com>
  L:    linux-usb@vger.kernel.org
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/balbi/usb.git
  S:    Maintained
@@@ -7427,17 -7397,6 +7439,17 @@@ W:    https://www.myricom.com/support/down
  S:    Supported
  F:    drivers/net/ethernet/myricom/myri10ge/
  
 +NAND FLASH SUBSYSTEM
 +M:    Boris Brezillon <boris.brezillon@free-electrons.com>
 +R:    Richard Weinberger <richard@nod.at>
 +L:    linux-mtd@lists.infradead.org
 +W:    http://www.linux-mtd.infradead.org/
 +Q:    http://patchwork.ozlabs.org/project/linux-mtd/list/
 +T:    git git://github.com/linux-nand/linux.git
 +S:    Maintained
 +F:    drivers/mtd/nand/
 +F:    include/linux/mtd/nand*.h
 +
  NATSEMI ETHERNET DRIVER (DP8381x)
  S:    Orphan
  F:    drivers/net/ethernet/natsemi/natsemi.c
@@@ -7551,6 -7510,7 +7563,6 @@@ F:      net/netrom
  
  NETRONOME ETHERNET DRIVERS
  M:    Jakub Kicinski <jakub.kicinski@netronome.com>
 -M:    Rolf Neugebauer <rolf.neugebauer@netronome.com>
  L:    oss-drivers@netronome.com
  S:    Maintained
  F:    drivers/net/ethernet/netronome/
@@@ -7687,6 -7647,7 +7699,6 @@@ F:      net/nfc
  F:    include/net/nfc/
  F:    include/uapi/linux/nfc.h
  F:    drivers/nfc/
 -F:    include/linux/platform_data/microread.h
  F:    include/linux/platform_data/nfcmrvl.h
  F:    include/linux/platform_data/nxp-nci.h
  F:    include/linux/platform_data/pn544.h
@@@ -7745,13 -7706,13 +7757,13 @@@ S:   Maintaine
  F:    arch/nios2/
  
  NOKIA N900 POWER SUPPLY DRIVERS
 -M:    Pali Rohár <pali.rohar@gmail.com>
 -S:    Maintained
 +R:    Pali Rohár <pali.rohar@gmail.com>
  F:    include/linux/power/bq2415x_charger.h
  F:    include/linux/power/bq27xxx_battery.h
  F:    include/linux/power/isp1704_charger.h
  F:    drivers/power/bq2415x_charger.c
  F:    drivers/power/bq27xxx_battery.c
 +F:    drivers/power/bq27xxx_battery_i2c.c
  F:    drivers/power/isp1704_charger.c
  F:    drivers/power/rx51_battery.c
  
@@@ -7887,7 -7848,7 +7899,7 @@@ S:      Maintaine
  F:    arch/arm/*omap*/*clock*
  
  OMAP POWER MANAGEMENT SUPPORT
 -M:    Kevin Hilman <khilman@deeprootsystems.com>
 +M:    Kevin Hilman <khilman@kernel.org>
  L:    linux-omap@vger.kernel.org
  S:    Maintained
  F:    arch/arm/*omap*/*pm*
@@@ -7982,16 -7943,18 +7994,16 @@@ F:   drivers/media/platform/omap3isp
  F:    drivers/staging/media/omap4iss/
  
  OMAP USB SUPPORT
 -M:    Felipe Balbi <balbi@kernel.org>
  L:    linux-usb@vger.kernel.org
  L:    linux-omap@vger.kernel.org
 -T:    git git://git.kernel.org/pub/scm/linux/kernel/git/balbi/usb.git
 -S:    Maintained
 +S:    Orphan
  F:    drivers/usb/*/*omap*
  F:    arch/arm/*omap*/usb*
  
  OMAP GPIO DRIVER
  M:    Grygorii Strashko <grygorii.strashko@ti.com>
  M:    Santosh Shilimkar <ssantosh@kernel.org>
 -M:    Kevin Hilman <khilman@deeprootsystems.com>
 +M:    Kevin Hilman <khilman@kernel.org>
  L:    linux-omap@vger.kernel.org
  S:    Maintained
  F:    Documentation/devicetree/bindings/gpio/gpio-omap.txt
@@@ -8210,13 -8173,6 +8222,13 @@@ S:    Maintaine
  F:    Documentation/mn10300/
  F:    arch/mn10300/
  
 +PARALLEL LCD/KEYPAD PANEL DRIVER
 +M:      Willy Tarreau <willy@haproxy.com>
 +M:      Ksenija Stanojevic <ksenija.stanojevic@gmail.com>
 +S:      Odd Fixes
 +F:      Documentation/misc-devices/lcd-panel-cgram.txt
 +F:      drivers/misc/panel.c
 +
  PARALLEL PORT SUBSYSTEM
  M:    Sudip Mukherjee <sudipm.mukherjee@gmail.com>
  M:    Sudip Mukherjee <sudip@vectorindia.org>
@@@ -8308,15 -8264,6 +8320,15 @@@ L:    linux-pci@vger.kernel.or
  S:    Supported
  F:    Documentation/PCI/pci-error-recovery.txt
  
 +PCI ENHANCED ERROR HANDLING (EEH) FOR POWERPC
 +M:    Russell Currey <ruscur@russell.cc>
 +L:    linuxppc-dev@lists.ozlabs.org
 +S:    Supported
 +F:    Documentation/powerpc/eeh-pci-error-recovery.txt
 +F:    arch/powerpc/kernel/eeh*.c
 +F:    arch/powerpc/platforms/*/eeh*.c
 +F:    arch/powerpc/include/*/eeh*.h
 +
  PCI SUBSYSTEM
  M:    Bjorn Helgaas <bhelgaas@google.com>
  L:    linux-pci@vger.kernel.org
@@@ -8424,20 -8371,12 +8436,20 @@@ L:   linux-pci@vger.kernel.or
  S:    Maintained
  F:    drivers/pci/host/*designware*
  
 +PCI DRIVER FOR SYNOPSYS PROTOTYPING DEVICE
 +M:    Joao Pinto <jpinto@synopsys.com>
 +L:    linux-pci@vger.kernel.org
 +S:    Maintained
 +F:    Documentation/devicetree/bindings/pci/designware-pcie.txt
 +F:    drivers/pci/host/pcie-designware-plat.c
 +
  PCI DRIVER FOR GENERIC OF HOSTS
  M:    Will Deacon <will.deacon@arm.com>
  L:    linux-pci@vger.kernel.org
  L:    linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
  S:    Maintained
  F:    Documentation/devicetree/bindings/pci/host-generic-pci.txt
 +F:    drivers/pci/host/pci-host-common.c
  F:    drivers/pci/host/pci-host-generic.c
  
  PCI DRIVER FOR INTEL VOLUME MANAGEMENT DEVICE (VMD)
@@@ -8483,14 -8422,6 +8495,14 @@@ L:     linux-arm-msm@vger.kernel.or
  S:     Maintained
  F:     drivers/pci/host/*qcom*
  
 +PCIE DRIVER FOR CAVIUM THUNDERX
 +M:    David Daney <david.daney@cavium.com>
 +L:    linux-pci@vger.kernel.org
 +L:    linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
 +S:    Supported
 +F:    Documentation/devicetree/bindings/pci/pci-thunder-*
 +F:    drivers/pci/host/pci-thunder-*
 +
  PCMCIA SUBSYSTEM
  P:    Linux PCMCIA Team
  L:    linux-pcmcia@lists.infradead.org
@@@ -8516,7 -8447,7 +8528,7 @@@ F:      include/crypto/pcrypt.
  
  PER-CPU MEMORY ALLOCATOR
  M:    Tejun Heo <tj@kernel.org>
 -M:    Christoph Lameter <cl@linux-foundation.org>
 +M:    Christoph Lameter <cl@linux.com>
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/tj/percpu.git
  S:    Maintained
  F:    include/linux/percpu*.h
@@@ -8533,7 -8464,6 +8545,7 @@@ PERFORMANCE EVENTS SUBSYSTE
  M:    Peter Zijlstra <peterz@infradead.org>
  M:    Ingo Molnar <mingo@redhat.com>
  M:    Arnaldo Carvalho de Melo <acme@kernel.org>
 +R:    Alexander Shishkin <alexander.shishkin@linux.intel.com>
  L:    linux-kernel@vger.kernel.org
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git perf/core
  S:    Supported
@@@ -9156,14 -9086,10 +9168,14 @@@ S:   Maintaine
  F:    drivers/net/ethernet/rdc/r6040.c
  
  RDS - RELIABLE DATAGRAM SOCKETS
 -M:    Chien Yen <chien.yen@oracle.com>
 +M:    Santosh Shilimkar <santosh.shilimkar@oracle.com>
 +L:    netdev@vger.kernel.org
 +L:    linux-rdma@vger.kernel.org
  L:    rds-devel@oss.oracle.com (moderated for non-subscribers)
 +W:    https://oss.oracle.com/projects/rds/
  S:    Supported
  F:    net/rds/
 +F:    Documentation/networking/rds.txt
  
  READ-COPY UPDATE (RCU)
  M:    "Paul E. McKenney" <paulmck@linux.vnet.ibm.com>
@@@ -9216,7 -9142,6 +9228,7 @@@ F:      include/linux/regmap.
  
  REMOTE PROCESSOR (REMOTEPROC) SUBSYSTEM
  M:    Ohad Ben-Cohen <ohad@wizery.com>
 +M:    Bjorn Andersson <bjorn.andersson@linaro.org>
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/ohad/remoteproc.git
  S:    Maintained
  F:    drivers/remoteproc/
@@@ -9225,7 -9150,6 +9237,7 @@@ F:      include/linux/remoteproc.
  
  REMOTE PROCESSOR MESSAGING (RPMSG) SUBSYSTEM
  M:    Ohad Ben-Cohen <ohad@wizery.com>
 +M:    Bjorn Andersson <bjorn.andersson@linaro.org>
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/ohad/rpmsg.git
  S:    Maintained
  F:    drivers/rpmsg/
@@@ -9564,7 -9488,6 +9576,7 @@@ F:      drivers/media/i2c/s5k5baf.
  
  SAMSUNG S3FWRN5 NFC DRIVER
  M:    Robert Baldyga <r.baldyga@samsung.com>
 +M:    Krzysztof Opasiak <k.opasiak@samsung.com>
  L:    linux-nfc@lists.01.org (moderated for non-subscribers)
  S:    Supported
  F:    drivers/nfc/s3fwrn5
@@@ -9655,12 -9578,6 +9667,12 @@@ M:    Andreas Noever <andreas.noever@gmail
  S:    Maintained
  F:    drivers/thunderbolt/
  
 +TI BQ27XXX POWER SUPPLY DRIVER
 +R:    Andrew F. Davis <afd@ti.com>
 +F:    include/linux/power/bq27xxx_battery.h
 +F:    drivers/power/bq27xxx_battery.c
 +F:    drivers/power/bq27xxx_battery_i2c.c
 +
  TIMEKEEPING, CLOCKSOURCE CORE, NTP, ALARMTIMER
  M:    John Stultz <john.stultz@linaro.org>
  M:    Thomas Gleixner <tglx@linutronix.de>
@@@ -9738,7 -9655,7 +9750,7 @@@ F:      drivers/scsi/sg.
  F:    include/scsi/sg.h
  
  SCSI SUBSYSTEM
 -M:    "James E.J. Bottomley" <JBottomley@odin.com>
 +M:    "James E.J. Bottomley" <jejb@linux.vnet.ibm.com>
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi.git
  M:    "Martin K. Petersen" <martin.petersen@oracle.com>
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/mkp/scsi.git
@@@ -9882,11 -9799,10 +9894,11 @@@ S:   Supporte
  F:    drivers/scsi/be2iscsi/
  
  Emulex 10Gbps NIC BE2, BE3-R, Lancer, Skyhawk-R DRIVER
 -M:    Sathya Perla <sathya.perla@avagotech.com>
 -M:    Ajit Khaparde <ajit.khaparde@avagotech.com>
 -M:    Padmanabh Ratnakar <padmanabh.ratnakar@avagotech.com>
 -M:    Sriharsha Basavapatna <sriharsha.basavapatna@avagotech.com>
 +M:    Sathya Perla <sathya.perla@broadcom.com>
 +M:    Ajit Khaparde <ajit.khaparde@broadcom.com>
 +M:    Padmanabh Ratnakar <padmanabh.ratnakar@broadcom.com>
 +M:    Sriharsha Basavapatna <sriharsha.basavapatna@broadcom.com>
 +M:    Somnath Kotur <somnath.kotur@broadcom.com>
  L:    netdev@vger.kernel.org
  W:    http://www.emulex.com
  S:    Supported
@@@ -10048,7 -9964,7 +10060,7 @@@ F:    arch/arm/mach-s3c24xx/bast-irq.
  
  TI DAVINCI MACHINE SUPPORT
  M:    Sekhar Nori <nsekhar@ti.com>
 -M:    Kevin Hilman <khilman@deeprootsystems.com>
 +M:    Kevin Hilman <khilman@kernel.org>
  T:    git git://gitorious.org/linux-davinci/linux-davinci.git
  Q:    http://patchwork.kernel.org/project/linux-davinci/list/
  S:    Supported
@@@ -10484,6 -10400,19 +10496,6 @@@ L:  linux-tegra@vger.kernel.or
  S:    Maintained
  F:    drivers/staging/nvec/
  
 -STAGING - OLPC SECONDARY DISPLAY CONTROLLER (DCON)
 -M:    Jens Frederich <jfrederich@gmail.com>
 -M:    Daniel Drake <dsd@laptop.org>
 -M:    Jon Nettleton <jon.nettleton@gmail.com>
 -W:    http://wiki.laptop.org/go/DCON
 -S:    Maintained
 -F:    drivers/staging/olpc_dcon/
 -
 -STAGING - PARALLEL LCD/KEYPAD PANEL DRIVER
 -M:    Willy Tarreau <willy@meta-x.org>
 -S:    Odd Fixes
 -F:    drivers/staging/panel/
 -
  STAGING - REALTEK RTL8712U DRIVERS
  M:    Larry Finger <Larry.Finger@lwfinger.net>
  M:    Florian Schilhabel <florian.c.schilhabel@googlemail.com>.
@@@ -10932,14 -10861,6 +10944,14 @@@ L: linux-omap@vger.kernel.or
  S:    Maintained
  F:    drivers/thermal/ti-soc-thermal/
  
 +TI VPE/CAL DRIVERS
 +M:    Benoit Parrot <bparrot@ti.com>
 +L:    linux-media@vger.kernel.org
 +W:    http://linuxtv.org/
 +Q:    http://patchwork.linuxtv.org/project/linux-media/list/
 +S:    Maintained
 +F:    drivers/media/platform/ti-vpe/
 +
  TI CDCE706 CLOCK DRIVER
  M:    Max Filippov <jcmvbkbc@gmail.com>
  S:    Maintained
@@@ -11163,8 -11084,8 +11175,8 @@@ M:   Jarkko Sakkinen <jarkko.sakkinen@lin
  R:    Jason Gunthorpe <jgunthorpe@obsidianresearch.com>
  W:    http://tpmdd.sourceforge.net
  L:    tpmdd-devel@lists.sourceforge.net (moderated for non-subscribers)
 -Q:    git git://github.com/PeterHuewe/linux-tpmdd.git
 -T:    git https://github.com/PeterHuewe/linux-tpmdd
 +Q:    https://patchwork.kernel.org/project/tpmdd-devel/list/
 +T:    git git://git.infradead.org/users/jjs/linux-tpmdd.git
  S:    Maintained
  F:    drivers/char/tpm/
  
@@@ -11319,6 -11240,7 +11331,6 @@@ F:   include/linux/cdrom.
  F:    include/uapi/linux/cdrom.h
  
  UNISYS S-PAR DRIVERS
 -M:    Benjamin Romer <benjamin.romer@unisys.com>
  M:    David Kershner <david.kershner@unisys.com>
  L:    sparmaintainer@unisys.com (Unisys internal)
  S:    Supported
@@@ -11343,7 -11265,7 +11355,7 @@@ F:   include/linux/mtd/ubi.
  F:    include/uapi/mtd/ubi-user.h
  
  USB ACM DRIVER
 -M:    Oliver Neukum <oliver@neukum.org>
 +M:    Oliver Neukum <oneukum@suse.com>
  L:    linux-usb@vger.kernel.org
  S:    Maintained
  F:    Documentation/usb/acm.txt
@@@ -11428,13 -11350,6 +11440,13 @@@ S: Maintaine
  F:    drivers/usb/host/isp116x*
  F:    include/linux/usb/isp116x.h
  
 +USB LAN78XX ETHERNET DRIVER
 +M:    Woojung Huh <woojung.huh@microchip.com>
 +M:    Microchip Linux Driver Support <UNGLinuxDriver@microchip.com>
 +L:    netdev@vger.kernel.org
 +S:    Maintained
 +F:    drivers/net/usb/lan78xx.*
 +
  USB MASS STORAGE DRIVER
  M:    Matthew Dharm <mdharm-usb@one-eyed-alien.net>
  L:    linux-usb@vger.kernel.org
@@@ -11474,7 -11389,6 +11486,7 @@@ M:   Valentina Manea <valentina.manea.m@g
  M:    Shuah Khan <shuah.kh@samsung.com>
  L:    linux-usb@vger.kernel.org
  S:    Maintained
 +F:    Documentation/usb/usbip_protocol.txt
  F:    drivers/usb/usbip/
  F:    tools/usb/usbip/
  
@@@ -11965,18 -11879,6 +11977,18 @@@ M: David Härdeman <david@hardeman.nu
  S:    Maintained
  F:    drivers/media/rc/winbond-cir.c
  
 +WINSYSTEMS EBC-C384 WATCHDOG DRIVER
 +M:    William Breathitt Gray <vilhelm.gray@gmail.com>
 +L:    linux-watchdog@vger.kernel.org
 +S:    Maintained
 +F:    drivers/watchdog/ebc-c384_wdt.c
 +
 +WINSYSTEMS WS16C48 GPIO DRIVER
 +M:    William Breathitt Gray <vilhelm.gray@gmail.com>
 +L:    linux-gpio@vger.kernel.org
 +S:    Maintained
 +F:    drivers/gpio/gpio-ws16c48.c
 +
  WIMAX STACK
  M:    Inaky Perez-Gonzalez <inaky.perez-gonzalez@intel.com>
  M:    linux-wimax@intel.com
@@@ -12130,6 -12032,7 +12142,6 @@@ F:   arch/arm64/xen
  F:    arch/arm64/include/asm/xen/
  
  XEN NETWORK BACKEND DRIVER
 -M:    Ian Campbell <ian.campbell@citrix.com>
  M:    Wei Liu <wei.liu2@citrix.com>
  L:    xen-devel@lists.xenproject.org (moderated for non-subscribers)
  L:    netdev@vger.kernel.org
diff --combined arch/arm/Kconfig
@@@ -527,10 -527,10 +527,10 @@@ config ARCH_LPC32X
        select ARCH_REQUIRE_GPIOLIB
        select ARM_AMBA
        select CLKDEV_LOOKUP
 -      select CLKSRC_MMIO
 +      select CLKSRC_LPC32XX
 +      select COMMON_CLK
        select CPU_ARM926T
        select GENERIC_CLOCKEVENTS
 -      select HAVE_IDE
        select USE_OF
        help
          Support for the NXP LPC32XX family of processors
@@@ -547,6 -547,7 +547,7 @@@ config ARCH_PX
        select CLKSRC_PXA
        select CLKSRC_MMIO
        select CLKSRC_OF
+       select CPU_XSCALE if !CPU_XSC3
        select GENERIC_CLOCKEVENTS
        select GPIO_PXA
        select HAVE_IDE
@@@ -572,6 -573,7 +573,6 @@@ config ARCH_RP
        select NEED_MACH_IO_H
        select NEED_MACH_MEMORY_H
        select NO_IOPORT_MAP
 -      select VIRT_TO_BUS
        help
          On the Acorn Risc-PC, Linux can support the internal IDE disk and
          CD-ROM interface, serial and parallel port, and the floppy drive.
@@@ -622,7 -624,6 +623,7 @@@ config ARCH_DAVINC
        select ARCH_HAS_HOLES_MEMORYMODEL
        select ARCH_REQUIRE_GPIOLIB
        select CLKDEV_LOOKUP
 +      select CPU_ARM926T
        select GENERIC_ALLOCATOR
        select GENERIC_CLOCKEVENTS
        select GENERIC_IRQ_CHIP
@@@ -724,6 -725,8 +725,8 @@@ source "arch/arm/mach-mvebu/Kconfig
  
  source "arch/arm/mach-alpine/Kconfig"
  
+ source "arch/arm/mach-artpec/Kconfig"
  source "arch/arm/mach-asm9260/Kconfig"
  
  source "arch/arm/mach-at91/Kconfig"
@@@ -879,10 -882,16 +882,16 @@@ config ARCH_STM3
        select ARCH_HAS_RESET_CONTROLLER
        select ARMV7M_SYSTICK
        select CLKSRC_STM32
+       select PINCTRL
        select RESET_CONTROLLER
        help
          Support for STMicroelectronics STM32 processors.
  
+ config MACH_STM32F429
+       bool "STMicrolectronics STM32F429"
+       depends on ARCH_STM32
+       default y
  # Definitions to make life easier
  config ARCH_ACORN
        bool
@@@ -1212,6 -1221,7 +1221,6 @@@ config PCI_HOST_ITE815
        select DMABOUNCE
  
  source "drivers/pci/Kconfig"
 -source "drivers/pci/pcie/Kconfig"
  
  source "drivers/pcmcia/Kconfig"
  
@@@ -1336,6 -1346,7 +1345,6 @@@ config BIG_LITTL
  config BL_SWITCHER
        bool "big.LITTLE switcher support"
        depends on BIG_LITTLE && MCPM && HOTPLUG_CPU && ARM_GIC
 -      select ARM_CPU_SUSPEND
        select CPU_PM
        help
          The big.LITTLE "switcher" provides the core functionality to
@@@ -2109,8 -2120,7 +2118,8 @@@ config ARCH_SUSPEND_POSSIBL
        def_bool y
  
  config ARM_CPU_SUSPEND
 -      def_bool PM_SLEEP
 +      def_bool PM_SLEEP || BL_SWITCHER || ARM_PSCI_FW
 +      depends on ARCH_SUSPEND_POSSIBLE
  
  config ARCH_HIBERNATION_POSSIBLE
        bool
diff --combined arch/arm/Makefile
@@@ -154,6 -154,7 +154,7 @@@ textofs-$(CONFIG_ARCH_AXXIA) := 0x00308
  # Machine directory name.  This list is sorted alphanumerically
  # by CONFIG_* macro name.
  machine-$(CONFIG_ARCH_ALPINE)         += alpine
+ machine-$(CONFIG_ARCH_ARTPEC)         += artpec
  machine-$(CONFIG_ARCH_AT91)           += at91
  machine-$(CONFIG_ARCH_AXXIA)          += axxia
  machine-$(CONFIG_ARCH_BCM)            += bcm
@@@ -352,6 -353,7 +353,6 @@@ archclean
  
  # My testing targets (bypasses dependencies)
  bp:;  $(Q)$(MAKE) $(build)=$(boot) MACHINE=$(MACHINE) $(boot)/bootpImage
 -i zi:;        $(Q)$(MAKE) $(build)=$(boot) MACHINE=$(MACHINE) $@
  
  
  define archhelp
@@@ -5,7 -5,7 +5,7 @@@
  #
  # Licensed under GPLv2
  
- # Configuration options for the EXYNOS4
+ # Configuration options for the EXYNOS
  
  menuconfig ARCH_EXYNOS
        bool "Samsung EXYNOS"
@@@ -17,6 -17,7 +17,7 @@@
        select ARM_GIC
        select COMMON_CLK_SAMSUNG
        select EXYNOS_THERMAL
+       select EXYNOS_PMU
        select HAVE_ARM_SCU if SMP
        select HAVE_S3C2410_I2C if I2C
        select HAVE_S3C2410_WATCHDOG if WATCHDOG
        select PINCTRL_EXYNOS
        select PM_GENERIC_DOMAINS if PM
        select S5P_DEV_MFC
+       select SOC_SAMSUNG
        select SRAM
        select THERMAL
 +      select THERMAL_OF
        select MFD_SYSCON
        select CLKSRC_EXYNOS_MCT
        select POWER_RESET
@@@ -13,8 -13,6 +13,8 @@@
   * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
   * GNU General Public License for more details.
   */
 +#include <linux/gpio/driver.h>
 +/* Needed for gpio_to_irq() */
  #include <linux/gpio.h>
  #include <linux/platform_device.h>
  #include <linux/mtd/mtd.h>
@@@ -204,9 -202,9 +204,9 @@@ static struct i2c_board_info mx27ads_i2
  static void vgpio_set(struct gpio_chip *chip, unsigned offset, int value)
  {
        if (value)
-               __raw_writew(PBC_BCTRL1_LCDON, PBC_BCTRL1_SET_REG);
+               imx_writew(PBC_BCTRL1_LCDON, PBC_BCTRL1_SET_REG);
        else
-               __raw_writew(PBC_BCTRL1_LCDON, PBC_BCTRL1_CLEAR_REG);
+               imx_writew(PBC_BCTRL1_LCDON, PBC_BCTRL1_CLEAR_REG);
  }
  
  static int vgpio_dir_out(struct gpio_chip *chip, unsigned offset, int value)
@@@ -245,7 -243,7 +245,7 @@@ static void __init mx27ads_regulator_in
        vchip->ngpio            = 1;
        vchip->direction_output = vgpio_dir_out;
        vchip->set              = vgpio_set;
 -      gpiochip_add(vchip);
 +      gpiochip_add_data(vchip, NULL);
  
        platform_device_register_data(NULL, "reg-fixed-voltage",
                                      PLATFORM_DEVID_AUTO,
@@@ -366,7 -364,7 +366,7 @@@ static void __init mx27ads_timer_init(v
  {
        unsigned long fref = 26000000;
  
-       if ((__raw_readw(PBC_VERSION_REG) & CKIH_27MHZ_BIT_SET) == 0)
+       if ((imx_readw(PBC_VERSION_REG) & CKIH_27MHZ_BIT_SET) == 0)
                fref = 27000000;
  
        mx27_clocks_init(fref);
@@@ -228,6 -228,42 +228,42 @@@ static struct omap_hwmod_ocp_if dm816x_
        .user   = OCP_USER_MPU,
  };
  
+ /* RTC */
+ static struct omap_hwmod_class_sysconfig ti81xx_rtc_sysc = {
+       .rev_offs       = 0x74,
+       .sysc_offs      = 0x78,
+       .sysc_flags     = SYSC_HAS_SIDLEMODE,
+       .idlemodes      = SIDLE_FORCE | SIDLE_NO |
+                         SIDLE_SMART | SIDLE_SMART_WKUP,
+       .sysc_fields    = &omap_hwmod_sysc_type3,
+ };
+ static struct omap_hwmod_class ti81xx_rtc_hwmod_class = {
+       .name           = "rtc",
+       .sysc           = &ti81xx_rtc_sysc,
+ };
+ struct omap_hwmod ti81xx_rtc_hwmod = {
+       .name           = "rtc",
+       .class          = &ti81xx_rtc_hwmod_class,
+       .clkdm_name     = "alwon_l3s_clkdm",
+       .flags          = HWMOD_NO_IDLEST,
+       .main_clk       = "sysclk18_ck",
+       .prcm           = {
+               .omap4  = {
+                       .clkctrl_offs = DM81XX_CM_ALWON_RTC_CLKCTRL,
+                       .modulemode = MODULEMODE_SWCTRL,
+               },
+       },
+ };
+ static struct omap_hwmod_ocp_if ti81xx_l4_ls__rtc = {
+       .master         = &dm81xx_l4_ls_hwmod,
+       .slave          = &ti81xx_rtc_hwmod,
+       .clk            = "sysclk6_ck",
+       .user           = OCP_USER_MPU,
+ };
  /* UART common */
  static struct omap_hwmod_class_sysconfig uart_sysc = {
        .rev_offs       = 0x50,
@@@ -429,7 -465,6 +465,7 @@@ static struct omap_hwmod dm81xx_elm_hwm
  static struct omap_hwmod_ocp_if dm81xx_l4_ls__elm = {
        .master         = &dm81xx_l4_ls_hwmod,
        .slave          = &dm81xx_elm_hwmod,
 +      .clk            = "sysclk6_ck",
        .user           = OCP_USER_MPU,
  };
  
@@@ -479,7 -514,6 +515,7 @@@ static struct omap_hwmod dm81xx_gpio1_h
  static struct omap_hwmod_ocp_if dm81xx_l4_ls__gpio1 = {
        .master         = &dm81xx_l4_ls_hwmod,
        .slave          = &dm81xx_gpio1_hwmod,
 +      .clk            = "sysclk6_ck",
        .user           = OCP_USER_MPU,
  };
  
@@@ -506,7 -540,6 +542,7 @@@ static struct omap_hwmod dm81xx_gpio2_h
  static struct omap_hwmod_ocp_if dm81xx_l4_ls__gpio2 = {
        .master         = &dm81xx_l4_ls_hwmod,
        .slave          = &dm81xx_gpio2_hwmod,
 +      .clk            = "sysclk6_ck",
        .user           = OCP_USER_MPU,
  };
  
@@@ -631,7 -664,7 +667,7 @@@ static struct omap_hwmod dm814x_timer1_
  static struct omap_hwmod_ocp_if dm814x_l4_ls__timer1 = {
        .master         = &dm81xx_l4_ls_hwmod,
        .slave          = &dm814x_timer1_hwmod,
 -      .clk            = "timer1_fck",
 +      .clk            = "sysclk6_ck",
        .user           = OCP_USER_MPU,
  };
  
@@@ -668,7 -701,7 +704,7 @@@ static struct omap_hwmod dm814x_timer2_
  static struct omap_hwmod_ocp_if dm814x_l4_ls__timer2 = {
        .master         = &dm81xx_l4_ls_hwmod,
        .slave          = &dm814x_timer2_hwmod,
 -      .clk            = "timer2_fck",
 +      .clk            = "sysclk6_ck",
        .user           = OCP_USER_MPU,
  };
  
@@@ -1126,7 -1159,6 +1162,7 @@@ static struct omap_hwmod dm81xx_mailbox
  static struct omap_hwmod_ocp_if dm81xx_l4_ls__mailbox = {
        .master         = &dm81xx_l4_ls_hwmod,
        .slave          = &dm81xx_mailbox_hwmod,
 +      .clk            = "sysclk6_ck",
        .user           = OCP_USER_MPU,
  };
  
@@@ -1161,7 -1193,6 +1197,7 @@@ static struct omap_hwmod dm81xx_spinbox
  static struct omap_hwmod_ocp_if dm81xx_l4_ls__spinbox = {
        .master         = &dm81xx_l4_ls_hwmod,
        .slave          = &dm81xx_spinbox_hwmod,
 +      .clk            = "sysclk6_ck",
        .user           = OCP_USER_MPU,
  };
  
@@@ -1381,6 -1412,7 +1417,7 @@@ static struct omap_hwmod_ocp_if *dm814x
        &dm81xx_l4_ls__mcspi1,
        &dm814x_l4_ls__mmc1,
        &dm814x_l4_ls__mmc2,
+       &ti81xx_l4_ls__rtc,
        &dm81xx_alwon_l3_fast__tpcc,
        &dm81xx_alwon_l3_fast__tptc0,
        &dm81xx_alwon_l3_fast__tptc1,
@@@ -1420,6 -1452,7 +1457,7 @@@ static struct omap_hwmod_ocp_if *dm816x
        &dm81xx_l4_ls__gpio1,
        &dm81xx_l4_ls__gpio2,
        &dm81xx_l4_ls__elm,
+       &ti81xx_l4_ls__rtc,
        &dm816x_l4_ls__mmc1,
        &dm816x_l4_ls__timer1,
        &dm816x_l4_ls__timer2,
@@@ -6,28 -6,30 +6,30 @@@ config ARCH_SHMOBILE_MULT
  
  config PM_RCAR
        bool
-       select PM_GENERIC_DOMAINS if PM
+       select PM
+       select PM_GENERIC_DOMAINS
  
  config PM_RMOBILE
        bool
+       select PM
        select PM_GENERIC_DOMAINS
  
  config ARCH_RCAR_GEN1
        bool
-       select PM_RCAR if PM || SMP
+       select PM_RCAR
        select RENESAS_INTC_IRQPIN
        select SYS_SUPPORTS_SH_TMU
  
  config ARCH_RCAR_GEN2
        bool
-       select PM_RCAR if PM || SMP
+       select PM_RCAR
        select RENESAS_IRQC
        select SYS_SUPPORTS_SH_CMT
        select PCI_DOMAINS if PCI
  
  config ARCH_RMOBILE
        bool
-       select PM_RMOBILE if PM
+       select PM_RMOBILE
        select SYS_SUPPORTS_SH_CMT
        select SYS_SUPPORTS_SH_TMU
  
@@@ -55,7 -57,8 +57,8 @@@ config ARCH_EMEV
  
  config ARCH_R7S72100
        bool "RZ/A1H (R7S72100)"
-       select PM_GENERIC_DOMAINS if PM
+       select PM
+       select PM_GENERIC_DOMAINS
        select SYS_SUPPORTS_SH_MTU2
  
  config ARCH_R8A73A4
@@@ -99,4 -102,6 +102,4 @@@ config ARCH_SH73A
        bool "SH-Mobile AG5 (R8A73A00)"
        select ARCH_RMOBILE
        select RENESAS_INTC_IRQPIN
 -
 -comment "Renesas ARM SoCs System Configuration"
  endif
@@@ -21,7 -21,9 +21,9 @@@
  #include <linux/delay.h>
  #include <asm/smp_plat.h>
  #include <asm/smp_scu.h>
  #include "common.h"
+ #include "emev2.h"
  
  #define EMEV2_SCU_BASE 0x1e000000
  #define EMEV2_SMU_BASE 0xe0110000
@@@ -45,7 -47,8 +47,7 @@@ static void __init emev2_smp_prepare_cp
        }
  
        /* setup EMEV2 specific SCU bits */
 -      shmobile_scu_base = ioremap(EMEV2_SCU_BASE, PAGE_SIZE);
 -      shmobile_smp_scu_prepare_cpus(max_cpus);
 +      shmobile_smp_scu_prepare_cpus(EMEV2_SCU_BASE, max_cpus);
  }
  
  const struct smp_operations emev2_smp_ops __initconst = {
diff --combined drivers/dma/pxa_dma.c
@@@ -122,6 -122,7 +122,7 @@@ struct pxad_chan 
  struct pxad_device {
        struct dma_device               slave;
        int                             nr_chans;
+       int                             nr_requestors;
        void __iomem                    *base;
        struct pxad_phy                 *phys;
        spinlock_t                      phy_lock;       /* Phy association */
@@@ -473,7 -474,7 +474,7 @@@ static void pxad_free_phy(struct pxad_c
                return;
  
        /* clear the channel mapping in DRCMR */
-       if (chan->drcmr <= DRCMR_CHLNUM) {
+       if (chan->drcmr <= pdev->nr_requestors) {
                reg = pxad_drcmr(chan->drcmr);
                writel_relaxed(0, chan->phy->base + reg);
        }
@@@ -509,6 -510,7 +510,7 @@@ static bool is_running_chan_misaligned(
  
  static void phy_enable(struct pxad_phy *phy, bool misaligned)
  {
+       struct pxad_device *pdev;
        u32 reg, dalgn;
  
        if (!phy->vchan)
                "%s(); phy=%p(%d) misaligned=%d\n", __func__,
                phy, phy->idx, misaligned);
  
-       if (phy->vchan->drcmr <= DRCMR_CHLNUM) {
+       pdev = to_pxad_dev(phy->vchan->vc.chan.device);
+       if (phy->vchan->drcmr <= pdev->nr_requestors) {
                reg = pxad_drcmr(phy->vchan->drcmr);
                writel_relaxed(DRCMR_MAPVLD | phy->idx, phy->base + reg);
        }
@@@ -583,8 -586,6 +586,8 @@@ static void set_updater_desc(struct pxa
                (PXA_DCMD_LENGTH & sizeof(u32));
        if (flags & DMA_PREP_INTERRUPT)
                updater->dcmd |= PXA_DCMD_ENDIRQEN;
 +      if (sw_desc->cyclic)
 +              sw_desc->hw_desc[sw_desc->nb_desc - 2]->ddadr = sw_desc->first;
  }
  
  static bool is_desc_completed(struct virt_dma_desc *vd)
@@@ -675,10 -676,6 +678,10 @@@ static irqreturn_t pxad_chan_handler(in
                dev_dbg(&chan->vc.chan.dev->device,
                        "%s(): checking txd %p[%x]: completed=%d\n",
                        __func__, vd, vd->tx.cookie, is_desc_completed(vd));
 +              if (to_pxad_sw_desc(vd)->cyclic) {
 +                      vchan_cyclic_callback(vd);
 +                      break;
 +              }
                if (is_desc_completed(vd)) {
                        list_del(&vd->node);
                        vchan_cookie_complete(vd);
@@@ -914,6 -911,7 +917,7 @@@ static void pxad_get_config(struct pxad
  {
        u32 maxburst = 0, dev_addr = 0;
        enum dma_slave_buswidth width = DMA_SLAVE_BUSWIDTH_UNDEFINED;
+       struct pxad_device *pdev = to_pxad_dev(chan->vc.chan.device);
  
        *dcmd = 0;
        if (dir == DMA_DEV_TO_MEM) {
                dev_addr = chan->cfg.src_addr;
                *dev_src = dev_addr;
                *dcmd |= PXA_DCMD_INCTRGADDR;
-               if (chan->drcmr <= DRCMR_CHLNUM)
+               if (chan->drcmr <= pdev->nr_requestors)
                        *dcmd |= PXA_DCMD_FLOWSRC;
        }
        if (dir == DMA_MEM_TO_DEV) {
                dev_addr = chan->cfg.dst_addr;
                *dev_dst = dev_addr;
                *dcmd |= PXA_DCMD_INCSRCADDR;
-               if (chan->drcmr <= DRCMR_CHLNUM)
+               if (chan->drcmr <= pdev->nr_requestors)
                        *dcmd |= PXA_DCMD_FLOWTRG;
        }
        if (dir == DMA_MEM_TO_MEM)
@@@ -1086,7 -1084,7 +1090,7 @@@ pxad_prep_dma_cyclic(struct dma_chan *d
                return NULL;
  
        pxad_get_config(chan, dir, &dcmd, &dsadr, &dtadr);
 -      dcmd |= PXA_DCMD_ENDIRQEN | (PXA_DCMD_LENGTH | period_len);
 +      dcmd |= PXA_DCMD_ENDIRQEN | (PXA_DCMD_LENGTH & period_len);
        dev_dbg(&chan->vc.chan.dev->device,
                "%s(): buf_addr=0x%lx len=%zu period=%zu dir=%d flags=%lx\n",
                __func__, (unsigned long)buf_addr, len, period_len, dir, flags);
@@@ -1341,13 -1339,15 +1345,15 @@@ static struct dma_chan *pxad_dma_xlate(
  
  static int pxad_init_dmadev(struct platform_device *op,
                            struct pxad_device *pdev,
-                           unsigned int nr_phy_chans)
+                           unsigned int nr_phy_chans,
+                           unsigned int nr_requestors)
  {
        int ret;
        unsigned int i;
        struct pxad_chan *c;
  
        pdev->nr_chans = nr_phy_chans;
+       pdev->nr_requestors = nr_requestors;
        INIT_LIST_HEAD(&pdev->slave.channels);
        pdev->slave.device_alloc_chan_resources = pxad_alloc_chan_resources;
        pdev->slave.device_free_chan_resources = pxad_free_chan_resources;
@@@ -1382,7 -1382,7 +1388,7 @@@ static int pxad_probe(struct platform_d
        const struct of_device_id *of_id;
        struct mmp_dma_platdata *pdata = dev_get_platdata(&op->dev);
        struct resource *iores;
-       int ret, dma_channels = 0;
+       int ret, dma_channels = 0, nb_requestors = 0;
        const enum dma_slave_buswidth widths =
                DMA_SLAVE_BUSWIDTH_1_BYTE   | DMA_SLAVE_BUSWIDTH_2_BYTES |
                DMA_SLAVE_BUSWIDTH_4_BYTES;
                return PTR_ERR(pdev->base);
  
        of_id = of_match_device(pxad_dt_ids, &op->dev);
-       if (of_id)
+       if (of_id) {
                of_property_read_u32(op->dev.of_node, "#dma-channels",
                                     &dma_channels);
-       else if (pdata && pdata->dma_channels)
+               ret = of_property_read_u32(op->dev.of_node, "#dma-requests",
+                                          &nb_requestors);
+               if (ret) {
+                       dev_warn(pdev->slave.dev,
+                                "#dma-requests set to default 32 as missing in OF: %d",
+                                ret);
+                       nb_requestors = 32;
+               };
+       } else if (pdata && pdata->dma_channels) {
                dma_channels = pdata->dma_channels;
-       else
+               nb_requestors = pdata->nb_requestors;
+       } else {
                dma_channels = 32;      /* default 32 channel */
+       }
  
        dma_cap_set(DMA_SLAVE, pdev->slave.cap_mask);
        dma_cap_set(DMA_MEMCPY, pdev->slave.cap_mask);
        pdev->slave.descriptor_reuse = true;
  
        pdev->slave.dev = &op->dev;
-       ret = pxad_init_dmadev(op, pdev, dma_channels);
+       ret = pxad_init_dmadev(op, pdev, dma_channels, nb_requestors);
        if (ret) {
                dev_err(pdev->slave.dev, "unable to register\n");
                return ret;
  
        platform_set_drvdata(op, pdev);
        pxad_init_debugfs(pdev);
-       dev_info(pdev->slave.dev, "initialized %d channels\n", dma_channels);
+       dev_info(pdev->slave.dev, "initialized %d channels on %d requestors\n",
+                dma_channels, nb_requestors);
        return 0;
  }