diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2023-02-09 13:57:06 +0100 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2023-02-09 13:57:08 +0100 |
| commit | 153927e6f6c9e14bf167538ffaba315559e8a342 (patch) | |
| tree | 7b5d4ba58eef91bb734f37c0f15dab2f3b91b712 /arch/arm/boot/dts/Makefile | |
| parent | cfd5bdf3e98e3d21d7f57ad0b76001aa1ab78d66 (diff) | |
| parent | 1480bcf074d34e754990204240f8473cdbef0072 (diff) | |
Merge tag 'aspeed-6.3-devicetree' of git://git.kernel.org/pub/scm/linux/kernel/git/joel/bmc into arm/dt
ASPEED device tree updates for 6.3
- New machines
* Ufispace NCPLite AST2600 BMC
* Facebook Greatlakes AST2600 BMC
- Updates for ethanolx, bletchley and tyan s8036
* tag 'aspeed-6.3-devicetree' of git://git.kernel.org/pub/scm/linux/kernel/git/joel/bmc:
ARM: dts: aspeed: p10bmc: Enable UART2
ARM: dts: aspeed: Add device tree for Ufispace NCPLite BMC
dt-bindings: arm: aspeed: document Ufispace NCPLite BMC
dt-bindings: vendor-prefixes: Add prefix for Ufi Space
arm: dts: aspeed: tyan s8036: Enable kcs interrupts
ARM: dts: aspeed: bletchley: Enable wdtrst1
ARM: dts: aspeed: bletchley: Rename flash1 label
ARM: dts: aspeed: ethanolx: Add BIOS flash chip
ARM: dts: aspeed: ethanolx: Enable CTS/RTS pins on UART1
ARM: dts: aspeed: ethanolx: Add label for the master partition
ARM: dts: aspeed: ethanolx: Correct EEPROM device name
ARM: dts: aspeed: ethanolx: Enable VUART
ARM: dts: aspeed: greatlakes: Add Facebook greatlakes (AST2600) BMC
dt-bindings: arm: aspeed: add Facebook Greatlakes board
Link: https://lore.kernel.org/r/CACPK8XdbffU5yRSZF-zR2xv-+6aJK+hEXP8TOkW=SvS+nNTGxg@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 03569e62db6c..8a18ac1a3c31 100644 --- a/arch/arm/boot/dts/Makefile +++ b/arch/arm/boot/dts/Makefile @@ -1612,6 +1612,7 @@ dtb-$(CONFIG_ARCH_ASPEED) += \ aspeed-bmc-facebook-elbert.dtb \ aspeed-bmc-facebook-fuji.dtb \ aspeed-bmc-facebook-galaxy100.dtb \ + aspeed-bmc-facebook-greatlakes.dtb \ aspeed-bmc-facebook-minipack.dtb \ aspeed-bmc-facebook-tiogapass.dtb \ aspeed-bmc-facebook-wedge40.dtb \ @@ -1648,6 +1649,7 @@ dtb-$(CONFIG_ARCH_ASPEED) += \ aspeed-bmc-inventec-transformers.dtb \ aspeed-bmc-tyan-s7106.dtb \ aspeed-bmc-tyan-s8036.dtb \ + aspeed-bmc-ufispace-ncplite.dtb \ aspeed-bmc-vegman-n110.dtb \ aspeed-bmc-vegman-rx20.dtb \ aspeed-bmc-vegman-sx20.dtb |