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:
 "A couple of platforms change hands in the MAINTAINERS file:

   - Linus Walleij lists himself for the ARM Reference platforms:
     versatile, vexpress, integrator and realview. He has been the main
     contributor for these for a while, and makes it official now.

   - Vladimir Zapolskiy takes over the LPC18xx platform from Joachim
     Eastwood

   - Manivannan Sadhasivam becomes a secondary maintainer for the
     Actions Semi machines

   - Nicolas Ferre lists updates the MAINTAINER listing for the AT91
     platform: Ludovic Desroches is now a co-maintainer for the
     platform, and several other people (Claudiu Beznea, Cristian
     Birsan, Eugen Hristev, Codrin Ciubotariu) take over individual
     device drivers.

  Thanks everyone for working on this, and welcome to the new
  maintainers!

  The "virt" platform on qemy or kvm can now be used in big-endian mode
  without additional tricks, thanks to Jason Donenfeld.

  Once again, we gain support for another NXP i.MX6 variant, this time
  it's the i.MX 6ULZ 32-bit single-core version.

  On arm64, we add support for two SoCs from Renesas: RZ/G2E (r8a774c0)
  and RZ/G2M (r8a774a1). These are described as microcontrollers on the
  manufacturer website, but appear to be rather powerful. The RZ/G2M is
  used on the reference board for the CIP Super Long Term Support (SLTS)
  Linux Kernels"

* tag 'armsoc-soc' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (54 commits)
  MAINTAINERS: Assign myself as a maintainer of ARM/LPC18XX architecture
  arm64: exynos: Enable generic power domain support
  MAINTAINERS: remove non-exsiting email address of Baoyou
  MAINTAINERS: fix pattern in ARM/Synaptics berlin SoC section
  MAINTAINERS: Drop dt-bindings/genpd/k2g.h
  ARM: samsung: Limit SAMSUNG_PM_CHECK config option to non-Exynos platforms
  arm64: actions: Enable PINCTRL in platforms Kconfig
  MAINTAINERS: Add entry for Actions Semi Owl SoCs DMA driver
  MAINTAINERS: Add entry for Actions Semiconductor Owl I2C driver
  MAINTAINERS: Update clock binding entry for Actions Semi Owl SoCs
  ARM: imx: add i.mx6ulz msl support
  ARM: Assume maintainership of ARM reference designs
  ARM: support big-endian for the virt architecture
  MAINTAINERS: sdhci: move the Microchip entry to proper location
  MAINTAINERS: move former ATMEL entries to proper MICROCHIP location
  MAINTAINERS: remove the / ATMEL string from MICROCHIP entries
  MAINTAINERS: iio: add co-maintainer to SAMA5D2-compatible ADC driver
  MAINTAINERS: pwm: add entry for Microchip pwm driver
  MAINTAINERS: dmaengine: add files to Microchip dma entry
  MAINTAINERS: USB: change maintainer for Microchip USBA gadget driver
  ...

diff --cc MAINTAINERS
index 85365afe30598013ead89e288a68a16def2e86eb,c6d2498252004238cf976d0045e7e9c9b5ee8e91..930241eb6e2d23d6648b9ced3ca37c8c9292ffa6
--- 1/MAINTAINERS
--- 2/MAINTAINERS
+++ b/MAINTAINERS
@@@ -1190,7 -1219,10 +1228,10 @@@ N:    ow
  F:    arch/arm/mach-actions/
  F:    arch/arm/boot/dts/owl-*
  F:    arch/arm64/boot/dts/actions/
 -F:    drivers/clocksource/owl-*
+ F:    drivers/clk/actions/
 +F:    drivers/clocksource/timer-owl*
+ F:    drivers/dma/owl-dma.c
+ F:    drivers/i2c/busses/i2c-owl.c
  F:    drivers/pinctrl/actions/*
  F:    drivers/soc/actions/
  F:    include/dt-bindings/power/owl-*
@@@ -9629,9 -9466,14 +9593,15 @@@ M:    Richard Genoud <richard.genoud@gmail
  S:    Maintained
  F:    drivers/tty/serial/atmel_serial.c
  F:    drivers/tty/serial/atmel_serial.h
 +F:    Documentation/devicetree/bindings/mfd/atmel-usart.txt
  
- MICROCHIP / ATMEL DMA DRIVER
+ MICROCHIP AUDIO ASOC DRIVERS
+ M:    Codrin Ciubotariu <[email protected]>
+ L:    [email protected] (moderated for non-subscribers)
+ S:    Supported
+ F:    sound/soc/atmel
+ 
+ MICROCHIP DMA DRIVER
  M:    Ludovic Desroches <[email protected]>
  L:    [email protected] (moderated for non-subscribers)
  L:    [email protected]
@@@ -9654,28 -9504,13 +9632,28 @@@ F:   drivers/media/platform/atmel/atmel-i
  F:    drivers/media/platform/atmel/atmel-isc-regs.h
  F:    devicetree/bindings/media/atmel-isc.txt
  
- MICROCHIP / ATMEL NAND DRIVER
- M:    Josh Wu <rainyfeeling@outlook.com>
- L:    linux-m[email protected].org
+ MICROCHIP ISI DRIVER
+ M:    Eugen Hristev <eugen.hristev@microchip.com>
+ L:    linux-m[email protected].org
  S:    Supported
- F:    drivers/mtd/nand/raw/atmel/*
- F:    Documentation/devicetree/bindings/mtd/atmel-nand.txt
+ F:    drivers/media/platform/atmel/atmel-isi.c
+ F:    include/media/atmel-isi.h
  
 +MICROCHIP AT91 USART MFD DRIVER
 +M:    Radu Pirea <[email protected]>
 +L:    [email protected]
 +S:    Supported
 +F:    drivers/mfd/at91-usart.c
 +F:    include/dt-bindings/mfd/at91-usart.h
 +F:    Documentation/devicetree/bindings/mfd/atmel-usart.txt
 +
 +MICROCHIP AT91 USART SPI DRIVER
 +M:    Radu Pirea <[email protected]>
 +L:    [email protected]
 +S:    Supported
 +F:    drivers/spi/spi-at91-usart.c
 +F:    Documentation/devicetree/bindings/mfd/atmel-usart.txt
 +
  MICROCHIP KSZ SERIES ETHERNET SWITCH DRIVER
  M:    Woojung Huh <[email protected]>
  M:    Microchip Linux Driver Support <[email protected]>
@@@ -9693,14 -9528,72 +9671,80 @@@ L:   [email protected]
  S:    Maintained
  F:    drivers/net/ethernet/microchip/lan743x_*
  
- MICROCHIP / ATMEL MCP3911 ADC DRIVER
+ MICROCHIP LCDFB DRIVER
+ M:    Nicolas Ferre <[email protected]>
+ L:    [email protected]
+ S:    Maintained
+ F:    drivers/video/fbdev/atmel_lcdfb.c
+ F:    include/video/atmel_lcdc.h
+ 
+ MICROCHIP MMC/SD/SDIO MCI DRIVER
+ M:    Ludovic Desroches <[email protected]>
+ S:    Maintained
+ F:    drivers/mmc/host/atmel-mci.c
+ 
++MICROCHIP MCP3911 ADC DRIVER
 +M:    Marcus Folkesson <[email protected]>
 +M:    Kent Gustavsson <[email protected]>
 +L:    [email protected]
 +S:    Supported
 +F:    drivers/iio/adc/mcp3911.c
 +F:    Documentation/devicetree/bindings/iio/adc/mcp3911.txt
 +
+ MICROCHIP NAND DRIVER
+ M:    Tudor Ambarus <[email protected]>
+ L:    [email protected]
+ S:    Supported
+ F:    drivers/mtd/nand/raw/atmel/*
+ F:    Documentation/devicetree/bindings/mtd/atmel-nand.txt
+ 
+ MICROCHIP PWM DRIVER
+ M:    Claudiu Beznea <[email protected]>
+ L:    [email protected] (moderated for non-subscribers)
+ L:    [email protected]
+ S:    Supported
+ F:    drivers/pwm/pwm-atmel.c
+ F:    Documentation/devicetree/bindings/pwm/atmel-pwm.txt
+ 
+ MICROCHIP SAMA5D2-COMPATIBLE ADC DRIVER
+ M:    Ludovic Desroches <[email protected]>
+ M:    Eugen Hristev <[email protected]>
+ L:    [email protected]
+ S:    Supported
+ F:    drivers/iio/adc/at91-sama5d2_adc.c
+ F:    Documentation/devicetree/bindings/iio/adc/at91-sama5d2_adc.txt
+ F:    include/dt-bindings/iio/adc/at91-sama5d2_adc.h
+ 
+ MICROCHIP SAMA5D2-COMPATIBLE SHUTDOWN CONTROLLER
+ M:    Nicolas Ferre <[email protected]>
+ S:    Supported
+ F:    drivers/power/reset/at91-sama5d2_shdwc.c
+ 
+ MICROCHIP SPI DRIVER
+ M:    Nicolas Ferre <[email protected]>
+ S:    Supported
+ F:    drivers/spi/spi-atmel.*
+ 
+ MICROCHIP SSC DRIVER
+ M:    Nicolas Ferre <[email protected]>
+ L:    [email protected] (moderated for non-subscribers)
+ S:    Supported
+ 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)
+ S:    Supported
+ F:    drivers/usb/gadget/udc/atmel_usba_udc.*
+ 
  MICROCHIP USB251XB DRIVER
  M:    Richard Leitner <[email protected]>
  L:    [email protected]
@@@ -11284,15 -11171,8 +11335,15 @@@ F: include/uapi/linux/switchtec_ioctl.
  F:    include/linux/switchtec.h
  F:    drivers/ntb/hw/mscc/
  
 +PCI DRIVER FOR MOBIVEIL PCIE IP
 +M:    Subrahmanya Lingappa <[email protected]>
 +L:    [email protected]
 +S:    Supported
 +F:    Documentation/devicetree/bindings/pci/mobiveil-pcie.txt
 +F:    drivers/pci/controller/pcie-mobiveil.c
 +
  PCI DRIVER FOR MVEBU (Marvell Armada 370 and Armada XP SOC support)
- M:    Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
+ M:    Thomas Petazzoni <thomas.petazzoni@bootlin.com>
  M:    Jason Cooper <[email protected]>
  L:    [email protected]
  L:    [email protected] (moderated for non-subscribers)

diff --cc arch/arm/Kconfig.debug
Simple merge

diff --cc arch/arm/mach-omap1/board-ams-delta.c
Simple merge

diff --cc arch/arm/mach-shmobile/Kconfig
Simple merge

diff --cc arch/arm/mach-shmobile/pm-rcar-gen2.c
Simple merge

diff --cc arch/arm/mach-shmobile/pm-rmobile.c
Simple merge

diff --cc arch/arm/mach-shmobile/timer.c
Simple merge

diff --cc arch/arm64/Kconfig.platforms
Simple merge

diff --cc include/linux/platform_data/gpio-omap.h
index 8485c6a9a383203be7517fc39cbed734d1648927,ed071f76b6425be21c2d0e46e6704cf3cf66df85..6d07eebb3f75907efa50bf5fadd92dd568da8ec6
--- 1/include/linux/platform_data/gpio-omap.h
--- 2/include/linux/platform_data/gpio-omap.h
+++ b/include/linux/platform_data/gpio-omap.h
@@@ -205,4 -206,18 +208,6 @@@ struct omap_gpio_platform_data 
        int (*get_context_loss_count)(struct device *dev);
  };
  
 -#if IS_BUILTIN(CONFIG_GPIO_OMAP)
 -extern void omap2_gpio_prepare_for_idle(int off_mode);
 -extern void omap2_gpio_resume_after_idle(void);
 -#else
 -static inline void omap2_gpio_prepare_for_idle(int off_mode)
 -{
 -}
 -
 -static inline void omap2_gpio_resume_after_idle(void)
 -{
 -}
 -#endif
+ #endif /* __ASSEMBLER__ */
+ 
  #endif