From: Arnd Bergmann <arnd@arndb.de>
Date: Tue, 3 Sep 2019 14:01:58 +0000 (+0200)
Subject: Merge tag 'aspeed-5.4-devicetree' of git://git.kernel.org/pub/scm/linux/kernel/git... 
X-Git-Tag: v5.4-rc1~184^2~18
X-Git-Url: https://repo.jachan.dev/linux.git/commitdiff_plain/48dd4cf01f90d513851197f0dd2c60da19a3809c?hp=-c

Merge tag 'aspeed-5.4-devicetree' of git://git.kernel.org/pub/scm/linux/kernel/git/joel/aspeed into arm/dt

ASPEED device tree updates for 5.4

New machines:

 - Facebook Wedge100, Wedge40 and Minipack
 - Lenovo Hr855xg2
 - Wistron Mihawk

There's a few other updates, notably some changes to to use the newly
added SDHCI driver.

* tag 'aspeed-5.4-devicetree' of git://git.kernel.org/pub/scm/linux/kernel/git/joel/aspeed:
  ARM: dts: aspeed: swift: Add eMMC device
  ARM: dts: aspeed: Enable first MMC slot on AST2500 EVB
  ARM: dts: aspeed: Describe SD controllers
  ARM: dts: aspeed: Add Mihawk BMC platform
  ARM: dts: aspeed: fp5280g2: Fix power supply address
  ARM: dts: aspeed: tiogapass: Add Riser card
  ARM: dts: aspeed: tiogapass: Move battery sensor
  ARM: dts: aspeed: Add Facebook Wedge100 BMC
  ARM: dts: aspeed: Add Facebook Wedge40 BMC
  ARM: dts: aspeed: swift: Fix FSI GPIOs
  ARM: dts: aspeed: Add SGPM pinmux
  ARM: dts: aspeed: tiogapass: Add VR devices
  ARM: dts: aspeed: Add Lenovo Hr855xg2 BMC
  ARM: dts: aspeed: Add Facebook Minipack BMC

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

48dd4cf01f90d513851197f0dd2c60da19a3809c
diff --combined arch/arm/boot/dts/Makefile
index a3627bda7738,402e593888da..a6373026a154
--- a/arch/arm/boot/dts/Makefile
+++ b/arch/arm/boot/dts/Makefile
@@@ -905,7 -905,6 +905,7 @@@ dtb-$(CONFIG_ARCH_ROCKCHIP) += 
  	rk3188-radxarock.dtb \
  	rk3228-evb.dtb \
  	rk3229-evb.dtb \
 +	rk3229-xms6.dtb \
  	rk3288-evb-act8846.dtb \
  	rk3288-evb-rk808.dtb \
  	rk3288-fennec.dtb \
@@@ -920,7 -919,6 +920,7 @@@
  	rk3288-tinker.dtb \
  	rk3288-tinker-s.dtb \
  	rk3288-veyron-brain.dtb \
 +	rk3288-veyron-fievel.dtb \
  	rk3288-veyron-jaq.dtb \
  	rk3288-veyron-jerry.dtb \
  	rk3288-veyron-mickey.dtb \
@@@ -928,7 -926,6 +928,7 @@@
  	rk3288-veyron-minnie.dtb \
  	rk3288-veyron-pinky.dtb \
  	rk3288-veyron-speedy.dtb \
 +	rk3288-veyron-tiger.dtb \
  	rk3288-vyasa.dtb
  dtb-$(CONFIG_ARCH_S3C24XX) += \
  	s3c2416-smdk2416.dtb
@@@ -1117,7 -1114,6 +1117,7 @@@ dtb-$(CONFIG_MACH_SUN8I) += 
  	sun8i-r16-nintendo-super-nes-classic.dtb \
  	sun8i-r16-parrot.dtb \
  	sun8i-r40-bananapi-m2-ultra.dtb \
 +	sun8i-s3-lichee-zero-plus.dtb \
  	sun8i-t3-cqa3t-bv3.dtb \
  	sun8i-v3s-licheepi-zero.dtb \
  	sun8i-v3s-licheepi-zero-dock.dtb \
@@@ -1266,7 -1262,6 +1266,7 @@@ dtb-$(CONFIG_ARCH_MEDIATEK) += 
  	mt7623a-rfb-nand.dtb \
  	mt7623n-rfb-emmc.dtb \
  	mt7623n-bananapi-bpi-r2.dtb \
 +	mt7629-rfb.dtb \
  	mt8127-moose.dtb \
  	mt8135-evbp1.dtb
  dtb-$(CONFIG_ARCH_MILBEAUT) += milbeaut-m10v-evb.dtb
@@@ -1276,13 -1271,18 +1276,18 @@@ dtb-$(CONFIG_ARCH_ASPEED) += 
  	aspeed-bmc-arm-centriq2400-rep.dtb \
  	aspeed-bmc-arm-stardragon4800-rep2.dtb \
  	aspeed-bmc-facebook-cmm.dtb \
+ 	aspeed-bmc-facebook-minipack.dtb \
  	aspeed-bmc-facebook-tiogapass.dtb \
+ 	aspeed-bmc-facebook-wedge40.dtb \
+ 	aspeed-bmc-facebook-wedge100.dtb \
  	aspeed-bmc-facebook-yamp.dtb \
  	aspeed-bmc-intel-s2600wf.dtb \
  	aspeed-bmc-inspur-fp5280g2.dtb \
  	aspeed-bmc-lenovo-hr630.dtb \
+ 	aspeed-bmc-lenovo-hr855xg2.dtb \
  	aspeed-bmc-microsoft-olympus.dtb \
  	aspeed-bmc-opp-lanyang.dtb \
+ 	aspeed-bmc-opp-mihawk.dtb \
  	aspeed-bmc-opp-palmetto.dtb \
  	aspeed-bmc-opp-romulus.dtb \
  	aspeed-bmc-opp-swift.dtb \