diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2022-05-30 11:59:41 +0300 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2022-05-30 11:59:42 +0300 |
| commit | 725523dd3634f960c504ed3b64b00687734f8c3d (patch) | |
| tree | f896d61260ed546d6b25b84ff6af5198efdc9137 /arch/arm/boot/dts/Makefile | |
| parent | 8a1e75c53c7a514dbd4f3c61ceb6f6d7d11dfd6d (diff) | |
| parent | 8dc7aa0a7246ad0f718d91d09b4d48460508627b (diff) | |
| download | linux-725523dd3634f960c504ed3b64b00687734f8c3d.tar.xz | |
Merge tag 'aspeed-5.19-devicetree' of git://git.kernel.org/pub/scm/linux/kernel/git/joel/bmc into arm/late
ASPEED device tree updates for 5.19
- New machine:
* Nuvia's DC-SCM BMC
- Enable AST2600 GFX, the BMC-driven graphics device
- Add a bunch of devices for the AST2600 EVB
- Updates to the AST2600 Bletchley machine
- Backwards compatible changes to support the new spi-mem based SPI NOR
driver
* tag 'aspeed-5.19-devicetree' of git://git.kernel.org/pub/scm/linux/kernel/git/joel/bmc:
ARM: dts: aspeed: ast2600-evb: Enable GFX device
ARM: dts: aspeed: Add GFX node to AST2600
ARM: dts: aspeed: ast2600-evb: Enable virtual hub
ARM: dts: aspeed: ast2600-evb: Enable video engine
ARM: dts: aspeed: everest, rainier: Add power-ffs-sync-history GPIO
ARM: dts: aspeed: Add Nuvia DC-SCM BMC
ARM: dts: aspeed: bletchley: add sample averaging for ADM1278
ARM: dts: aspeed: bletchley: add eeprom node on each sled
ARM: dts: aspeed: bletchley: add pca9536 node on each sled
ARM: dts: aspeed: bletchley: update gpio0 line names
ARM: dts: aspeed: bletchley: Enable mdio0 bus
ARM: dts: aspeed: bletchley: switch spi2 driver to aspeed-smc
ARM: dts: aspeed: bletchley: enable ehci0 device node
ARM: dts: aspeed: Add USB2.0 device controller node
ARM: dts: aspeed-g4: Set spi-max-frequency for all flashes
ARM: dts: aspeed: Enable Dual SPI RX transfers
ARM: dts: aspeed: Adjust "reg" property of FMC/SPI controllers
ARM: dts: aspeed: ast2600-evb: Enable RX delay for MAC0/MAC1
Link: https://lore.kernel.org/r/CACPK8XfUmFxU8Y6C+aZ2+=dT7=fCfs2=2_aYqyRjoXCoeQaUWQ@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 75269ec24834..184899808ee7 100644 --- a/arch/arm/boot/dts/Makefile +++ b/arch/arm/boot/dts/Makefile @@ -1586,6 +1586,7 @@ dtb-$(CONFIG_ARCH_ASPEED) += \ aspeed-bmc-lenovo-hr630.dtb \ aspeed-bmc-lenovo-hr855xg2.dtb \ aspeed-bmc-microsoft-olympus.dtb \ + aspeed-bmc-nuvia-dc-scm.dtb \ aspeed-bmc-opp-lanyang.dtb \ aspeed-bmc-opp-mihawk.dtb \ aspeed-bmc-opp-mowgli.dtb \ |