Merge tag 'u-boot-imx-20210717' of https://gitlab.denx.de/u-boot/custodians/u-boot-imx

i.MX
----

- mx7ulp : fix  WDOG
- imx8 : Phytec
- USB3 support for i.MX8

CI: https://source.denx.de/u-boot/custodians/u-boot-imx/-/pipelines/8277

diff --combined arch/arm/dts/Makefile
index 708ce2d,db3891e..90e3004
--- 1/arch/arm/dts/Makefile
--- 2/arch/arm/dts/Makefile
+++ b/arch/arm/dts/Makefile
@@@ -254,7 -254,6 +254,7 @@@ dtb-$(CONFIG_ARCH_UNIPHIER_LD11) += 
        uniphier-ld11-global.dtb \
        uniphier-ld11-ref.dtb
  dtb-$(CONFIG_ARCH_UNIPHIER_LD20) += \
 +      uniphier-ld20-akebi96.dtb \
        uniphier-ld20-global.dtb \
        uniphier-ld20-ref.dtb
  dtb-$(CONFIG_ARCH_UNIPHIER_LD4) += \
@@@ -613,8 -612,7 +613,8 @@@ dtb-$(CONFIG_MACH_SUN8I_H3) += 
        sun8i-h3-orangepi-plus.dtb \
        sun8i-h3-orangepi-plus2e.dtb \
        sun8i-h3-orangepi-zero-plus2.dtb \
 -      sun8i-h3-rervision-dvk.dtb
 +      sun8i-h3-rervision-dvk.dtb \
 +      sun8i-h3-zeropi.dtb
  dtb-$(CONFIG_MACH_SUN8I_R40) += \
        sun8i-r40-bananapi-m2-ultra.dtb \
        sun8i-v40-bananapi-m2-berry.dtb
@@@ -867,6 -865,7 +867,7 @@@ dtb-$(CONFIG_ARCH_IMX8M) += 
        imx8mm-venice-gw71xx-0x.dtb \
        imx8mm-venice-gw72xx-0x.dtb \
        imx8mm-venice-gw73xx-0x.dtb \
+       imx8mm-venice-gw7901.dtb \
        imx8mm-verdin.dtb \
        phycore-imx8mm.dtb \
        imx8mn-ddr4-evk.dtb \

diff --combined drivers/phy/Kconfig
index 92c74b9,09cb744..80ae1af
--- 1/drivers/phy/Kconfig
--- 2/drivers/phy/Kconfig
+++ b/drivers/phy/Kconfig
@@@ -64,12 -64,6 +64,12 @@@ config MIPI_DPHY_HELPER
        help
          Provides a number of helpers a core functions for MIPI D-PHY drivers.
  
 +config AB8500_USB_PHY
 +      bool "AB8500 USB PHY Driver"
 +      depends on PHY && PMIC_AB8500
 +      help
 +        Support for the USB OTG PHY in ST-Ericsson AB8500.
 +
  config BCM6318_USBH_PHY
        bool "BCM6318 USBH PHY support"
        depends on PHY && ARCH_BMIPS
@@@ -274,5 -268,12 +274,12 @@@ config PHY_MTK_TPH
          multi-ports is first version, otherwise is second veriosn,
          so you can easily distinguish them by banks layout.
  
+ config PHY_IMX8MQ_USB
+       bool "NXP i.MX8MQ USB PHY Driver"
+       depends on PHY
+       depends on IMX8MQ
+       help
+         Support the USB3.0 PHY in NXP i.MX8MQ SoC
+ 
  source "drivers/phy/rockchip/Kconfig"
  endmenu

diff --combined drivers/phy/Makefile
index bf03d05,c6ad3b1..0f2b63a
--- 1/drivers/phy/Makefile
--- 2/drivers/phy/Makefile
+++ b/drivers/phy/Makefile
@@@ -6,7 -6,6 +6,7 @@@
  obj-$(CONFIG_$(SPL_)PHY) += phy-uclass.o
  obj-$(CONFIG_$(SPL_)NOP_PHY) += nop-phy.o
  obj-$(CONFIG_MIPI_DPHY_HELPERS) += phy-core-mipi-dphy.o
 +obj-$(CONFIG_AB8500_USB_PHY) += phy-ab8500-usb.o
  obj-$(CONFIG_BCM6318_USBH_PHY) += bcm6318-usbh-phy.o
  obj-$(CONFIG_BCM6348_USBH_PHY) += bcm6348-usbh-phy.o
  obj-$(CONFIG_BCM6358_USBH_PHY) += bcm6358-usbh-phy.o
@@@ -32,3 -31,4 +32,4 @@@ obj-$(CONFIG_MT7620_USB_PHY) += mt7620-
  obj-$(CONFIG_MT76X8_USB_PHY) += mt76x8-usb-phy.o
  obj-$(CONFIG_PHY_DA8XX_USB) += phy-da8xx-usb.o
  obj-$(CONFIG_PHY_MTK_TPHY) += phy-mtk-tphy.o
+ obj-$(CONFIG_PHY_IMX8MQ_USB) += phy-imx8mq-usb.o