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

Pull ARM SoC platform updates from Arnd Bergmann:
 "We get support for three new 32-bit SoC platforms this time.

  The amount of changes in arch/arm for any of them is miniscule, as all
  the interesting code is in device driver subsystems (irqchip, clk,
  pinctrl, ...) these days.  I'm listing them here, as the addition of
  the Kconfig statement is the main relevant milestone for a new
  platform.  In each case, some drivers are are shared with existing
  platforms, while other drivers are added for v4.7 as well, or come in
  a later release.

   - The Aspeed platform is probably the most interesting one, this is
     what most whitebox servers use as their baseboard management
     controller.  We get support for the very common ast2400 and ast2500
     SoCs.  The OpenBMC project focuses on this chip, and the LWN
     article about their ELC 2016 presentation at

        https://lwn.net/Articles/683320/

     triggered the submission, but the code comes from IBM's OpenPOWER
     team rather than the team at Facebook.  There are still a lot more
     drivers that need to get added over time, and I hope both teams can
     work together on that.

   - OXNAS is an old platform for Network Attached Storage devices from
     Oxford Semiconductor.  There are models with ARM10 (!) and
     ARM11MPCore cores, but for now, we only support the original ARM9
     based versions.  The product lineup was subsequently part of PLX,
     Avago and now the new Broadcom Ltd.

        https://wiki.openwrt.org/doc/hardware/soc/soc.oxnas

     has some more information.

   - V2M-MPS2 is a prototyping platform from ARM for their Cortex-M
     cores and is related to the existing Realview / Versatile Express
     lineup, but without MMU.

     We now support various NOMMU platforms, so adding a new one is
     fairly straightforward.

        http://infocenter.arm.com/help/topic/com.arm.doc.100112_0100_03_en/

     has detailed information about the platform.

  Other noteworthy updates:

   - Work on LPC32xx has resumed, and Vladimir Zapolskiy and Sylvain
     Lemieux are now maintaining the platform.

     This is an older ARM9 based platform from NXP (not Freescale), but
     it remains in use in embedded markets.

   - Kevin Hilman is now co-maintaining the Amlogic Meson platform for
     both 32-bit and 64-bit ARM, and started contributing some patches.

   - As is often the case, work on the OMAP platforms makes up the bulk
     of the actual SoC code changes in arch/arm, but there isn't a lot
     of that either"

* tag 'armsoc-soc' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (42 commits)
  MAINTAINERS: ARM/Amlogic: add co-maintainer, misc. updates
  MAINTAINERS: add ARM/NXP LPC32XX SoC specific drivers to the section
  MAINTAINERS: add new maintainers of NXP LPC32xx SoC
  MAINTAINERS: move ARM/NXP LPC32xx record to ARM section
  arm: Add Aspeed machine
  ARM: lpc32xx: remove duplicate const on lpc32xx_auxdata_lookup
  ARM: lpc32xx: remove leftovers of legacy clock source and provider drivers
  ARM: lpc32xx: remove reboot header file
  ARM: dove: Remove CLK_IS_ROOT
  ARM: orion5x: Remove CLK_IS_ROOT
  ARM: mv78xx0: Remove CLK_IS_ROOT
  ARM: davinci: da850: use clk->set_parent for async3
  ARM: davinci: Move clock init after ioremap.
  MAINTAINERS: Update ARM Versatile Express platform entry
  ARM: vexpress/mps2: introduce MPS2 platform
  MAINTAINERS: add maintainer entry for ARM/OXNAS platform
  ARM: Add new mach-oxnas
  irqchip: versatile-fpga: add new compatible for OX810SE SoC
  ARM: uniphier: correct the call order of of_node_put()
  MAINTAINERS: fix stale TI DaVinci entries
  ...

1 files changed, 39 insertions, 9 deletions

diff --git a/MAINTAINERS b/MAINTAINERS
index 8267754b9427..01eefc861477 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -949,12 +949,15 @@ F:	drivers/clk/sunxi/
 
 ARM/Amlogic Meson SoC support
 M:      Carlo Caione <carlo@caione.org>
+M:      Kevin Hilman <khilman@baylibre.com>
 L:      linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
-L:      linux-meson@googlegroups.com
+L:      linux-amlogic@lists.infradead.org
 W:      http://linux-meson.com/
 S:      Maintained
 F:      arch/arm/mach-meson/
 F:      arch/arm/boot/dts/meson*
+F:      arch/arm64/boot/dts/amlogic/
+F:      drivers/pinctrl/meson/
 N:      meson
 
 ARM/Annapurna Labs ALPINE ARCHITECTURE
@@ -976,6 +979,13 @@ F:	arch/arm/mach-artpec
 F:      arch/arm/boot/dts/artpec6*
 F:      drivers/clk/clk-artpec6.c
 
+ARM/ASPEED MACHINE SUPPORT
+M:      Joel Stanley <joel@jms.id.au>
+S:      Maintained
+F:      arch/arm/mach-aspeed/
+F:      arch/arm/boot/dts/aspeed-*
+F:      drivers/*/*aspeed*
+
 ARM/ATMEL AT91RM9200, AT91SAM9 AND SAMA5 SOC SUPPORT
 M:      Nicolas Ferre <nicolas.ferre@atmel.com>
 M:      Alexandre Belloni <alexandre.belloni@free-electrons.com>
@@ -1307,6 +1317,20 @@ F:	drivers/mtd/spi-nor/nxp-spifi.c
 F:      drivers/rtc/rtc-lpc24xx.c
 N:      lpc18xx
 
+ARM/LPC32XX SOC SUPPORT
+M:      Vladimir Zapolskiy <vz@mleia.com>
+M:      Sylvain Lemieux <slemieux.tyco@gmail.com>
+L:      linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
+T:      git git://github.com/vzapolskiy/linux-lpc32xx.git
+S:      Maintained
+F:      arch/arm/boot/dts/lpc32*
+F:      arch/arm/mach-lpc32xx/
+F:      drivers/i2c/busses/i2c-pnx.c
+F:      drivers/net/ethernet/nxp/lpc_eth.c
+F:      drivers/usb/host/ohci-nxp.c
+F:      drivers/watchdog/pnx4008_wdt.c
+N:      lpc32xx
+
 ARM/MAGICIAN MACHINE SUPPORT
 M:      Philipp Zabel <philipp.zabel@gmail.com>
 S:      Maintained
@@ -1357,6 +1381,15 @@ W:	http://www.digriz.org.uk/ts78xx/kernel
 S:      Maintained
 F:      arch/arm/mach-orion5x/ts78xx-*
 
+ARM/OXNAS platform support
+M:      Neil Armstrong <narmstrong@baylibre.com>
+L:      linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
+S:      Maintained
+F:      arch/arm/mach-oxnas/
+F:      arch/arm/boot/dts/oxnas*
+F:      arch/arm/boot/dts/wd-mbwe.dts
+N:      oxnas
+
 ARM/Mediatek RTC DRIVER
 M:      Eddie Huang <eddie.huang@mediatek.com>
 L:      linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
@@ -1643,6 +1676,7 @@ F:	arch/arm/boot/dts/sti*
 F:      drivers/char/hw_random/st-rng.c
 F:      drivers/clocksource/arm_global_timer.c
 F:      drivers/clocksource/clksrc_st_lpc.c
+F:      drivers/cpufreq/sti-cpufreq.c
 F:      drivers/i2c/busses/i2c-st.c
 F:      drivers/media/rc/st_rc.c
 F:      drivers/media/platform/sti/c8sectpfe/
@@ -1652,6 +1686,7 @@ F:	drivers/phy/phy-miphy365x.c
 F:      drivers/phy/phy-stih407-usb.c
 F:      drivers/phy/phy-stih41x-usb.c
 F:      drivers/pinctrl/pinctrl-st.c
+F:      drivers/remoteproc/st_remoteproc.c
 F:      drivers/reset/sti/
 F:      drivers/rtc/rtc-st-lpc.c
 F:      drivers/tty/serial/st-asc.c
@@ -1776,6 +1811,7 @@ F:	*/*/vexpress*
 F:      */*/*/vexpress*
 F:      drivers/clk/versatile/clk-vexpress-osc.c
 F:      drivers/clocksource/versatile.c
+N:      mps2
 
 ARM/VFP SUPPORT
 M:      Russell King <linux@armlinux.org.uk>
@@ -6789,12 +6825,6 @@ W:	logfs.org
 S:      Maintained
 F:      fs/logfs/
 
-LPC32XX MACHINE SUPPORT
-M:      Roland Stigge <stigge@antcom.de>
-L:      linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
-S:      Maintained
-F:      arch/arm/mach-lpc32xx/
-
 LSILOGIC MPT FUSION DRIVERS (FC/SAS/SPI)
 M:      Sathya Prakash <sathya.prakash@broadcom.com>
 M:      Chaitra P B <chaitra.basappa@broadcom.com>
@@ -10174,8 +10204,8 @@ F:	arch/arm/mach-s3c24xx/bast-irq.c
 TI DAVINCI MACHINE SUPPORT
 M:      Sekhar Nori <nsekhar@ti.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/
+L:      linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
+T:      git git://git.kernel.org/pub/scm/linux/kernel/git/nsekhar/linux-davinci.git
 S:      Supported
 F:      arch/arm/mach-davinci/
 F:      drivers/i2c/busses/i2c-davinci.c