Merge tag 'mips-pull-2019-05-03' of git://git.denx.de/u-boot-mips

- mscc: small fixes, enhance network support for Serval, Luton and Ocelot
- mt7620: rename arch to more generic name mtmips
- mips: pass initrd addresses via DT as physical addresses

diff --combined MAINTAINERS
index 5891fd08b6a700c967f74dc441089dcfbffb037f,6035623fc467ae7bec689bdf805af4d4853ab401..33fd4652a42554599e6ced49d26613546b902ab2
--- 1/MAINTAINERS
--- 2/MAINTAINERS
+++ b/MAINTAINERS
@@@ -239,7 -239,6 +239,7 @@@ F: arch/arm/mach-rmobile
  ARM ROCKCHIP
  M:    Simon Glass <sjg@chromium.org>
  M:    Philipp Tomsich <philipp.tomsich@theobroma-systems.com>
 +M:    Kever Yang <kever.yang@rock-chips.com>
  S:    Maintained
  T:    git git://git.denx.de/u-boot-rockchip.git
  F:    arch/arm/include/asm/arch-rockchip/
@@@ -578,6 -577,7 +578,7 @@@ F: configs/mscc
  F:    drivers/gpio/mscc_sgpio.c
  F:    drivers/spi/mscc_bb_spi.c
  F:    include/configs/vcoreiii.h
+ F:    include/dt-bindings/mscc/
  F:    drivers/pinctrl/mscc/
  F:    drivers/net/mscc_eswitch/
  
@@@ -587,7 -587,7 +588,7 @@@ S: Maintaine
  F:    arch/mips/mach-jz47xx/
  
  MMC
 -M:    Jaehoon Chung <jh80.chung@samsung.com>
 +M:    Peng Fan <peng.fan@nxp.com>
  S:    Maintained
  T:    git git://git.denx.de/u-boot-mmc.git
  F:    drivers/mmc/

diff --combined drivers/watchdog/Kconfig
index 16d47b88858ed2ac31b316ef7e2ad22ee655a509,8eca3f3ca992b2de554c1caed0967d3d39bc97f5..f909d40f45588e27af74f626770268458fafc165
--- 1/drivers/watchdog/Kconfig
--- 2/drivers/watchdog/Kconfig
+++ b/drivers/watchdog/Kconfig
@@@ -55,7 -55,7 +55,7 @@@ config WD
        help
          Enable driver model for watchdog timer. At the moment the API
          is very simple and only supports four operations:
 -        start, restart, stop and reset (expire immediately).
 +        start, stop, reset and expire_now (expire immediately).
          What exactly happens when the timer expires is up to a particular
          device/driver.
  
@@@ -143,7 -143,7 +143,7 @@@ config WDT_AT9
  
  config WDT_MT7621
        bool "MediaTek MT7621 watchdog timer support"
-       depends on WDT && ARCH_MT7620
+       depends on WDT && SOC_MT7628
        help
           Select this to enable Ralink / Mediatek watchdog timer,
           which can be found on some MediaTek chips.