Merge tag 'xilinx-for-v2022.07-rc1' of https://source.denx.de/u-boot/custodians/u...

Xilinx changes for v2022.07-rc1

microblaze:
- Add support for reserved memory

xilinx:
- Update FRU code with MAC reading

zynqmp:
- Remove double AMS setting
- DT updates (mostly for SOMs)
- Add support for zcu106 rev 1.0

zynq:
- Update nand binding

nand:
- Aligned zynq_nand to upstream DT binding

net:
- Add support for ethernet-phy-id

mmc:
- Workaround CD in zynq_sdhci driver also for ZynqMP
- Add support for dynamic/run-time SD config for SOMs

gpio:
- Add driver for slg7xl45106

firmware:
- Add support for dynamic SD config

power-domain:
- Update zynqmp driver with the latest firmware

video:
- Add skeleton driver for DP and DPDMA

i2c:
- Fix i2c to work with QEMU

pinctrl:
- Add driver for zynqmp pinctrl driver

diff --combined MAINTAINERS
index f25ca7c,915316a..126bb43
--- 1/MAINTAINERS
--- 2/MAINTAINERS
+++ b/MAINTAINERS
@@@ -617,8 -617,10 +617,10 @@@ F:       drivers/i2c/muxes/pca954x.
  F:    drivers/i2c/zynq_i2c.c
  F:    drivers/mmc/zynq_sdhci.c
  F:    drivers/mtd/nand/raw/zynq_nand.c
+ F:    drivers/net/phy/ethernet_id.c
  F:    drivers/net/phy/xilinx_phy.c
  F:    drivers/net/zynq_gem.c
+ F:    drivers/pinctrl/pinctrl-zynqmp.c
  F:    drivers/serial/serial_zynq.c
  F:    drivers/spi/zynq_qspi.c
  F:    drivers/spi/zynq_spi.c
@@@ -636,6 -638,7 +638,7 @@@ F: arch/arm/mach-zynqmp
  F:    drivers/clk/clk_zynqmp.c
  F:    driver/firmware/firmware-zynqmp.c
  F:    drivers/fpga/zynqpl.c
+ F:    drivers/gpio/gpio_slg7xl45106.c
  F:    drivers/gpio/zynq_gpio.c
  F:    drivers/gpio/zynqmp_gpio_modepin.c
  F:    drivers/i2c/i2c-cdns.c
@@@ -655,7 -658,6 +658,6 @@@ F: drivers/soc/soc_xilinx_zynqmp.
  F:    drivers/spi/zynq_qspi.c
  F:    drivers/spi/zynq_spi.c
  F:    drivers/timer/cadence-ttc.c
- F:    drivers/usb/host/ehci-zynq.c
  F:    drivers/video/seps525.c
  F:    drivers/watchdog/cdns_wdt.c
  F:    include/zynqmppl.h
@@@ -809,25 -811,6 +811,25 @@@ S:       Maintaine
  F:    doc/usage/environment.rst
  F:    scripts/env2string.awk
  
 +EROFS
 +M:    Huang Jianan <jnhuang95@gmail.com>
 +L:    linux-erofs@lists.ozlabs.org
 +S:    Maintained
 +F:    cmd/erofs.c
 +F:    fs/erofs/
 +F:    include/erofs.h
 +F:    test/py/tests/test_fs/test_erofs.py
 +
 +EVENTS
 +M:    Simon Glass <sjg@chromium.org>
 +S:    Maintained
 +F:    cmd/event.c
 +F:    common/event.c
 +F:    include/event.h
 +F:    scripts/event_dump.py
 +F:    test/common/event.c
 +F:    test/py/tests/test_event_dump.py
 +
  FASTBOOT
  S:    Orphaned
  F:    cmd/fastboot.c
@@@ -1345,14 -1328,6 +1347,14 @@@ F:    include/virtio*.
  F:    test/dm/virtio.c
  F:    doc/develop/driver-model/virtio.rst
  
 +WATCHDOG
 +M:    Stefan Roese <sr@denx.de>
 +S:    Maintained
 +T:    git https://source.denx.de/u-boot/custodians/u-boot-watchdog.git
 +F:    cmd/wdt.c
 +F:    drivers/watchdog/
 +F:    include/watchdog*.h
 +
  X86
  M:    Simon Glass <sjg@chromium.org>
  M:    Bin Meng <bmeng.cn@gmail.com>

diff --combined arch/arm/dts/Makefile
index 56ed7b6,2edcb26..770a519
--- 1/arch/arm/dts/Makefile
--- 2/arch/arm/dts/Makefile
+++ b/arch/arm/dts/Makefile
@@@ -349,6 -349,7 +349,7 @@@ dtb-$(CONFIG_ARCH_ZYNQMP) += 
        zynqmp-zcu104-revA.dtb                  \
        zynqmp-zcu104-revC.dtb                  \
        zynqmp-zcu106-revA.dtb                  \
+       zynqmp-zcu106-rev1.0.dtb                \
        zynqmp-zcu111-revA.dtb                  \
        zynqmp-zcu1275-revA.dtb                 \
        zynqmp-zcu1275-revB.dtb                 \
@@@ -1104,9 -1105,6 +1105,9 @@@ dtb-$(CONFIG_ARCH_BCM63158) += 
  dtb-$(CONFIG_ARCH_BCM68360) += \
        bcm968360bg.dtb
  
 +dtb-$(CONFIG_ARCH_BCM6753) += \
 +      bcm96753ref.dtb
 +
  dtb-$(CONFIG_ARCH_BCM6858) += \
        bcm968580xref.dtb
  
@@@ -1188,7 -1186,6 +1189,7 @@@ dtb-$(CONFIG_TARGET_VEXPRESS64_JUNO) +
  dtb-$(CONFIG_TARGET_TOTAL_COMPUTE) += total_compute.dtb
  
  dtb-$(CONFIG_TARGET_DURIAN) += phytium-durian.dtb
 +dtb-$(CONFIG_TARGET_POMELO) += phytium-pomelo.dtb
  
  dtb-$(CONFIG_TARGET_PRESIDIO_ASIC) += ca-presidio-engboard.dtb
  

diff --combined configs/xilinx_zynqmp_virt_defconfig
index f12bad7,0fa03e7..2777332
--- 1/configs/xilinx_zynqmp_virt_defconfig
--- 2/configs/xilinx_zynqmp_virt_defconfig
+++ b/configs/xilinx_zynqmp_virt_defconfig
@@@ -64,8 -64,6 +64,8 @@@ CONFIG_CMD_SPI=
  CONFIG_CMD_USB=y
  CONFIG_CMD_USB_MASS_STORAGE=y
  CONFIG_CMD_WDT=y
 +CONFIG_BOOTP_MAY_FAIL=y
 +CONFIG_BOOTP_BOOTFILESIZE=y
  CONFIG_CMD_TFTPPUT=y
  CONFIG_CMD_BMP=y
  CONFIG_CMD_CACHE=y
@@@ -84,7 -82,7 +84,7 @@@ CONFIG_CMD_UBI=
  CONFIG_PARTITION_TYPE_GUID=y
  CONFIG_SPL_OF_CONTROL=y
  CONFIG_OF_BOARD=y
- CONFIG_OF_LIST="avnet-ultra96-rev1 zynqmp-a2197-revA zynqmp-e-a2197-00-revA zynqmp-g-a2197-00-revA zynqmp-m-a2197-01-revA zynqmp-m-a2197-02-revA zynqmp-m-a2197-03-revA zynqmp-p-a2197-00-revA zynqmp-zc1232-revA zynqmp-zc1254-revA zynqmp-zc1751-xm015-dc1 zynqmp-zc1751-xm016-dc2 zynqmp-zc1751-xm017-dc3 zynqmp-zc1751-xm018-dc4 zynqmp-zc1751-xm019-dc5 zynqmp-zcu100-revC zynqmp-zcu102-rev1.1 zynqmp-zcu102-rev1.0 zynqmp-zcu102-revA zynqmp-zcu102-revB zynqmp-zcu104-revA zynqmp-zcu104-revC zynqmp-zcu106-revA zynqmp-zcu111-revA zynqmp-zcu1275-revA zynqmp-zcu1275-revB zynqmp-zcu1285-revA zynqmp-zcu208-revA zynqmp-zcu216-revA zynqmp-topic-miamimp-xilinx-xdp-v1r1 zynqmp-sm-k26-revA zynqmp-smk-k26-revA zynqmp-dlc21-revA"
+ CONFIG_OF_LIST="avnet-ultra96-rev1 zynqmp-a2197-revA zynqmp-e-a2197-00-revA zynqmp-g-a2197-00-revA zynqmp-m-a2197-01-revA zynqmp-m-a2197-02-revA zynqmp-m-a2197-03-revA zynqmp-p-a2197-00-revA zynqmp-zc1232-revA zynqmp-zc1254-revA zynqmp-zc1751-xm015-dc1 zynqmp-zc1751-xm016-dc2 zynqmp-zc1751-xm017-dc3 zynqmp-zc1751-xm018-dc4 zynqmp-zc1751-xm019-dc5 zynqmp-zcu100-revC zynqmp-zcu102-rev1.1 zynqmp-zcu102-rev1.0 zynqmp-zcu102-revA zynqmp-zcu102-revB zynqmp-zcu104-revA zynqmp-zcu104-revC zynqmp-zcu106-revA zynqmp-zcu106-rev1.0 zynqmp-zcu111-revA zynqmp-zcu1275-revA zynqmp-zcu1275-revB zynqmp-zcu1285-revA zynqmp-zcu208-revA zynqmp-zcu216-revA zynqmp-topic-miamimp-xilinx-xdp-v1r1 zynqmp-sm-k26-revA zynqmp-smk-k26-revA zynqmp-dlc21-revA"
  CONFIG_OF_SPL_REMOVE_PROPS="pinctrl-0 pinctrl-names interrupt-parent interrupts iommus power-domains"
  CONFIG_ENV_IS_NOWHERE=y
  CONFIG_ENV_IS_IN_FAT=y

diff --combined drivers/gpio/Kconfig
index 12972cd,a9e9b30..c3f1109
--- 1/drivers/gpio/Kconfig
--- 2/drivers/gpio/Kconfig
+++ b/drivers/gpio/Kconfig
@@@ -87,8 -87,7 +87,8 @@@ config ALTERA_PI
  config BCM6345_GPIO
        bool "BCM6345 GPIO driver"
        depends on DM_GPIO && (ARCH_BMIPS || ARCH_BCM68360 || \
 -                             ARCH_BCM6858 || ARCH_BCM63158)
 +                             ARCH_BCM6858 || ARCH_BCM63158 || \
 +                             ARCH_BCM6753)
        help
          This driver supports the GPIO banks on BCM6345 SoCs.
  
@@@ -127,13 -126,6 +127,13 @@@ config ATMEL_PIO
          may be dedicated as a general purpose I/O or be assigned to
          a function of an embedded peripheral.
  
 +config ASPEED_GPIO
 +      bool "Aspeed GPIO Driver"
 +      help
 +        Say yes here to support the Aspeed GPIO driver. The controller
 +        is found in the AST2400, AST2500 and AST2600 BMC SoCs and
 +        provides access to over 200 GPIOs on each chip.
 +
  config DA8XX_GPIO
        bool "DA8xx GPIO Driver"
        help
@@@ -558,4 -550,12 +558,12 @@@ config SL28CPLD_GPI
        help
          Support GPIO access on Kontron sl28cpld board management controllers.
  
+ config SLG7XL45106_I2C_GPO
+       bool "slg7xl45106 i2c gpo expander"
+       depends on DM_GPIO
+       help
+          Support for slg7xl45106 i2c gpo expander. It is an i2c based
+          8-bit gpo expander, all gpo lines are controlled by writing
+          value into data register.
+ 
  endif

diff --combined drivers/gpio/Makefile
index 44f0153,b2e78b0..b39dde1
--- 1/drivers/gpio/Makefile
--- 2/drivers/gpio/Makefile
+++ b/drivers/gpio/Makefile
@@@ -12,7 -12,6 +12,7 @@@ obj-$(CONFIG_$(SPL_TPL_)DM_GPIO) += gpi
  
  obj-$(CONFIG_$(SPL_)DM_PCA953X)       += pca953x_gpio.o
  
 +obj-$(CONFIG_ASPEED_GPIO)     += gpio-aspeed.o
  obj-$(CONFIG_AT91_GPIO)       += at91_gpio.o
  obj-$(CONFIG_ATMEL_PIO4)      += atmel_pio4.o
  obj-$(CONFIG_BCM6345_GPIO)    += bcm6345_gpio.o
@@@ -73,3 -72,4 +73,4 @@@ obj-$(CONFIG_NOMADIK_GPIO)    += nmk_gpio.
  obj-$(CONFIG_MAX7320_GPIO)    += max7320_gpio.o
  obj-$(CONFIG_SL28CPLD_GPIO)   += sl28cpld-gpio.o
  obj-$(CONFIG_ZYNQMP_GPIO_MODEPIN)     += zynqmp_gpio_modepin.o
+ obj-$(CONFIG_SLG7XL45106_I2C_GPO)     += gpio_slg7xl45106.o