Merge tag 'aspeed-5.12-devicetree' of git://git.kernel.org/pub/scm/linux/kernel/git...

ASPEED device tree updates for 5.12

 - New machines

  * Ampere Mt. Jade, an AST2500 BMC for an x86 server
  * IBM Everest, an AST2600 BMC for a Power10 server
  * Supermicro x11spi, an AST2500 BMC for an ARM server

 - AST2600 eMMC clock phase configuration

 - Proper clock support for LPC snoop

 - Misc updates to ethanolx, mowgli, ast2600evb, g220a, and rainier

* tag 'aspeed-5.12-devicetree' of git://git.kernel.org/pub/scm/linux/kernel/git/joel/aspeed:
  ARM: dts: aspeed: ast2600evb: Add enable ehci and uhci
  ARM: dts: aspeed: mowgli: Add i2c rtc device
  ARM: dts: aspeed: amd-ethanolx: Enable secondary LPC snooping address
  ARM: dts: aspeed: Add Everest BMC machine
  ARM: dts: aspeed: inspur-fp5280g2: Add ipsps1 driver
  ARM: dts: aspeed: inspur-fp5280g2: Add GPIO line names
  ARM: dts: aspeed: Add Supermicro x11spi BMC machine
  ARM: dts: aspeed: g220a: Fix some gpio
  ARM: dts: aspeed: g220a: Enable ipmb
  ARM: dts: aspeed: rainier: Add eMMC clock phase compensation
  ARM: dts: aspeed: Add LCLK to lpc-snoop
  ARM: dts: aspeed: Add device tree for Ampere's Mt. Jade BMC

Link: https://lore.kernel.org/r/CACPK8XfQgGch5bK3YD0La+CE2L5DxVa1MNw6m1fc40j0w7e9Tw@mail.gmail.com
Signed-off-by: Arnd Bergmann <arnd@arndb.de>

diff --combined arch/arm/boot/dts/Makefile
index aca8a00,17412dc..bbb09ce
--- 1/arch/arm/boot/dts/Makefile
--- 2/arch/arm/boot/dts/Makefile
+++ b/arch/arm/boot/dts/Makefile
@@@ -465,9 -465,6 +465,9 @@@ dtb-$(CONFIG_SOC_IMX6Q) += 
        imx6dl-pico-hobbit.dtb \
        imx6dl-pico-nymph.dtb \
        imx6dl-pico-pi.dtb \
 +      imx6dl-plybas.dtb \
 +      imx6dl-plym2m.dtb \
 +      imx6dl-prtmvt.dtb \
        imx6dl-prtrvt.dtb \
        imx6dl-prtvt7.dtb \
        imx6dl-rex-basic.dtb \
@@@ -490,8 -487,6 +490,8 @@@
        imx6dl-tx6u-811x.dtb \
        imx6dl-tx6u-81xx-mb7.dtb \
        imx6dl-udoo.dtb \
 +      imx6dl-victgo.dtb \
 +      imx6dl-vicut1.dtb \
        imx6dl-wandboard.dtb \
        imx6dl-wandboard-revb1.dtb \
        imx6dl-wandboard-revd1.dtb \
@@@ -585,7 -580,6 +585,7 @@@
        imx6q-udoo.dtb \
        imx6q-utilite-pro.dtb \
        imx6q-var-dt6customboard.dtb \
 +      imx6q-vicut1.dtb \
        imx6q-wandboard.dtb \
        imx6q-wandboard-revb1.dtb \
        imx6q-wandboard-revd1.dtb \
@@@ -600,7 -594,6 +600,7 @@@
        imx6qp-tx6qp-8037-mb7.dtb \
        imx6qp-tx6qp-8137.dtb \
        imx6qp-tx6qp-8137-mb7.dtb \
 +      imx6qp-vicutp.dtb \
        imx6qp-wandboard-revd1.dtb \
        imx6qp-zii-rdu2.dtb
  dtb-$(CONFIG_SOC_IMX6SL) += \
@@@ -638,7 -631,6 +638,7 @@@ dtb-$(CONFIG_SOC_IMX6UL) += 
        imx6ul-pico-pi.dtb \
        imx6ul-phytec-segin-ff-rdk-emmc.dtb \
        imx6ul-phytec-segin-ff-rdk-nand.dtb \
 +      imx6ul-prti6g.dtb \
        imx6ul-tx6ul-0010.dtb \
        imx6ul-tx6ul-0011.dtb \
        imx6ul-tx6ul-mainboard.dtb \
@@@ -825,7 -817,6 +825,7 @@@ dtb-$(CONFIG_SOC_AM33XX) += 
        am335x-lxm.dtb \
        am335x-moxa-uc-2101.dtb \
        am335x-moxa-uc-8100-me-t.dtb \
 +      am335x-myirtech-myd.dtb \
        am335x-nano.dtb \
        am335x-netcan-plus-1xx.dtb \
        am335x-netcom-plus-2xx.dtb \
@@@ -921,9 -912,6 +921,9 @@@ dtb-$(CONFIG_ARCH_QCOM) += 
        qcom-apq8074-dragonboard.dtb \
        qcom-apq8084-ifc6540.dtb \
        qcom-apq8084-mtp.dtb \
 +      qcom-ipq4018-ap120c-ac.dtb \
 +      qcom-ipq4018-ap120c-ac-bit.dtb \
 +      qcom-ipq4018-jalapeno.dtb \
        qcom-ipq4019-ap.dk01.1-c1.dtb \
        qcom-ipq4019-ap.dk04.1-c1.dtb \
        qcom-ipq4019-ap.dk04.1-c3.dtb \
@@@ -939,8 -927,7 +939,8 @@@
        qcom-msm8974-sony-xperia-amami.dtb \
        qcom-msm8974-sony-xperia-castor.dtb \
        qcom-msm8974-sony-xperia-honami.dtb \
 -      qcom-mdm9615-wp8548-mangoh-green.dtb
 +      qcom-mdm9615-wp8548-mangoh-green.dtb \
 +      qcom-sdx55-mtp.dtb
  dtb-$(CONFIG_ARCH_RDA) += \
        rda8810pl-orangepi-2g-iot.dtb \
        rda8810pl-orangepi-i96.dtb
@@@ -1237,7 -1224,6 +1237,7 @@@ dtb-$(CONFIG_MACH_SUN8I) += 
        sun8i-s3-lichee-zero-plus.dtb \
        sun8i-s3-pinecube.dtb \
        sun8i-t3-cqa3t-bv3.dtb \
 +      sun8i-v3-sl631-imx179.dtb \
        sun8i-v3s-licheepi-zero.dtb \
        sun8i-v3s-licheepi-zero-dock.dtb \
        sun8i-v40-bananapi-m2-berry.dtb
@@@ -1292,7 -1278,6 +1292,7 @@@ dtb-$(CONFIG_ARCH_U8500) += 
        ste-hrefv60plus-tvk.dtb \
        ste-href520-tvk.dtb \
        ste-ux500-samsung-golden.dtb \
 +      ste-ux500-samsung-janice.dtb \
        ste-ux500-samsung-skomer.dtb
  dtb-$(CONFIG_ARCH_UNIPHIER) += \
        uniphier-ld4-ref.dtb \
@@@ -1418,6 -1403,7 +1418,7 @@@ dtb-$(CONFIG_ARCH_ASPEED) += 
        aspeed-ast2500-evb.dtb \
        aspeed-ast2600-evb.dtb \
        aspeed-bmc-amd-ethanolx.dtb \
+       aspeed-bmc-ampere-mtjade.dtb \
        aspeed-bmc-arm-centriq2400-rep.dtb \
        aspeed-bmc-arm-stardragon4800-rep2.dtb \
        aspeed-bmc-bytedance-g220a.dtb \
@@@ -1430,6 -1416,7 +1431,7 @@@
        aspeed-bmc-facebook-wedge400.dtb \
        aspeed-bmc-facebook-yamp.dtb \
        aspeed-bmc-facebook-yosemitev2.dtb \
+       aspeed-bmc-ibm-everest.dtb \
        aspeed-bmc-ibm-rainier.dtb \
        aspeed-bmc-ibm-rainier-4u.dtb \
        aspeed-bmc-intel-s2600wf.dtb \
@@@ -1449,4 -1436,5 +1451,5 @@@
        aspeed-bmc-opp-witherspoon.dtb \
        aspeed-bmc-opp-zaius.dtb \
        aspeed-bmc-portwell-neptune.dtb \
-       aspeed-bmc-quanta-q71l.dtb
+       aspeed-bmc-quanta-q71l.dtb \
+       aspeed-bmc-supermicro-x11spi.dtb