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

ASPEED device tree updates for 5.15

 - New machines

  * Facebook's Cloudripper
  * Facebook's Elbert
  * Facebook's Fuji

  All three carry the description of "Facebook's next generation switch
  platform with an AST2600 BMC integrated for health monitoring
  purpose."

  They share a 128 MB SPI NOR flash layout that is also used by some
  older platforms.

  * Inspur's NF5280M6, an x86 platform server with an AST2500-based BMC

 - SGPIO updates including AST2600 support

 - GPIO descriptions for the IBM AST2600 machines

 - Pinctrl fix

 - Updates to Facebook's AST2500 based machines

* tag 'aspeed-5.15-devicetree' of git://git.kernel.org/pub/scm/linux/kernel/git/joel/bmc: (23 commits)
  ARM: dts: aspeed: p10bmc: Add power control pins
  ARM: dts: aspeed: cloudripper: Add comments for "mdio1"
  ARM: dts: aspeed: minipack: Update flash partition table
  ARM: dts: aspeed: Add Facebook Fuji (AST2600) BMC
  ARM: dts: aspeed: Add Facebook Elbert (AST2600) BMC
  ARM: dts: aspeed: Add Facebook Cloudripper (AST2600) BMC
  ARM: dts: aspeed: Common dtsi for Facebook AST2600 Network BMCs
  ARM: dts: aspeed: wedge400: Use common flash layout
  ARM: dts: Add Facebook BMC 128MB flash layout
  ARM: dts: aspeed-g5: Remove ngpios from sgpio node.
  ARM: dts: aspeed-g6: Add SGPIO node.
  dt-bindings: aspeed-sgpio: Add ast2600 sgpio
  dt-bindings: aspeed-sgpio: Convert txt bindings to yaml.
  ARM: dts: aspeed: ast2500evb: Enable built in RTC
  ARM: dts: aspeed: tacoma: Add TPM reset GPIO
  ARM: dts: rainier, everest: Add TPM reset GPIO
  ARM: dts: aspeed: wedge100: Enable ADC channels
  ARM: dts: aspeed: galaxy100: Remove redundant ADC device
  ARM: dts: aspeed: wedge40: Remove redundant ADC device
  ARM: dts: aspeed: Enable ADC in Facebook AST2400 common dtsi
  ...

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

diff --combined arch/arm/boot/dts/Makefile
index 4ec89b9,079e7d9..7e09341
--- 1/arch/arm/boot/dts/Makefile
--- 2/arch/arm/boot/dts/Makefile
+++ b/arch/arm/boot/dts/Makefile
@@@ -74,8 -74,6 +74,8 @@@ dtb-$(CONFIG_SOC_SAM_V7) += 
        at91-sama5d4_xplained.dtb \
        at91-sama5d4ek.dtb \
        at91-vinco.dtb
 +dtb-$(CONFIG_SOC_SAMA7G5) += \
 +      at91-sama7g5ek.dtb
  dtb-$(CONFIG_ARCH_AXXIA) += \
        axm5516-amarillo.dtb
  dtb-$(CONFIG_ARCH_BCM2835) += \
@@@ -243,20 -241,8 +243,20 @@@ dtb-$(CONFIG_ARCH_INTEGRATOR) += 
        integratorcp.dtb
  dtb-$(CONFIG_ARCH_IXP4XX) += \
        intel-ixp42x-linksys-nslu2.dtb \
 +      intel-ixp42x-linksys-wrv54g.dtb \
 +      intel-ixp42x-freecom-fsg-3.dtb \
        intel-ixp42x-welltech-epbx100.dtb \
 -      intel-ixp43x-gateworks-gw2358.dtb
 +      intel-ixp42x-ixdp425.dtb \
 +      intel-ixp43x-kixrp435.dtb \
 +      intel-ixp46x-ixdp465.dtb \
 +      intel-ixp42x-adi-coyote.dtb \
 +      intel-ixp42x-ixdpg425.dtb \
 +      intel-ixp42x-iomega-nas100d.dtb \
 +      intel-ixp42x-dlink-dsm-g600.dtb \
 +      intel-ixp42x-gateworks-gw2348.dtb \
 +      intel-ixp43x-gateworks-gw2358.dtb \
 +      intel-ixp42x-netgear-wg302v2.dtb \
 +      intel-ixp42x-arcom-vulcan.dtb
  dtb-$(CONFIG_ARCH_KEYSTONE) += \
        keystone-k2hk-evm.dtb \
        keystone-k2l-evm.dtb \
@@@ -443,7 -429,6 +443,7 @@@ dtb-$(CONFIG_SOC_IMX6Q) += 
        imx6dl-cubox-i-emmc-som-v15.dtb \
        imx6dl-cubox-i-som-v15.dtb \
        imx6dl-dfi-fs700-m60.dtb \
 +      imx6dl-dhcom-picoitx.dtb \
        imx6dl-eckelmann-ci4x10.dtb \
        imx6dl-emcon-avari.dtb \
        imx6dl-gw51xx.dtb \
@@@ -490,9 -475,6 +490,9 @@@
        imx6dl-sabrelite.dtb \
        imx6dl-sabresd.dtb \
        imx6dl-savageboard.dtb \
 +      imx6dl-skov-revc-lt2.dtb \
 +      imx6dl-skov-revc-lt6.dtb \
 +      imx6dl-solidsense.dtb \
        imx6dl-ts4900.dtb \
        imx6dl-ts7970.dtb \
        imx6dl-tx6dl-comtft.dtb \
@@@ -593,10 -575,6 +593,10 @@@
        imx6q-sabresd.dtb \
        imx6q-savageboard.dtb \
        imx6q-sbc6x.dtb \
 +      imx6q-skov-revc-lt2.dtb \
 +      imx6q-skov-revc-lt6.dtb \
 +      imx6q-skov-reve-mi1010ait-1cp1.dtb \
 +      imx6q-solidsense.dtb \
        imx6q-tbs2910.dtb \
        imx6q-ts4900.dtb \
        imx6q-ts7970.dtb \
@@@ -629,8 -607,7 +629,8 @@@
        imx6qp-tx6qp-8137-mb7.dtb \
        imx6qp-vicutp.dtb \
        imx6qp-wandboard-revd1.dtb \
 -      imx6qp-zii-rdu2.dtb
 +      imx6qp-zii-rdu2.dtb \
 +      imx6s-dhcom-drc02.dtb
  dtb-$(CONFIG_SOC_IMX6SL) += \
        imx6sl-evk.dtb \
        imx6sl-tolino-shine2hd.dtb \
@@@ -866,7 -843,6 +866,7 @@@ dtb-$(CONFIG_SOC_AM33XX) += 
        am335x-pocketbeagle.dtb \
        am335x-regor-rdk.dtb \
        am335x-sancloud-bbe.dtb \
 +      am335x-sancloud-bbe-lite.dtb \
        am335x-shc.dtb \
        am335x-sbc-t335.dtb \
        am335x-sl50.dtb \
@@@ -957,7 -933,6 +957,7 @@@ dtb-$(CONFIG_ARCH_QCOM) += 
        qcom-ipq4019-ap.dk07.1-c2.dtb \
        qcom-ipq8064-ap148.dtb \
        qcom-ipq8064-rb3011.dtb \
 +      qcom-msm8226-samsung-s3ve3g.dtb \
        qcom-msm8660-surf.dtb \
        qcom-msm8960-cdp.dtb \
        qcom-msm8974-fairphone-fp2.dtb \
@@@ -1101,8 -1076,7 +1101,8 @@@ dtb-$(CONFIG_ARCH_STI) += 
        stih407-b2120.dtb \
        stih410-b2120.dtb \
        stih410-b2260.dtb \
 -      stih418-b2199.dtb
 +      stih418-b2199.dtb \
 +      stih418-b2264.dtb
  dtb-$(CONFIG_ARCH_STM32) += \
        stm32f429-disco.dtb \
        stm32f469-disco.dtb \
@@@ -1326,10 -1300,7 +1326,10 @@@ dtb-$(CONFIG_ARCH_U8500) += 
        ste-href520-tvk.dtb \
        ste-ux500-samsung-golden.dtb \
        ste-ux500-samsung-janice.dtb \
 -      ste-ux500-samsung-skomer.dtb
 +      ste-ux500-samsung-gavini.dtb \
 +      ste-ux500-samsung-codina.dtb \
 +      ste-ux500-samsung-skomer.dtb \
 +      ste-ux500-samsung-kyle.dtb
  dtb-$(CONFIG_ARCH_UNIPHIER) += \
        uniphier-ld4-ref.dtb \
        uniphier-ld6b-ref.dtb \
@@@ -1462,7 -1433,10 +1462,10 @@@ dtb-$(CONFIG_ARCH_ASPEED) += 
        aspeed-bmc-arm-stardragon4800-rep2.dtb \
        aspeed-bmc-asrock-e3c246d4i.dtb \
        aspeed-bmc-bytedance-g220a.dtb \
+       aspeed-bmc-facebook-cloudripper.dtb \
        aspeed-bmc-facebook-cmm.dtb \
+       aspeed-bmc-facebook-elbert.dtb \
+       aspeed-bmc-facebook-fuji.dtb \
        aspeed-bmc-facebook-galaxy100.dtb \
        aspeed-bmc-facebook-minipack.dtb \
        aspeed-bmc-facebook-tiogapass.dtb \
@@@ -1477,6 -1451,7 +1480,7 @@@
        aspeed-bmc-ibm-rainier-4u.dtb \
        aspeed-bmc-intel-s2600wf.dtb \
        aspeed-bmc-inspur-fp5280g2.dtb \
+       aspeed-bmc-inspur-nf5280m6.dtb \
        aspeed-bmc-lenovo-hr630.dtb \
        aspeed-bmc-lenovo-hr855xg2.dtb \
        aspeed-bmc-microsoft-olympus.dtb \