diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2020-07-28 10:10:01 +0300 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2020-07-28 10:10:03 +0300 |
| commit | 73bf2131d057cdbebf5e79901f8017015ecbd3e6 (patch) | |
| tree | 6a18c09f3843bf545e07da555ecbdebbfe0976f8 /arch/arm/boot/dts/Makefile | |
| parent | 7fbdc6afd02b284441515beda0cde670fbae58a3 (diff) | |
| parent | 2c887638a5fa1ac5e2491ae911f50d554b604985 (diff) | |
| download | linux-73bf2131d057cdbebf5e79901f8017015ecbd3e6.tar.xz | |
Merge tag 'aspeed-5.9-devicetree' of git://git.kernel.org/pub/scm/linux/kernel/git/joel/aspeed into arm/dt
ASPEED device tree updates for 5.9
There is one new machine; AMD's EthanolX reference platform with an
AST2600 BMC.
Misc updates for Rainier, Tacoma, Wedge and Mihawk machines.
* tag 'aspeed-5.9-devicetree' of git://git.kernel.org/pub/scm/linux/kernel/git/joel/aspeed: (26 commits)
ARM: dts: Aspeed: tacoma: Enable EHCI controller
ARM: dts: aspeed: rainier: Enable EHCI controller
ARM: dts: aspeed: rainier: Switch OCCs to P10
ARM: dts: aspeed: rainier: Add FSI I2C masters
ARM: dts: aspeed: rainier: Add CFAM SPI controllers
ARM: dts: aspeed: rainier: Add I2C buses for NVMe use
ARM: dts: aspeed: Initial device tree for AMD EthanolX
ARM: dts: rainier: Describe GPIO mux on I2C3
ARM: dts: aspeed: wedge40: Enable pwm_tacho device
ARM: dts: aspeed: wedge40: Enable ADC device
ARM: dts: aspeed: wedge40: Disable unused i2c controllers
ARM: dts: aspeed: cmm: Fixup I2C tree
ARM: dts: aspeed: tacoma: Add CFAM reset GPIO
ARM: dts: aspeed: rainier: Add CFAM reset GPIO
ARM: dts: aspeed: tacoma: Fix gpio-key definitions
ARM: dts: rainier: Configure ball Y23 as GPIOP7 for MCLR_VPP
ARM: dts: aspeed: rainier: Add second cfam on the hub
ARM: dts: aspeed: rainier: Add line-name checkstop
ARM: dts: aspeed: tacoma: Remove checkstop gpio-key
ARM: dts: aspeed: tacoma: Enable XDMA engine
...
Link: https://lore.kernel.org/r/CACPK8Xf_Np7LtcDFhywi6Uk1EgUpb0pVVa+Lr9YEwBRjbjOKCQ@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 | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile index e71ff271fa63..8fa6b4be3c5c 100644 --- a/arch/arm/boot/dts/Makefile +++ b/arch/arm/boot/dts/Makefile @@ -1359,6 +1359,7 @@ dtb-$(CONFIG_ARCH_ZX) += zx296702-ad1.dtb dtb-$(CONFIG_ARCH_ASPEED) += \ aspeed-ast2500-evb.dtb \ aspeed-ast2600-evb.dtb \ + aspeed-bmc-amd-ethanolx.dtb \ aspeed-bmc-arm-centriq2400-rep.dtb \ aspeed-bmc-arm-stardragon4800-rep2.dtb \ aspeed-bmc-facebook-cmm.dtb \ |