diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2022-09-28 22:28:47 +0200 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2022-09-28 22:28:47 +0200 |
| commit | a51278056107b1825886776b2bf96b14cfc03cab (patch) | |
| tree | 21df6faaa708fc6950fbf5fcfca7b53ef1876948 /arch/arm/boot/dts/Makefile | |
| parent | 286c1d1c3074bc6bfb5df1660f8ff1b56d210b19 (diff) | |
| parent | 73b4476562de2a26debc076801ca28148076c79f (diff) | |
| download | linux-a51278056107b1825886776b2bf96b14cfc03cab.tar.gz | |
Merge tag 'aspeed-6.1-devicetree' of git://git.kernel.org/pub/scm/linux/kernel/git/joel/bmc into arm/dt
ASPEED device tree updates for 6.1
- New machines
* AMD's DaytonaX AST2600 BMC, for the amd64 server
* Ampre's Mt. Mitchell AST2600 BMC, for the AmpereOne arm64 server
- Fixes and updates for bletchley, mtjade, yosemitev2 and the ast2600-evb
* tag 'aspeed-6.1-devicetree' of git://git.kernel.org/pub/scm/linux/kernel/git/joel/bmc:
ARM: dts: aspeed: ast2600-evb-a1: Add compatible
ARM: dts: aspeed: ast2600evb: Fix compatible string
ARM: dts: aspeed: ast2600-evb: Enable Quad SPI RX tranfers
ARM: dts: aspeed-g6: Enable more UART controllers
ARM: dts: aspeed: yosemitev2: Disable the EEPROM driver
ARM: dts: aspeed: Add AMD DaytonaX BMC
dt-bindings: arm: aspeed: document AMD DaytonaX
ARM: dts: aspeed: Yosemite V2: Enable OCP debug card
ARM: dts: aspeed: mtjade: Remove gpio-keys entries
ARM: dts: aspeed: Add device tree for Ampere's Mt. Mitchell BMC
dt-bindings: arm: aspeed: document Ampere Mt.Mitchell BMC compatibles
ARM: dts: aspeed: bletchley: Remove hdc1080 node
ARM: dts: aspeed: bletchley: Add USB debug card IPMB node
ARM: dts: aspeed: ast2600-evb: Update I2C devices
Link: https://lore.kernel.org/r/CACPK8Xepnci+f+7Pi1jtXod8Jmt+OnJYfDRENjiP-xDBQwFCVg@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 | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile index 1a718157d1a6..6aa7dc4db2fc 100644 --- a/arch/arm/boot/dts/Makefile +++ b/arch/arm/boot/dts/Makefile @@ -1580,8 +1580,10 @@ dtb-$(CONFIG_ARCH_ASPEED) += \ aspeed-ast2500-evb.dtb \ aspeed-ast2600-evb-a1.dtb \ aspeed-ast2600-evb.dtb \ + aspeed-bmc-amd-daytonax.dtb \ aspeed-bmc-amd-ethanolx.dtb \ aspeed-bmc-ampere-mtjade.dtb \ + aspeed-bmc-ampere-mtmitchell.dtb \ aspeed-bmc-arm-stardragon4800-rep2.dtb \ aspeed-bmc-asrock-e3c246d4i.dtb \ aspeed-bmc-asrock-romed8hm3.dtb \ |