From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Wed, 6 Mar 2019 17:33:05 +0000 (-0800)
Subject: Merge tag 'armsoc-soc' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=aebbfafc74b8d4eac573aab47aaa2e7965295096;p=openwrt%2Fstaging%2Fblogic.git

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

Pull ARM SoC platform updates from Arnd Bergmann:
 "The APM X-Gene platform is now maintained by folks from Ampere
  computing that took over the product line a while ago, this gets
  reflected in the MAINTAINERS file.

  Cleanups continue on the older mach-davinci and mach-pxa platform, to
  get them to be more like the modern ones. For pxa, we now remove the
  Raumfeld platform code as it now works with device tree based booting.

  i.MX adds a couple new features for the i.MX7ULP SoC

  Mediatek gains support for a new SoC: MT7629 is a new wireless router
  platform, following MT7623.

  Aside from those, there are the usual minor cleanups and bugfixes
  across several platforms"

* tag 'armsoc-soc' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc: (49 commits)
  MAINTAINERS: Update Ampere email address
  usb: ohci-da8xx: remove unused callbacks from platform data
  ARM: davinci: da830-evm: remove legacy usb helpers
  ARM: davinci: omapl138-hawk: remove legacy usb helpers
  usb: ohci-da8xx: add vbus and overcurrent gpios
  ARM: davinci: da830-evm: use gpio lookup entries for usb gpios
  ARM: davinci: omapl138-hawk: use gpio lookup entries for usb gpios
  usb: ohci-da8xx: add a helper pointer to &pdev->dev
  usb: ohci-da8xx: add a new line after local variables
  arm64: meson: enable g12a clock controller
  MAINTAINERS: Add entry for uDPU board
  ARM: davinci: da850-evm: use GPIO hogs instead of the legacy API
  arm: mediatek: add MT7629 smp bring up code
  Revert "ARM: mediatek: add MT7623a smp bringup code"
  dt-bindings: soc: fix typo of MT8173 power dt-bindings
  ARM: meson: remove COMMON_CLK_AMLOGIC selection
  arm64: meson: remove COMMON_CLK_AMLOGIC selection
  ARM: lpc32xx: remove platform data of ARM PL111 LCD controller
  ARM: lpc32xx: remove platform data of ARM PL180 SD/MMC controller
  ARM: lpc32xx: Use kmemdup to replace duplicating its implementation
  ...
---

aebbfafc74b8d4eac573aab47aaa2e7965295096
diff --cc MAINTAINERS
index 366362b16f34,c96b9ee948ee..a4424f69fe82
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@@ -9881,13 -9848,11 +9876,18 @@@ F:	drivers/media/platform/meson/ao-cec.
  F:	Documentation/devicetree/bindings/media/meson-ao-cec.txt
  T:	git git://linuxtv.org/media_tree.git
  
 +MESON NAND CONTROLLER DRIVER FOR AMLOGIC SOCS
 +M:	Liang Yang <liang.yang@amlogic.com>
 +L:	linux-mtd@lists.infradead.org
 +S:	Maintained
 +F:	drivers/mtd/nand/raw/meson_*
 +F:	Documentation/devicetree/bindings/mtd/amlogic,meson-nand.txt
 +
+ METHODE UDPU SUPPORT
+ M:	Vladimir Vid <vladimir.vid@sartura.hr>
+ S:	Maintained
+ F:	arch/arm64/boot/dts/marvell/armada-3720-uDPU.dts
+ 
  MICROBLAZE ARCHITECTURE
  M:	Michal Simek <monstr@monstr.eu>
  W:	http://www.monstr.eu/fdt/