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

Pull ARM SoC cleanups from Olof Johansson:
 "We've got a fairly large cleanup branch this time.  The bulk of this
  is removal of non-DT platforms of several flavors:

   - Atmel at91 platforms go full-DT, with removal of remaining
     board-file based support

   - OMAP removes legacy board files for three more platforms

   - removal of non-DT mach-msm, newer Qualcomm platforms now live in
     mach-qcom

   - Freescale i.MX25 also removes non-DT platform support"

Most of the rest of the changes here are fallout from the above, i.e. for
example removal of drivers that now lack platforms, etc.

* tag 'armsoc-cleanup' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (58 commits)
  mmc: Remove msm_sdcc driver
  gpio: Remove gpio-msm-v1 driver
  ARM: Remove mach-msm and associated ARM architecture code
  ARM: shmobile: cpuidle: Remove the pointless default driver
  ARM: davinci: dm646x: Add interrupt resource for McASPs
  ARM: davinci: irqs: Correct McASP1 TX interrupt definition for DM646x
  ARM: davinci: dm646x: Clean up the McASP DMA resources
  ARM: davinci: devices-da8xx: Add support for McASP2 on da830
  ARM: davinci: devices-da8xx: Clean up and correct the McASP device creation
  ARM: davinci: devices-da8xx: Add interrupt resource to McASP structs
  ARM: davinci: devices-da8xx: Add resource name for the McASP DMA request
  ARM: OMAP2+: Remove legacy support for omap3 TouchBook
  ARM: OMAP3: Remove legacy support for devkit8000
  ARM: OMAP3: Remove legacy support for EMA-Tech Stalker board
  ARM: shmobile: Consolidate the pm code for R-Car Gen2
  ARM: shmobile: r8a7791: Correct SYSCIER value
  ARM: shmobile: r8a7790: Correct SYSCIER value
  ARM: at91: remove old setup
  ARM: at91: sama5d4: remove useless map_io
  ARM: at91: sama5 use SoC detection infrastructure
  ...

1 files changed, 4 insertions, 16 deletions

diff --git a/MAINTAINERS b/MAINTAINERS
index 8e9ecbe6ebb5..9988e1a14f50 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -1261,22 +1261,6 @@ L:	openmoko-kernel@lists.openmoko.org (subscribers-only)
 W:      http://wiki.openmoko.org/wiki/Neo_FreeRunner
 S:      Supported
 
-ARM/QUALCOMM MSM MACHINE SUPPORT
-M:      David Brown <davidb@codeaurora.org>
-M:      Daniel Walker <dwalker@fifo99.com>
-M:      Bryan Huntsman <bryanh@codeaurora.org>
-L:      linux-arm-msm@vger.kernel.org
-F:      arch/arm/mach-msm/
-F:      drivers/video/fbdev/msm/
-F:      drivers/mmc/host/msm_sdcc.c
-F:      drivers/mmc/host/msm_sdcc.h
-F:      drivers/tty/serial/msm_serial.h
-F:      drivers/tty/serial/msm_serial.c
-F:      drivers/*/pm8???-*
-F:      drivers/mfd/ssbi.c
-T:      git git://git.kernel.org/pub/scm/linux/kernel/git/davidb/linux-msm.git
-S:      Maintained
-
 ARM/TOSA MACHINE SUPPORT
 M:      Dmitry Eremin-Solenikov <dbaryshkov@gmail.com>
 M:      Dirk Opfer <dirk@opfer-online.de>
@@ -1334,6 +1318,10 @@ L:	linux-soc@vger.kernel.org
 S:      Maintained
 F:      arch/arm/mach-qcom/
 F:      drivers/soc/qcom/
+F:      drivers/tty/serial/msm_serial.h
+F:      drivers/tty/serial/msm_serial.c
+F:      drivers/*/pm8???-*
+F:      drivers/mfd/ssbi.c
 T:      git git://git.kernel.org/pub/scm/linux/kernel/git/galak/linux-qcom.git
 
 ARM/RADISYS ENP2611 MACHINE SUPPORT