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

ASPEED device tree updates for 4.18

New hardware support added:

  USB controllers for AST2400 and AST2500 which have drivers
  merged in 4.18.

  Hardware random number generator which we made enhancements to many
  releases ago, but never added the device tree parts.

  Misc changes to support watchdog and gpio-keys features used by
  OpenBMC systems.

New machines:

 Intel S2600WF, an Intel platform family with an ASPEED AST2500 BMC.

 Inventec Lanyang, a Power 9 platform with AST2500.

 Portwell Neptune, a x86 server development kit with an AST2500.

* tag 'aspeed-4.18-devicetree' of git://git.kernel.org/pub/scm/linux/kernel/git/joel/aspeed:
  ARM: dts: Aspeed: Enable USB ports on eval board.
  ARM: dts: Add Aspeed SoC USB controllers to device-tree
  ARM: dts: aspeed: Add S2600WF BMC Machine
  ARM: dts: aspeed: Add Inventec Lanyang BMC
  ARM: dts: aspeed: Add Portwell Neptune machine
  ARM: dts: aspeed: witherspoon: Set alternate boot
  ARM: dts: aspeed: witherspoon: Add gpio keys for power supply presence
  ARM: dts: aspeed: witherspoon: Enable checkstop and cooling gpio keys
  ARM: dts: aspeed: zaius: Add pcie-e2b-present gpio key
  ARM: dts: aspeed: romulus: Add id-button gpio key
  ARM: dts: aspeed: Describe random number device

Signed-off-by: Olof Johansson <olof@lixom.net>

diff --combined Documentation/devicetree/bindings/vendor-prefixes.txt
index cd93661954e6f9f39813f40e8fc02a1867397030,17750cde43cec46d37b92f9f3a710831e6c7013c..883d72dc9027a60deed15e9c58887beb816279d2
--- 1/Documentation/devicetree/bindings/vendor-prefixes.txt
--- 2/Documentation/devicetree/bindings/vendor-prefixes.txt
+++ b/Documentation/devicetree/bindings/vendor-prefixes.txt
@@@ -56,7 -56,6 +56,7 @@@ bosch Bosch Sensortec Gmb
  boundary      Boundary Devices Inc.
  brcm  Broadcom Corporation
  buffalo       Buffalo, Inc.
 +bticino Bticino International
  calxeda       Calxeda
  capella       Capella Microsystems, Inc
  cascoda       Cascoda, Ltd.
@@@ -183,7 -182,6 +183,7 @@@ karo       Ka-Ro electronics Gmb
  keithkoep     Keith & Koep GmbH
  keymile       Keymile GmbH
  khadas        Khadas
 +kiebackpeter    Kieback & Peter GmbH
  kinetic Kinetic Technologies
  kingnovel     Kingnovel Technology Co., Ltd.
  kosagi        Sutajio Ko-Usagi PTE Ltd.
@@@ -280,6 -278,7 +280,7 @@@ pine64     Pine6
  pixcir  PIXCIR MICROELECTRONICS Co., Ltd
  plathome      Plat'Home Co., Ltd.
  plda  PLDA
+ portwell      Portwell Inc.
  poslab        Poslab Technology Co., Ltd.
  powervr       PowerVR (deprecated, use img)
  probox2       PROBOX2 (by W2COMP Co., Ltd.)

diff --combined arch/arm/boot/dts/Makefile
index 99e641b3e436fe8c1ee2748cf69f0ad4d8061424,80a2c9ac0a1dd84204bc96cf0d2415d53d19f3c8..48897a569219834fda123d7c5456188f109df18c
--- 1/arch/arm/boot/dts/Makefile
--- 2/arch/arm/boot/dts/Makefile
+++ b/arch/arm/boot/dts/Makefile
@@@ -75,7 -75,6 +75,7 @@@ dtb-$(CONFIG_ARCH_BCM2835) += 
        bcm2835-rpi-a-plus.dtb \
        bcm2836-rpi-2-b.dtb \
        bcm2837-rpi-3-b.dtb \
 +      bcm2837-rpi-3-b-plus.dtb \
        bcm2835-rpi-zero.dtb \
        bcm2835-rpi-zero-w.dtb
  dtb-$(CONFIG_ARCH_BCM_5301X) += \
@@@ -103,10 -102,8 +103,10 @@@
        bcm47094-dlink-dir-885l.dtb \
        bcm47094-linksys-panamera.dtb \
        bcm47094-luxul-abr-4500.dtb \
 +      bcm47094-luxul-xap-1610.dtb \
        bcm47094-luxul-xbr-4500.dtb \
        bcm47094-luxul-xwr-3100.dtb \
 +      bcm47094-luxul-xwr-3150-v1.dtb \
        bcm47094-netgear-r8500.dtb \
        bcm94708.dtb \
        bcm94709.dtb \
@@@ -143,7 -140,6 +143,7 @@@ dtb-$(CONFIG_ARCH_BCM_NSP) += 
  dtb-$(CONFIG_ARCH_BERLIN) += \
        berlin2-sony-nsz-gs7.dtb \
        berlin2cd-google-chromecast.dtb \
 +      berlin2cd-valve-steamlink.dtb \
        berlin2q-marvell-dmp.dtb
  dtb-$(CONFIG_ARCH_BRCMSTB) += \
        bcm7445-bcm97445svmb.dtb
@@@ -194,6 -190,8 +194,6 @@@ dtb-$(CONFIG_ARCH_EXYNOS5) += 
        exynos5422-odroidxu3.dtb \
        exynos5422-odroidxu3-lite.dtb \
        exynos5422-odroidxu4.dtb \
 -      exynos5440-sd5v1.dtb \
 -      exynos5440-ssdk5440.dtb \
        exynos5800-peach-pi.dtb
  dtb-$(CONFIG_ARCH_GEMINI) += \
        gemini-dlink-dir-685.dtb \
@@@ -314,14 -312,14 +314,14 @@@ dtb-$(CONFIG_ARCH_NPCM7XX) += 
  dtb-$(CONFIG_MACH_MESON6) += \
        meson6-atv1200.dtb
  dtb-$(CONFIG_MACH_MESON8) += \
 -      meson8-minix-neo-x8.dtb
 +      meson8-minix-neo-x8.dtb \
 +      meson8b-mxq.dtb \
 +      meson8b-odroidc1.dtb \
 +      meson8m2-mxiii-plus.dtb
  dtb-$(CONFIG_ARCH_MMP) += \
        pxa168-aspenite.dtb \
        pxa910-dkb.dtb \
        mmp2-brownstone.dtb
 -dtb-$(CONFIG_MACH_MESON8B) += \
 -      meson8b-mxq.dtb \
 -      meson8b-odroidc1.dtb
  dtb-$(CONFIG_ARCH_MPS2) += \
        mps2-an385.dtb \
        mps2-an399.dtb
@@@ -401,7 -399,6 +401,7 @@@ dtb-$(CONFIG_SOC_IMX6Q) += 
        imx6dl-hummingboard2-som-v15.dtb \
        imx6dl-icore.dtb \
        imx6dl-icore-rqs.dtb \
 +      imx6dl-mamoj.dtb \
        imx6dl-nit6xlite.dtb \
        imx6dl-nitrogen6x.dtb \
        imx6dl-phytec-mira-rdk-nand.dtb \
@@@ -442,7 -439,6 +442,7 @@@
        imx6q-cubox-i-emmc-som-v15.dtb \
        imx6q-cubox-i-som-v15.dtb \
        imx6q-dfi-fs700-m60.dtb \
 +      imx6q-dhcom-pdk2.dtb \
        imx6q-display5-tianma-tm070-1280x768.dtb \
        imx6q-dmo-edmqmx6.dtb \
        imx6q-dms-ba16.dtb \
@@@ -467,11 -463,9 +467,11 @@@
        imx6q-hummingboard2-emmc-som-v15.dtb \
        imx6q-hummingboard2-som-v15.dtb \
        imx6q-icore.dtb \
 +      imx6q-icore-mipi.dtb \
        imx6q-icore-ofcap10.dtb \
        imx6q-icore-ofcap12.dtb \
        imx6q-icore-rqs.dtb \
 +      imx6q-kp-tpc.dtb \
        imx6q-marsboard.dtb \
        imx6q-mccmon6.dtb \
        imx6q-nitrogen6x.dtb \
@@@ -694,7 -688,6 +694,7 @@@ dtb-$(CONFIG_SOC_AM33XX) += 
        am335x-pdu001.dtb \
        am335x-pepper.dtb \
        am335x-phycore-rdk.dtb \
 +      am335x-pocketbeagle.dtb \
        am335x-shc.dtb \
        am335x-sbc-t335.dtb \
        am335x-sl50.dtb \
@@@ -966,7 -959,6 +966,7 @@@ dtb-$(CONFIG_MACH_SUN7I) += 
        sun7i-a20-m3.dtb \
        sun7i-a20-mk808c.dtb \
        sun7i-a20-olimex-som-evb.dtb \
 +      sun7i-a20-olimex-som-evb-emmc.dtb \
        sun7i-a20-olimex-som204-evb.dtb \
        sun7i-a20-olimex-som204-evb-emmc.dtb \
        sun7i-a20-olinuxino-lime.dtb \
@@@ -1000,9 -992,8 +1000,9 @@@ dtb-$(CONFIG_MACH_SUN8I) += 
        sun8i-a83t-bananapi-m3.dtb \
        sun8i-a83t-cubietruck-plus.dtb \
        sun8i-a83t-tbs-a711.dtb \
 -      sun8i-h2-plus-orangepi-r1.dtb \
        sun8i-h2-plus-bananapi-m2-zero.dtb \
 +      sun8i-h2-plus-libretech-all-h3-cc.dtb \
 +      sun8i-h2-plus-orangepi-r1.dtb \
        sun8i-h2-plus-orangepi-zero.dtb \
        sun8i-h3-bananapi-m2-plus.dtb \
        sun8i-h3-beelink-x2.dtb \
@@@ -1019,8 -1010,6 +1019,8 @@@
        sun8i-h3-orangepi-plus.dtb \
        sun8i-h3-orangepi-plus2e.dtb \
        sun8i-r16-bananapi-m2m.dtb \
 +      sun8i-r16-nintendo-nes-classic.dtb \
 +      sun8i-r16-nintendo-super-nes-classic.dtb \
        sun8i-r16-parrot.dtb \
        sun8i-r40-bananapi-m2-ultra.dtb \
        sun8i-v3s-licheepi-zero.dtb \
@@@ -1065,7 -1054,9 +1065,7 @@@ dtb-$(CONFIG_ARCH_U8500) += 
        ste-hrefprev60-stuib.dtb \
        ste-hrefprev60-tvk.dtb \
        ste-hrefv60plus-stuib.dtb \
 -      ste-hrefv60plus-tvk.dtb \
 -      ste-ccu8540.dtb \
 -      ste-ccu9540.dtb
 +      ste-hrefv60plus-tvk.dtb
  dtb-$(CONFIG_ARCH_UNIPHIER) += \
        uniphier-ld4-ref.dtb \
        uniphier-ld6b-ref.dtb \
@@@ -1159,9 -1150,6 +1159,9 @@@ dtb-$(CONFIG_ARCH_MEDIATEK) += 
        mt6580-evbp1.dtb \
        mt6589-aquaris5.dtb \
        mt6592-evb.dtb \
 +      mt7623a-rfb-emmc.dtb \
 +      mt7623a-rfb-nand.dtb \
 +      mt7623n-rfb-emmc.dtb \
        mt7623n-rfb-nand.dtb \
        mt7623n-bananapi-bpi-r2.dtb \
        mt8127-moose.dtb \
@@@ -1170,8 -1158,11 +1170,11 @@@ dtb-$(CONFIG_ARCH_ZX) += zx296702-ad1.d
  dtb-$(CONFIG_ARCH_ASPEED) += \
        aspeed-ast2500-evb.dtb \
        aspeed-bmc-arm-centriq2400-rep.dtb \
+       aspeed-bmc-intel-s2600wf.dtb \
+       aspeed-bmc-opp-lanyang.dtb \
        aspeed-bmc-opp-palmetto.dtb \
        aspeed-bmc-opp-romulus.dtb \
        aspeed-bmc-opp-witherspoon.dtb \
        aspeed-bmc-opp-zaius.dtb \
+       aspeed-bmc-portwell-neptune.dtb \
        aspeed-bmc-quanta-q71l.dtb