Merge tag 'armsoc-soc' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc

Pull ARM SoC platform updates from Arnd Bergmann:
 "The main change this time around is a cleanup of some of the oldest
  platforms based on the XScale and ARM9 CPU cores, which are between 10
  and 20 years old.

  The Kendin/Micrel/Microchip KS8695, Winbond/Nuvoton W90x900 and Intel
  IOP33x/IOP13xx platforms are removed after we determined that nobody
  is using them any more.

  The TI Davinci and NXP LPC32xx platforms on the other hand are still
  in active use and are converted to the ARCH_MULTIPLATFORM build,
  meaning that we can compile a kernel that works on these along with
  most other ARMv5 platforms. Changes toward that goal are also merged
  for IOP32x, but additional work is needed to complete this. Patches
  for the remaining ARMv5 platforms have started but need more work and
  some testing.

  Support for the new ASpeed AST2600 gets added, this is based on the
  Cortex-A7 ARMv7 core, and is a newer version of the existing ARMv5 and
  ARMv6 chips in the same family.

  Other changes include a cleanup of the ST-Ericsson ux500 platform and
  the move of the TI Davinci platform to a new clocksource driver"

[ The changes had marked INTEL_IOP_ADMA and USB_LPC32XX as being
  buildable on other platforms through COMPILE_TEST, but that causes new
  warnings that I most definitely do not want to see during the merge
  window as that could hide other issues.

  So the COMPILE_TEST option got disabled for them again   - Linus ]

* tag 'armsoc-soc' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc: (61 commits)
  ARM: multi_v5_defconfig: make DaVinci part of the ARM v5 multiplatform build
  ARM: davinci: support multiplatform build for ARM v5
  arm64: exynos: Enable exynos-chipid driver
  ARM: OMAP2+: Delete an unnecessary kfree() call in omap_hsmmc_pdata_init()
  ARM: OMAP2+: move platform-specific asm-offset.h to arch/arm/mach-omap2
  ARM: davinci: dm646x: Fix a typo in the comment
  ARM: davinci: dm646x: switch to using the clocksource driver
  ARM: davinci: dm644x: switch to using the clocksource driver
  ARM: aspeed: Enable SMP boot
  ARM: aspeed: Add ASPEED AST2600 architecture
  ARM: aspeed: Select timer in each SoC
  dt-bindings: arm: cpus: Add ASPEED SMP
  ARM: imx: stop adjusting ar8031 phy tx delay
  mailmap: map old company name to new one @microchip.com
  MAINTAINERS: at91: remove the TC entry
  MAINTAINERS: at91: Collect all pinctrl/gpio drivers in same entry
  ARM: at91: move platform-specific asm-offset.h to arch/arm/mach-at91
  MAINTAINERS: Extend patterns for Samsung SoC, Security Subsystem and clock drivers
  ARM: s3c64xx: squash samsung_usb_phy.h into setup-usb-phy.c
  ARM: debug-ll: Add support for r7s9210
  ...

diff --combined .mailmap
index afaad605284a8be6b9aa96f0157716fdf869453b,255a149e6c2321bade8a9cf6e7f06c8f452ea075..1ad4fd6556193e5610397cd7ba20bc1a32856785
--- 1/.mailmap
--- 2/.mailmap
+++ b/.mailmap
@@@ -64,9 -64,6 +64,9 @@@ Dengcheng Zhu <[email protected]> <deng
  Dengcheng Zhu <[email protected]> <[email protected]>
  Dengcheng Zhu <[email protected]> <[email protected]>
  Dmitry Eremin-Solenikov <[email protected]>
 +Dmitry Safonov <[email protected]> <[email protected]>
 +Dmitry Safonov <[email protected]> <[email protected]>
 +Dmitry Safonov <[email protected]> <[email protected]>
  Domen Puncer <[email protected]>
  Douglas Gilbert <[email protected]>
  Ed L. Cashin <[email protected]>
@@@ -163,8 -160,6 +163,8 @@@ Matt Ranostay <[email protected]> Mat
  Matt Ranostay <[email protected]> <[email protected]>
  Matt Ranostay <[email protected]> <[email protected]>
  Matt Redfearn <[email protected]> <[email protected]>
 +Maxime Ripard <[email protected]> <[email protected]>
 +Maxime Ripard <[email protected]> <[email protected]>
  Mayuresh Janorkar <[email protected]>
  Michael Buesch <[email protected]>
  Michel Dänzer <[email protected]>
@@@ -178,6 -173,7 +178,7 @@@ Morten Welinder <[email protected]
  Morten Welinder <[email protected]>
  Mythri P K <[email protected]>
  Nguyen Anh Quynh <[email protected]>
+ Nicolas Ferre <[email protected]> <[email protected]>
  Nicolas Pitre <[email protected]> <[email protected]>
  Nicolas Pitre <[email protected]> <[email protected]>
  Paolo 'Blaisorblade' Giarrusso <[email protected]>

diff --combined MAINTAINERS
index 0e814418da0a38a5d6f48aa05c3b49f689855afa,d3b6f2850d2231a4bddb02480a55e488e89e6a8d..1dc49553238c2d602e3dad7d20ba27310f251b36
--- 1/MAINTAINERS
--- 2/MAINTAINERS
+++ b/MAINTAINERS
@@@ -183,7 -183,7 +183,7 @@@ M: Realtek linux nic maintainers <nic_s
  M:    Heiner Kallweit <[email protected]>
  L:    [email protected]
  S:    Maintained
 -F:    drivers/net/ethernet/realtek/r8169.c
 +F:    drivers/net/ethernet/realtek/r8169*
  
  8250/16?50 (AND CLONE UARTS) SERIAL DRIVER
  M:    Greg Kroah-Hartman <[email protected]>
@@@ -517,6 -517,14 +517,6 @@@ W:        http://ez.analog.com/community/linux
  S:    Supported
  F:    drivers/video/backlight/adp8860_bl.c
  
 -ADS1015 HARDWARE MONITOR DRIVER
 -M:    Dirk Eibach <[email protected]>
 -L:    [email protected]
 -S:    Maintained
 -F:    Documentation/hwmon/ads1015.rst
 -F:    drivers/hwmon/ads1015.c
 -F:    include/linux/platform_data/ads1015.h
 -
  ADT746X FAN DRIVER
  M:    Colin Leroy <[email protected]>
  S:    Maintained
@@@ -675,7 -683,7 +675,7 @@@ S: Maintaine
  F:    drivers/crypto/sunxi-ss/
  
  ALLWINNER VPU DRIVER
 -M:    Maxime Ripard <m[email protected]>
 +M:    Maxime Ripard <m[email protected]>
  M:    Paul Kocialkowski <[email protected]>
  L:    [email protected]
  S:    Maintained
@@@ -1342,7 -1350,8 +1342,7 @@@ M:      Will Deacon <[email protected]
  R:    Robin Murphy <[email protected]>
  L:    [email protected] (moderated for non-subscribers)
  S:    Maintained
 -F:    drivers/iommu/arm-smmu.c
 -F:    drivers/iommu/arm-smmu-v3.c
 +F:    drivers/iommu/arm-smmu*
  F:    drivers/iommu/io-pgtable-arm.c
  F:    drivers/iommu/io-pgtable-arm-v7s.c
  
@@@ -1399,7 -1408,7 +1399,7 @@@ S:      Maintaine
  F:    drivers/clk/sunxi/
  
  ARM/Allwinner sunXi SoC support
 -M:    Maxime Ripard <m[email protected]>
 +M:    Maxime Ripard <m[email protected]>
  M:    Chen-Yu Tsai <[email protected]>
  L:    [email protected] (moderated for non-subscribers)
  S:    Maintained
@@@ -1740,20 -1749,11 +1740,11 @@@ L:   [email protected]
  S:    Maintained
  F:    arch/arm/mach-pxa/colibri-pxa270-income.c
  
- ARM/INTEL IOP13XX ARM ARCHITECTURE
- M:    Lennert Buytenhek <[email protected]>
- L:    [email protected] (moderated for non-subscribers)
- S:    Maintained
- 
  ARM/INTEL IOP32X ARM ARCHITECTURE
  M:    Lennert Buytenhek <[email protected]>
  L:    [email protected] (moderated for non-subscribers)
  S:    Maintained
  
- ARM/INTEL IOP33X ARM ARCHITECTURE
- L:    [email protected] (moderated for non-subscribers)
- S:    Orphan
- 
  ARM/INTEL IQ81342EX MACHINE SUPPORT
  M:    Lennert Buytenhek <[email protected]>
  L:    [email protected] (moderated for non-subscribers)
@@@ -1912,12 -1912,6 +1903,6 @@@ S:     Maintaine
  F:    drivers/phy/mediatek/
  F:    Documentation/devicetree/bindings/phy/phy-mtk-*
  
- ARM/MICREL KS8695 ARCHITECTURE
- M:    Greg Ungerer <[email protected]>
- L:    [email protected] (moderated for non-subscribers)
- F:    arch/arm/mach-ks8695/
- S:    Odd Fixes
- 
  ARM/Microchip (AT91) SoC support
  M:    Nicolas Ferre <[email protected]>
  M:    Alexandre Belloni <[email protected]>
@@@ -1959,6 -1953,7 +1944,7 @@@ F:      Documentation/devicetree/bindings/i2
  F:    arch/arm/mach-nomadik/
  F:    arch/arm/mach-u300/
  F:    arch/arm/mach-ux500/
+ F:    drivers/soc/ux500/
  F:    arch/arm/boot/dts/ste-*
  F:    drivers/clk/clk-nomadik.c
  F:    drivers/clk/clk-u300.c
@@@ -2002,22 -1997,6 +1988,6 @@@ F:     drivers/*/*npcm
  F:    Documentation/devicetree/bindings/*/*npcm*
  F:    Documentation/devicetree/bindings/*/*/*npcm*
  
- ARM/NUVOTON W90X900 ARM ARCHITECTURE
- M:    Wan ZongShun <[email protected]>
- L:    [email protected] (moderated for non-subscribers)
- W:    http://www.mcuos.com
- S:    Maintained
- F:    arch/arm/mach-w90x900/
- F:    drivers/input/keyboard/w90p910_keypad.c
- F:    drivers/input/touchscreen/w90p910_ts.c
- F:    drivers/watchdog/nuc900_wdt.c
- F:    drivers/net/ethernet/nuvoton/w90p910_ether.c
- F:    drivers/mtd/nand/raw/nuc900_nand.c
- F:    drivers/rtc/rtc-nuc900.c
- F:    drivers/spi/spi-nuc900.c
- F:    drivers/usb/host/ehci-w90x900.c
- F:    drivers/video/fbdev/nuc900fb.c
- 
  ARM/OPENMOKO NEO FREERUNNER (GTA02) MACHINE SUPPORT
  L:    [email protected] (subscribers-only)
  W:    http://wiki.openmoko.org/wiki/Neo_FreeRunner
@@@ -2210,8 -2189,9 +2180,9 @@@ F:      drivers/*/*s3c24
  F:    drivers/*/*/*s3c24*
  F:    drivers/*/*s3c64xx*
  F:    drivers/*/*s5pv210*
- F:    drivers/memory/samsung/*
- F:    drivers/soc/samsung/*
+ F:    drivers/memory/samsung/
+ F:    drivers/soc/samsung/
+ F:    include/linux/soc/samsung/
  F:    Documentation/arm/samsung/
  F:    Documentation/devicetree/bindings/arm/samsung/
  F:    Documentation/devicetree/bindings/sram/samsung-sram.txt
@@@ -3568,7 -3548,7 +3539,7 @@@ F:      Documentation/filesystems/caching/ca
  F:    fs/cachefiles/
  
  CADENCE MIPI-CSI2 BRIDGES
 -M:    Maxime Ripard <m[email protected]>
 +M:    Maxime Ripard <m[email protected]>
  L:    [email protected]
  S:    Maintained
  F:    Documentation/devicetree/bindings/media/cdns,*.txt
@@@ -4281,14 -4261,6 +4252,14 @@@ S:    Supporte
  F:    drivers/cpuidle/cpuidle-exynos.c
  F:    arch/arm/mach-exynos/pm.c
  
 +CPUIDLE DRIVER - ARM PSCI
 +M:    Lorenzo Pieralisi <[email protected]>
 +M:    Sudeep Holla <[email protected]>
 +L:    [email protected]
 +L:    [email protected]
 +S:    Supported
 +F:    drivers/cpuidle/cpuidle-psci.c
 +
  CPU IDLE TIME MANAGEMENT FRAMEWORK
  M:    "Rafael J. Wysocki" <[email protected]>
  M:    Daniel Lezcano <[email protected]>
@@@ -5294,7 -5266,7 +5265,7 @@@ F:      include/linux/vga
  
  DRM DRIVERS AND MISC GPU PATCHES
  M:    Maarten Lankhorst <[email protected]>
 -M:    Maxime Ripard <m[email protected]>
 +M:    Maxime Ripard <m[email protected]>
  M:    Sean Paul <[email protected]>
  W:    https://01.org/linuxgraphics/gfx-docs/maintainer-tools/drm-misc.html
  S:    Maintained
@@@ -5307,7 -5279,7 +5278,7 @@@ F:      include/uapi/drm/drm
  F:    include/linux/vga*
  
  DRM DRIVERS FOR ALLWINNER A10
 -M:    Maxime Ripard  <[email protected]>
 +M:    Maxime Ripard <[email protected]>
  L:    [email protected]
  S:    Supported
  F:    drivers/gpu/drm/sun4i/
@@@ -5760,11 -5732,6 +5731,11 @@@ S:    Supporte
  F:    drivers/edac/aspeed_edac.c
  F:    Documentation/devicetree/bindings/edac/aspeed-sdram-edac.txt
  
 +EDAC-BLUEFIELD
 +M:    Shravan Kumar Ramani <[email protected]>
 +S:    Supported
 +F:    drivers/edac/bluefield_edac.c
 +
  EDAC-CALXEDA
  M:    Robert Richter <[email protected]>
  L:    [email protected]
@@@ -5789,11 -5756,10 +5760,11 @@@ F:   drivers/edac/thunderx_edac
  EDAC-CORE
  M:    Borislav Petkov <[email protected]>
  M:    Mauro Carvalho Chehab <[email protected]>
 +M:    Tony Luck <[email protected]>
  R:    James Morse <[email protected]>
 +R:    Robert Richter <[email protected]>
  L:    [email protected]
 -T:    git git://git.kernel.org/pub/scm/linux/kernel/git/bp/bp.git for-next
 -T:    git git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-edac.git linux_next
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/ras/ras.git edac-for-next
  S:    Supported
  F:    Documentation/admin-guide/ras.rst
  F:    Documentation/driver-api/edac.rst
@@@ -6070,7 -6036,7 +6041,7 @@@ M:      Florian Fainelli <[email protected]
  M:    Heiner Kallweit <[email protected]>
  L:    [email protected]
  S:    Maintained
 -F:    Documentation/ABI/testing/sysfs-bus-mdio
 +F:    Documentation/ABI/testing/sysfs-class-net-phydev
  F:    Documentation/devicetree/bindings/net/ethernet-phy.yaml
  F:    Documentation/devicetree/bindings/net/mdio*
  F:    Documentation/networking/phy.rst
@@@ -6336,6 -6302,15 +6307,6 @@@ S:     Odd Fixe
  L:    [email protected]
  F:    drivers/block/floppy.c
  
 -FMC SUBSYSTEM
 -M:    Alessandro Rubini <[email protected]>
 -W:    http://www.ohwr.org/projects/fmc-bus
 -S:    Supported
 -F:    drivers/fmc/
 -F:    include/linux/fmc*.h
 -F:    include/linux/ipmi-fru.h
 -K:    fmc_d.*register
 -
  FPGA MANAGER FRAMEWORK
  M:    Moritz Fischer <[email protected]>
  L:    [email protected]
@@@ -6435,17 -6410,8 +6406,17 @@@ M:    Frank Li <[email protected]
  L:    [email protected]
  S:    Maintained
  F:    drivers/perf/fsl_imx8_ddr_perf.c
 +F:    Documentation/admin-guide/perf/imx-ddr.rst
  F:    Documentation/devicetree/bindings/perf/fsl-imx-ddr.txt
  
 +FREESCALE IMX I2C DRIVER
 +M:    Oleksij Rempel <[email protected]>
 +R:    Pengutronix Kernel Team <[email protected]>
 +L:    [email protected]
 +S:    Maintained
 +F:    drivers/i2c/busses/i2c-imx.c
 +F:    Documentation/devicetree/bindings/i2c/i2c-imx.txt
 +
  FREESCALE IMX LPI2C DRIVER
  M:    Dong Aisheng <[email protected]>
  L:    [email protected]
@@@ -6729,13 -6695,6 +6700,13 @@@ W:    https://linuxtv.or
  S:    Maintained
  F:    drivers/media/radio/radio-gemtek*
  
 +GENERIC ARCHITECTURE TOPOLOGY
 +M:    Sudeep Holla <[email protected]>
 +L:    [email protected]
 +S:    Maintained
 +F:    drivers/base/arch_topology.c
 +F:    include/linux/arch_topology.h
 +
  GENERIC GPIO I2C DRIVER
  M:    Wolfram Sang <[email protected]>
  S:    Supported
@@@ -7464,7 -7423,7 +7435,7 @@@ F:      drivers/net/hyperv
  F:    drivers/scsi/storvsc_drv.c
  F:    drivers/uio/uio_hv_generic.c
  F:    drivers/video/fbdev/hyperv_fb.c
 -F:    drivers/iommu/hyperv_iommu.c
 +F:    drivers/iommu/hyperv-iommu.c
  F:    net/vmw_vsock/hyperv_transport.c
  F:    include/clocksource/hyperv_timer.h
  F:    include/linux/hyperv.h
@@@ -7517,7 -7476,7 +7488,7 @@@ I2C MV64XXX MARVELL AND ALLWINNER DRIVE
  M:    Gregory CLEMENT <[email protected]>
  L:    [email protected]
  S:    Maintained
 -F:    Documentation/devicetree/bindings/i2c/i2c-mv64xxx.txt
 +F:    Documentation/devicetree/bindings/i2c/marvell,mv64xxx-i2c.yaml
  F:    drivers/i2c/busses/i2c-mv64xxx.c
  
  I2C OVER PARALLEL PORT
@@@ -8076,13 -8035,6 +8047,13 @@@ T:    git git://git.code.sf.net/p/intel-sa
  S:    Supported
  F:    drivers/scsi/isci/
  
 +INTEL CPU family model numbers
 +M:    Tony Luck <[email protected]>
 +M:    [email protected]
 +L:    [email protected]
 +S:    Supported
 +F:    arch/x86/include/asm/intel-family.h
 +
  INTEL DRM DRIVERS (excluding Poulsbo, Moorestown and derivative chipsets)
  M:    Jani Nikula <[email protected]>
  M:    Joonas Lahtinen <[email protected]>
@@@ -8389,6 -8341,12 +8360,6 @@@ F:     Documentation/x86/intel_txt.rs
  F:    include/linux/tboot.h
  F:    arch/x86/kernel/tboot.c
  
 -INTEL-MID GPIO DRIVER
 -M:    David Cohen <[email protected]>
 -L:    [email protected]
 -S:    Maintained
 -F:    drivers/gpio/gpio-intel-mid.c
 -
  INTERCONNECT API
  M:    Georgi Djakov <[email protected]>
  L:    [email protected]
@@@ -8413,6 -8371,12 +8384,6 @@@ L:     [email protected]
  S:    Maintained
  F:    drivers/net/ethernet/sgi/ioc3-eth.c
  
 -IOC3 SERIAL DRIVER
 -M:    Pat Gefre <[email protected]>
 -L:    [email protected]
 -S:    Maintained
 -F:    drivers/tty/serial/ioc3_serial.c
 -
  IOMAP FILESYSTEM LIBRARY
  M:    Christoph Hellwig <[email protected]>
  M:    Darrick J. Wong <[email protected]>
@@@ -8422,6 -8386,7 +8393,6 @@@ L:      [email protected]
  L:    [email protected]
  T:    git git://git.kernel.org/pub/scm/fs/xfs/xfs-linux.git
  S:    Supported
 -F:    fs/iomap.c
  F:    fs/iomap/
  F:    include/linux/iomap.h
  
@@@ -8446,6 -8411,11 +8417,6 @@@ S:     Maintaine
  F:    fs/io_uring.c
  F:    include/uapi/linux/io_uring.h
  
 -IP MASQUERADING
 -M:    Juanjo Ciarlante <[email protected]>
 -S:    Maintained
 -F:    net/ipv4/netfilter/ipt_MASQUERADE.c
 -
  IPMI SUBSYSTEM
  M:    Corey Minyard <[email protected]>
  L:    [email protected] (moderated for non-subscribers)
@@@ -8819,6 -8789,14 +8790,6 @@@ F:     virt/kvm/
  F:    tools/kvm/
  F:    tools/testing/selftests/kvm/
  
 -KERNEL VIRTUAL MACHINE FOR AMD-V (KVM/amd)
 -M:    Joerg Roedel <[email protected]>
 -L:    [email protected]
 -W:    http://www.linux-kvm.org/
 -S:    Maintained
 -F:    arch/x86/include/asm/svm.h
 -F:    arch/x86/kvm/svm.c
 -
  KERNEL VIRTUAL MACHINE FOR ARM/ARM64 (KVM/arm, KVM/arm64)
  M:    Marc Zyngier <[email protected]>
  R:    James Morse <[email protected]>
@@@ -8861,7 -8839,7 +8832,7 @@@ M:      Christian Borntraeger <borntraeger@d
  M:    Janosch Frank <[email protected]>
  R:    David Hildenbrand <[email protected]>
  R:    Cornelia Huck <[email protected]>
 -L:    linux-s390@vger.kernel.org
 +L:    kvm@vger.kernel.org
  W:    http://www.ibm.com/developerworks/linux/linux390/
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/kvms390/linux.git
  S:    Supported
@@@ -8876,11 -8854,6 +8847,11 @@@ F:    tools/testing/selftests/kvm/*/s390x
  KERNEL VIRTUAL MACHINE FOR X86 (KVM/x86)
  M:    Paolo Bonzini <[email protected]>
  M:    Radim Krčmář <[email protected]>
 +R:    Sean Christopherson <[email protected]>
 +R:    Vitaly Kuznetsov <[email protected]>
 +R:    Wanpeng Li <[email protected]>
 +R:    Jim Mattson <[email protected]>
 +R:    Joerg Roedel <[email protected]>
  L:    [email protected]
  W:    http://www.linux-kvm.org
  T:    git git://git.kernel.org/pub/scm/virt/kvm/kvm.git
@@@ -8888,12 -8861,8 +8859,12 @@@ S:    Supporte
  F:    arch/x86/kvm/
  F:    arch/x86/kvm/*/
  F:    arch/x86/include/uapi/asm/kvm*
 +F:    arch/x86/include/uapi/asm/vmx.h
 +F:    arch/x86/include/uapi/asm/svm.h
  F:    arch/x86/include/asm/kvm*
  F:    arch/x86/include/asm/pvclock-abi.h
 +F:    arch/x86/include/asm/svm.h
 +F:    arch/x86/include/asm/vmx.h
  F:    arch/x86/kernel/kvm.c
  F:    arch/x86/kernel/kvmclock.c
  
@@@ -8925,7 -8894,7 +8896,7 @@@ F:      security/keys/encrypted-keys
  
  KEYS-TRUSTED
  M:    James Bottomley <[email protected]>
 -M:      Jarkko Sakkinen <[email protected]>
 +M:    Jarkko Sakkinen <[email protected]>
  M:    Mimi Zohar <[email protected]>
  L:    [email protected]
  L:    [email protected]
@@@ -9221,18 -9190,6 +9192,18 @@@ F:    include/linux/nd.
  F:    include/linux/libnvdimm.h
  F:    include/uapi/linux/ndctl.h
  
 +LICENSES and SPDX stuff
 +M:    Thomas Gleixner <[email protected]>
 +M:    Greg Kroah-Hartman <[email protected]>
 +L:    [email protected]
 +S:    Maintained
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/spdx.git
 +F:    COPYING
 +F:    Documentation/process/license-rules.rst
 +F:    LICENSES/
 +F:    scripts/spdxcheck-test.sh
 +F:    scripts/spdxcheck.py
 +
  LIGHTNVM PLATFORM SUPPORT
  M:    Matias Bjorling <[email protected]>
  W:    http://github/OpenChannelSSD
@@@ -10628,12 -10585,6 +10599,6 @@@ M:  Nicolas Ferre <nicolas.ferre@microch
  S:    Supported
  F:    drivers/power/reset/at91-sama5d2_shdwc.c
  
- MICROCHIP SAMA5D2-COMPATIBLE PIOBU GPIO
- M:    Andrei Stefanescu <[email protected]>
- L:    [email protected] (moderated for non-subscribers)
- L:    [email protected]
- F:    drivers/gpio/gpio-sama5d2-piobu.c
- 
  MICROCHIP SPI DRIVER
  M:    Nicolas Ferre <[email protected]>
  S:    Supported
@@@ -10646,13 -10597,6 +10611,6 @@@ S:  Supporte
  F:    drivers/misc/atmel-ssc.c
  F:    include/linux/atmel-ssc.h
  
- MICROCHIP TIMER COUNTER (TC) AND CLOCKSOURCE DRIVERS
- M:    Nicolas Ferre <[email protected]>
- L:    [email protected] (moderated for non-subscribers)
- S:    Supported
- F:    drivers/misc/atmel_tclib.c
- F:    drivers/clocksource/tcb_clksrc.c
- 
  MICROCHIP USBA UDC DRIVER
  M:    Cristian Birsan <[email protected]>
  L:    [email protected] (moderated for non-subscribers)
@@@ -11085,7 -11029,7 +11043,7 @@@ NET_FAILOVER MODUL
  M:    Sridhar Samudrala <[email protected]>
  L:    [email protected]
  S:    Supported
 -F:    driver/net/net_failover.c
 +F:    drivers/net/net_failover.c
  F:    include/net/net_failover.h
  F:    Documentation/networking/net_failover.rst
  
@@@ -12694,6 -12638,7 +12652,7 @@@ L:   [email protected]
  L:    [email protected]
  S:    Supported
  F:    drivers/pinctrl/pinctrl-at91*
+ F:    drivers/gpio/gpio-sama5d2-piobu.c
  
  PIN CONTROLLER - FREESCALE
  M:    Dong Aisheng <[email protected]>
@@@ -14127,6 -14072,8 +14086,8 @@@ M:   Kamil Konieczny <k.konieczny@partner
  L:    [email protected]
  L:    [email protected]
  S:    Maintained
+ F:    Documentation/devicetree/bindings/crypto/samsung-slimsss.txt
+ F:    Documentation/devicetree/bindings/crypto/samsung-sss.txt
  F:    drivers/crypto/s5p-sss.c
  
  SAMSUNG S5P/EXYNOS4 SOC SERIES CAMERA SUBSYSTEM DRIVERS
@@@ -14147,6 -14094,8 +14108,8 @@@ T:   git git://git.kernel.org/pub/scm/lin
  F:    drivers/clk/samsung/
  F:    include/dt-bindings/clock/exynos*.h
  F:    Documentation/devicetree/bindings/clock/exynos*.txt
+ F:    Documentation/devicetree/bindings/clock/samsung,s3c*
+ F:    Documentation/devicetree/bindings/clock/samsung,s5p*
  
  SAMSUNG SPI DRIVERS
  M:    Kukjin Kim <[email protected]>
@@@ -14477,7 -14426,6 +14440,7 @@@ F:   drivers/net/phy/phylink.
  F:    drivers/net/phy/sfp*
  F:    include/linux/phylink.h
  F:    include/linux/sfp.h
 +K:    phylink
  
  SGI GRU DRIVER
  M:    Dimitri Sivanich <[email protected]>
@@@ -14883,9 -14831,9 +14846,9 @@@ F:   include/linux/arm_sdei.
  F:    include/uapi/linux/arm_sdei.h
  
  SOFTWARE RAID (Multiple Disks) SUPPORT
 -M:    Shaohua Li <shli@kernel.org>
 +M:    Song Liu <song@kernel.org>
  L:    [email protected]
 -T:    git git://git.kernel.org/pub/scm/linux/kernel/git/shli/md.git
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/song/md.git
  S:    Supported
  F:    drivers/md/Makefile
  F:    drivers/md/Kconfig
@@@ -17255,7 -17203,6 +17218,7 @@@ F:   Documentation/power/regulator
  F:    drivers/regulator/
  F:    include/dt-bindings/regulator/
  F:    include/linux/regulator/
 +K:    regulator_get_optional
  
  VRF
  M:    David Ahern <[email protected]>
@@@ -17692,7 -17639,8 +17655,7 @@@ F:   include/uapi/linux/dqblk_xfs.
  F:    include/uapi/linux/fsmap.h
  
  XILINX AXI ETHERNET DRIVER
 -M:    Anirudha Sarangi <[email protected]>
 -M:    John Linn <[email protected]>
 +M:    Radhey Shyam Pandey <[email protected]>
  S:    Maintained
  F:    drivers/net/ethernet/xilinx/xilinx_axienet*
  

diff --combined arch/arm/Kconfig
index 24360211534abe47a053dbc575c6e46c49e3c734,1cc8d5fd47fefa34299c622dfbe336895cafd47e..2ae7f8adcac44ddca43312d17c1efd2ffad84740
--- 1/arch/arm/Kconfig
--- 2/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@@ -7,8 -7,6 +7,8 @@@ config AR
        select ARCH_HAS_BINFMT_FLAT
        select ARCH_HAS_DEBUG_VIRTUAL if MMU
        select ARCH_HAS_DEVMEM_IS_ALLOWED
 +      select ARCH_HAS_DMA_COHERENT_TO_PFN if SWIOTLB
 +      select ARCH_HAS_DMA_MMAP_PGPROT if SWIOTLB
        select ARCH_HAS_ELF_RANDOMIZE
        select ARCH_HAS_FORTIFY_SOURCE
        select ARCH_HAS_KEEPINITRD
@@@ -20,8 -18,6 +20,8 @@@
        select ARCH_HAS_SET_MEMORY
        select ARCH_HAS_STRICT_KERNEL_RWX if MMU && !XIP_KERNEL
        select ARCH_HAS_STRICT_MODULE_RWX if MMU
 +      select ARCH_HAS_SYNC_DMA_FOR_DEVICE if SWIOTLB
 +      select ARCH_HAS_SYNC_DMA_FOR_CPU if SWIOTLB
        select ARCH_HAS_TEARDOWN_DMA_OPS if MMU
        select ARCH_HAS_TICK_BROADCAST if GENERIC_CLOCKEVENTS_BROADCAST
        select ARCH_HAVE_CUSTOM_GPIO_H
@@@ -267,8 -263,6 +267,6 @@@ config PHYS_OFFSE
        default 0x00000000 if ARCH_EBSA110 || \
                        ARCH_FOOTBRIDGE || \
                        ARCH_INTEGRATOR || \
-                       ARCH_IOP13XX || \
-                       ARCH_KS8695 || \
                        ARCH_REALVIEW
        default 0x10000000 if ARCH_OMAP1 || ARCH_RPC
        default 0x20000000 if ARCH_S5PV210
@@@ -381,19 -375,6 +379,6 @@@ config ARCH_FOOTBRIDG
          Support for systems based on the DC21285 companion chip
          ("FootBridge"), such as the Simtec CATS and the Rebel NetWinder.
  
- config ARCH_IOP13XX
-       bool "IOP13xx-based"
-       depends on MMU
-       select CPU_XSC3
-       select NEED_MACH_MEMORY_H
-       select NEED_RET_TO_USER
-       select FORCE_PCI
-       select PLAT_IOP
-       select VMSPLIT_1G
-       select SPARSE_IRQ
-       help
-         Support for Intel's IOP13XX (XScale) family of processors.
- 
  config ARCH_IOP32X
        bool "IOP32x-based"
        depends on MMU
@@@ -407,18 -388,6 +392,6 @@@
          Support for Intel's 80219 and IOP32X (XScale) family of
          processors.
  
- config ARCH_IOP33X
-       bool "IOP33x-based"
-       depends on MMU
-       select CPU_XSCALE
-       select GPIO_IOP
-       select GPIOLIB
-       select NEED_RET_TO_USER
-       select FORCE_PCI
-       select PLAT_IOP
-       help
-         Support for Intel's IOP33X (XScale) family of processors.
- 
  config ARCH_IXP4XX
        bool "IXP4xx-based"
        depends on MMU
@@@ -455,48 -424,6 +428,6 @@@ config ARCH_DOV
        help
          Support for the Marvell Dove SoC 88AP510
  
- config ARCH_KS8695
-       bool "Micrel/Kendin KS8695"
-       select CLKSRC_MMIO
-       select CPU_ARM922T
-       select GENERIC_CLOCKEVENTS
-       select GPIOLIB
-       select NEED_MACH_MEMORY_H
-       help
-         Support for Micrel/Kendin KS8695 "Centaur" (ARM922T) based
-         System-on-Chip devices.
- 
- config ARCH_W90X900
-       bool "Nuvoton W90X900 CPU"
-       select CLKDEV_LOOKUP
-       select CLKSRC_MMIO
-       select CPU_ARM926T
-       select GENERIC_CLOCKEVENTS
-       select GPIOLIB
-       help
-         Support for Nuvoton (Winbond logic dept.) ARM9 processor,
-         At present, the w90x900 has been renamed nuc900, regarding
-         the ARM series product line, you can login the following
-         link address to know more.
- 
-         <http://www.nuvoton.com/hq/enu/ProductAndSales/ProductLines/
-               ConsumerElectronicsIC/ARMMicrocontroller/ARMMicrocontroller>
- 
- config ARCH_LPC32XX
-       bool "NXP LPC32XX"
-       select ARM_AMBA
-       select CLKDEV_LOOKUP
-       select CLKSRC_LPC32XX
-       select COMMON_CLK
-       select CPU_ARM926T
-       select GENERIC_CLOCKEVENTS
-       select GENERIC_IRQ_MULTI_HANDLER
-       select GPIOLIB
-       select SPARSE_IRQ
-       select USE_OF
-       help
-         Support for the NXP LPC32XX family of processors
- 
  config ARCH_PXA
        bool "PXA2xx/PXA3xx-based"
        depends on MMU
@@@ -582,27 -509,6 +513,6 @@@ config ARCH_S3C24X
          (<http://www.simtec.co.uk/products/EB110ITX/>), the IPAQ 1940 or the
          Samsung SMDK2410 development board (and derivatives).
  
- config ARCH_DAVINCI
-       bool "TI DaVinci"
-       select ARCH_HAS_HOLES_MEMORYMODEL
-       select COMMON_CLK
-       select CPU_ARM926T
-       select GENERIC_ALLOCATOR
-       select GENERIC_CLOCKEVENTS
-       select GENERIC_IRQ_CHIP
-       select GENERIC_IRQ_MULTI_HANDLER
-       select GPIOLIB
-       select HAVE_IDE
-       select PM_GENERIC_DOMAINS if PM
-       select PM_GENERIC_DOMAINS_OF if PM && OF
-       select REGMAP_MMIO
-       select RESET_CONTROLLER
-       select SPARSE_IRQ
-       select USE_OF
-       select ZONE_DMA
-       help
-         Support for TI's DaVinci platform.
- 
  config ARCH_OMAP1
        bool "TI OMAP1"
        depends on MMU
@@@ -738,17 -644,13 +648,13 @@@ source "arch/arm/mach-imx/Kconfig
  
  source "arch/arm/mach-integrator/Kconfig"
  
- source "arch/arm/mach-iop13xx/Kconfig"
- 
  source "arch/arm/mach-iop32x/Kconfig"
  
- source "arch/arm/mach-iop33x/Kconfig"
- 
  source "arch/arm/mach-ixp4xx/Kconfig"
  
  source "arch/arm/mach-keystone/Kconfig"
  
- source "arch/arm/mach-ks8695/Kconfig"
+ source "arch/arm/mach-lpc32xx/Kconfig"
  
  source "arch/arm/mach-mediatek/Kconfig"
  
@@@ -834,8 -736,6 +740,6 @@@ source "arch/arm/plat-versatile/Kconfig
  
  source "arch/arm/mach-vt8500/Kconfig"
  
- source "arch/arm/mach-w90x900/Kconfig"
- 
  source "arch/arm/mach-zx/Kconfig"
  
  source "arch/arm/mach-zynq/Kconfig"

diff --combined arch/arm/mach-omap2/Makefile
index d4f11c5070aeeec0294e14d44e359799e0a65bc9,21c6d4bca3c0f8551984494fd51ae68808d0b631..8f208197988fe848c52cd83583d97c30f6c476ae
--- 1/arch/arm/mach-omap2/Makefile
--- 2/arch/arm/mach-omap2/Makefile
+++ b/arch/arm/mach-omap2/Makefile
@@@ -223,11 -223,10 +223,12 @@@ obj-y                                   += omap_phy_internal.
  
  obj-$(CONFIG_MACH_OMAP2_TUSB6010)     += usb-tusb6010.o
  
- include/generated/ti-pm-asm-offsets.h: arch/arm/mach-omap2/pm-asm-offsets.s FORCE
+ $(obj)/pm-asm-offsets.h: $(obj)/pm-asm-offsets.s FORCE
        $(call filechk,offsets,__TI_PM_ASM_OFFSETS_H__)
  
- $(obj)/sleep33xx.o $(obj)/sleep43xx.o: include/generated/ti-pm-asm-offsets.h
+ $(obj)/sleep33xx.o $(obj)/sleep43xx.o: $(obj)/pm-asm-offsets.h
  
  targets += pm-asm-offsets.s
+ clean-files += pm-asm-offsets.h
 +
 +obj-$(CONFIG_OMAP_IOMMU)              += omap-iommu.o

diff --combined arch/arm/mm/Kconfig
index c1222c0e9fd3bebb6a64f209e80e8d924375d041,658be9743484d4d86414d17a5449596377294fbb..0ab3a86b1f52377f2836f0df4a4589ea1593dde5
--- 1/arch/arm/mm/Kconfig
--- 2/arch/arm/mm/Kconfig
+++ b/arch/arm/mm/Kconfig
@@@ -106,7 -106,7 +106,7 @@@ config CPU_ARM922
        help
          The ARM922T is a version of the ARM920T, but with smaller
          instruction and data caches. It is used in Altera's
-         Excalibur XA device family and Micrel's KS8695 Centaur.
+         Excalibur XA device family and the ARM Integrator.
  
          Say Y if you want support for the ARM922T processor.
          Otherwise, say N.
@@@ -664,6 -664,10 +664,6 @@@ config ARM_LPA
                !CPU_32v4 && !CPU_32v3
        select PHYS_ADDR_T_64BIT
        select SWIOTLB
 -      select ARCH_HAS_DMA_COHERENT_TO_PFN
 -      select ARCH_HAS_DMA_MMAP_PGPROT
 -      select ARCH_HAS_SYNC_DMA_FOR_DEVICE
 -      select ARCH_HAS_SYNC_DMA_FOR_CPU
        help
          Say Y if you have an ARMv7 processor supporting the LPAE page
          table format and you would like to access memory beyond the

diff --combined drivers/dma/Kconfig
index 03fa0c58cef3b8ff93268c61afafab35a77a77c3,7c511e3db4c8e7cff0d89128f2e509eda114a536..413efef5fbb6010097d9765e247f99accf192682
--- 1/drivers/dma/Kconfig
--- 2/drivers/dma/Kconfig
+++ b/drivers/dma/Kconfig
@@@ -294,8 -294,8 +294,8 @@@ config INTEL_IOATDM
          If unsure, say N.
  
  config INTEL_IOP_ADMA
-       tristate "Intel IOP ADMA support"
-       depends on ARCH_IOP32X || ARCH_IOP33X || ARCH_IOP13XX
+       tristate "Intel IOP32x ADMA support"
 -      depends on ARCH_IOP32X || COMPILE_TEST
++      depends on ARCH_IOP32X
        select DMA_ENGINE
        select ASYNC_TX_ENABLE_CHANNEL_SWITCH
        help

diff --combined drivers/gpio/Kconfig
index e193c76948c412205942505aa4ea1f52e16ce5e7,34c679cd564f0f86b54f95455aba1a288805e817..305b47ed453239c75238329394ae9fb5db341b10
--- 1/drivers/gpio/Kconfig
--- 2/drivers/gpio/Kconfig
+++ b/drivers/gpio/Kconfig
@@@ -275,7 -275,7 +275,7 @@@ config GPIO_IC
  
  config GPIO_IOP
        tristate "Intel IOP GPIO"
-       depends on ARCH_IOP32X || ARCH_IOP33X || COMPILE_TEST
+       depends on ARCH_IOP32X || COMPILE_TEST
        select GPIO_GENERIC
        help
          Say yes here to support the GPIO functionality of a number of Intel
@@@ -288,7 -288,7 +288,7 @@@ config GPIO_IXP4X
        depends on ARM # For <asm/mach-types.h>
        depends on ARCH_IXP4XX
        select GPIO_GENERIC
 -      select IRQ_DOMAIN
 +      select GPIOLIB_IRQCHIP
        select IRQ_DOMAIN_HIERARCHY
        help
          Say yes here to support the GPIO functionality of a number of Intel
@@@ -546,7 -546,6 +546,7 @@@ config GPIO_THUNDER
        tristate "Cavium ThunderX/OCTEON-TX GPIO"
        depends on ARCH_THUNDER || (64BIT && COMPILE_TEST)
        depends on PCI_MSI
 +      select GPIOLIB_IRQCHIP
        select IRQ_DOMAIN_HIERARCHY
        select IRQ_FASTEOI_HIERARCHY_HANDLERS
        help
@@@ -1473,6 -1472,7 +1473,6 @@@ endmen
  
  config GPIO_MOCKUP
        tristate "GPIO Testing Driver"
 -      depends on GPIOLIB
        select IRQ_SIM
        help
          This enables GPIO Testing driver, which provides a way to test GPIO

diff --combined drivers/tty/serial/Kconfig
index 2f631501c75ffa5dd1c20564dabd662a173f6657,518aac902e4bf59a7831a6b17519e28cd9127ffe..514169eb1859027fe175994780a03c7d2d320404
--- 1/drivers/tty/serial/Kconfig
--- 2/drivers/tty/serial/Kconfig
+++ b/drivers/tty/serial/Kconfig
@@@ -739,7 -739,8 +739,8 @@@ config SERIAL_PNX8XXX_CONSOL
  
  config SERIAL_HS_LPC32XX
        tristate "LPC32XX high speed serial port support"
-       depends on ARCH_LPC32XX && OF
+       depends on ARCH_LPC32XX || COMPILE_TEST
+       depends on OF
        select SERIAL_CORE
        help
          Support for the LPC32XX high speed serial ports (up to 900kbps).
@@@ -855,6 -856,16 +856,6 @@@ config SERIAL_CPM_CONSOL
          your boot loader (lilo or loadlin) about how to pass options to the
          kernel at boot time.)
  
 -config SERIAL_SGI_L1_CONSOLE
 -      bool "SGI Altix L1 serial console support"
 -      depends on IA64_GENERIC || IA64_SGI_SN2
 -      select SERIAL_CORE
 -      select SERIAL_CORE_CONSOLE
 -      help
 -              If you have an SGI Altix and you would like to use the system
 -              controller serial port as your console (you want this!),
 -              say Y.  Otherwise, say N.
 -
  config SERIAL_PIC32
        tristate "Microchip PIC32 serial support"
        depends on MACH_PIC32
@@@ -972,6 -983,23 +973,6 @@@ config SERIAL_JS
          To compile this driver as a module, choose M here: the
          module will be called jsm.
  
 -config SERIAL_SGI_IOC4
 -      tristate "SGI IOC4 controller serial support"
 -      depends on (IA64_GENERIC || IA64_SGI_SN2) && SGI_IOC4
 -      select SERIAL_CORE
 -      help
 -              If you have an SGI Altix with an IOC4 based Base IO card
 -              and wish to use the serial ports on this card, say Y.
 -              Otherwise, say N.
 -
 -config SERIAL_SGI_IOC3
 -      tristate "SGI Altix IOC3 serial support"
 -      depends on (IA64_GENERIC || IA64_SGI_SN2) && SGI_IOC3
 -      select SERIAL_CORE
 -      help
 -        If you have an SGI Altix with an IOC3 serial card,
 -        say Y or M.  Otherwise, say N.
 -
  config SERIAL_MSM
        tristate "MSM on-chip serial port support"
        depends on ARCH_QCOM

diff --combined drivers/usb/gadget/udc/Kconfig
index ef0259a950babb9327e0f03648767627aebe6880,d354036ff6c86a0ba94bd779d9ae5da81871a360..d7e611645533701c81acda6edf39cb664cc6ea13
--- 1/drivers/usb/gadget/udc/Kconfig
--- 2/drivers/usb/gadget/udc/Kconfig
+++ b/drivers/usb/gadget/udc/Kconfig
@@@ -45,7 -45,8 +45,8 @@@ config USB_AT9
  
  config USB_LPC32XX
        tristate "LPC32XX USB Peripheral Controller"
-       depends on ARCH_LPC32XX && I2C
 -      depends on ARCH_LPC32XX || COMPILE_TEST
++      depends on ARCH_LPC32XX
+       depends on I2C
        select USB_ISP1301
        help
           This option selects the USB device controller in the LPC32xx SoC.

diff --combined drivers/usb/gadget/udc/lpc32xx_udc.c
index bb6af6b5ac975ac54d2ecaf71704e8269a62faf4,defe04d52e6d95ca4ae70a4f9de917c6046203a3..c65aed3e84c7ae90e6844393ecd657d9c14ceb26
--- 1/drivers/usb/gadget/udc/lpc32xx_udc.c
--- 2/drivers/usb/gadget/udc/lpc32xx_udc.c
+++ b/drivers/usb/gadget/udc/lpc32xx_udc.c
@@@ -24,6 -24,7 +24,7 @@@
  #include <linux/module.h>
  #include <linux/of.h>
  #include <linux/platform_device.h>
+ #include <linux/prefetch.h>
  #include <linux/proc_fs.h>
  #include <linux/slab.h>
  #include <linux/usb/ch9.h>
@@@ -35,8 -36,6 +36,6 @@@
  #include <linux/seq_file.h>
  #endif
  
- #include <mach/hardware.h>
- 
  /*
   * USB device configuration structure
   */
@@@ -2265,7 -2264,7 +2264,7 @@@ static void udc_handle_ep0_setup(struc
                default:
                        break;
                }
 -
 +              break;
  
        case USB_REQ_SET_ADDRESS:
                if (reqtype == (USB_TYPE_STANDARD | USB_RECIP_DEVICE)) {