diff options
author | Arnd Bergmann <arnd@arndb.de> | 2019-09-03 16:01:58 +0200 |
---|---|---|
committer | Arnd Bergmann <arnd@arndb.de> | 2019-09-03 16:01:59 +0200 |
commit | 48dd4cf01f90d513851197f0dd2c60da19a3809c (patch) | |
tree | 6474f0dea19d81f0b779ab776891ab66e3333c8c /arch/arm/boot/dts/Makefile | |
parent | af6ba9d2d6501575780d0ea51579ec4f0a3a4bb1 (diff) | |
parent | 49b0f3be0b86292eed6f6aedadf4252131d9c111 (diff) | |
download | linux-48dd4cf01f90d513851197f0dd2c60da19a3809c.tar.bz2 |
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>
Diffstat (limited to 'arch/arm/boot/dts/Makefile')
-rw-r--r-- | arch/arm/boot/dts/Makefile | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile index a3627bda7738..a6373026a154 100644 --- a/arch/arm/boot/dts/Makefile +++ b/arch/arm/boot/dts/Makefile @@ -1276,13 +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 \ |