diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2021-12-22 19:29:44 +0300 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2021-12-22 19:29:55 +0300 |
| commit | d8db5d8a012b04d594d23eeca5430fb9298ea471 (patch) | |
| tree | f1f61fd543a49493afb459ba071fb867a4c50427 /arch/arm/boot/dts/Makefile | |
| parent | 862d7e5434154109c644cf2d28e3b94ab436263c (diff) | |
| parent | 45cd8bbaaa18ab1c4f4387529db72b33be463197 (diff) | |
| download | linux-d8db5d8a012b04d594d23eeca5430fb9298ea471.tar.xz | |
Merge tag 'aspeed-5.17-devicetree' of git://git.kernel.org/pub/scm/linux/kernel/git/joel/bmc into arm/dt
ASPEED device tree updates for 5.17
- New machines:
* TYAN S8036 AST2500 BMC
* Facebook Bletchley AST2600 BMC
* Yadro VEGMAN series of AST2500 BMC for x86 servers
- LPC clock additions, to fix long standing missed irq on boot issue
- Secure boot controller description for AST2600
- Alternate chip flash layout, used by Bytedance's G220A
- Various additions to Rainier, Everest, S7106
* tag 'aspeed-5.17-devicetree' of git://git.kernel.org/pub/scm/linux/kernel/git/joel/bmc:
ARM: dts: aspeed: add LCLK setting into LPC KCS nodes
dt-bindings: ipmi: bt-bmc: add 'clocks' as a required property
ARM: dts: aspeed: add LCLK setting into LPC IBT node
ARM: dts: aspeed: p10: Add TPM device
ARM: dts: aspeed: p10: Enable USB host ports
ARM: dts: aspeed: Add TYAN S8036 BMC machine
ARM: dts: aspeed: tyan-s7106: Add uart_routing and fix vuart config
ARM: dts: aspeed: Adding Facebook Bletchley BMC
ARM: dts: aspeed: g220a: Enable secondary flash
ARM: dts: Add openbmc-flash-layout-64-alt.dtsi
ARM: dts: aspeed: Add secure boot controller node
dt-bindings: aspeed: Add Secure Boot Controller bindings
ARM: dts: aspeed: add device tree for YADRO VEGMAN BMC
dt-bindings: vendor-prefixes: add YADRO
ARM: dts: aspeed: mtjade: Add uefi partition
ARM: dts: aspeed: mtjade: Add I2C buses for NVMe devices
ARM: dts: aspeed: tyan-s7106: Update nct7802 config
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'arch/arm/boot/dts/Makefile')
| -rw-r--r-- | arch/arm/boot/dts/Makefile | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile index a6ec7928eda6..235ad559acb2 100644 --- a/arch/arm/boot/dts/Makefile +++ b/arch/arm/boot/dts/Makefile @@ -1506,6 +1506,7 @@ dtb-$(CONFIG_ARCH_ASPEED) += \ aspeed-bmc-arm-stardragon4800-rep2.dtb \ aspeed-bmc-asrock-e3c246d4i.dtb \ aspeed-bmc-bytedance-g220a.dtb \ + aspeed-bmc-facebook-bletchley.dtb \ aspeed-bmc-facebook-cloudripper.dtb \ aspeed-bmc-facebook-cmm.dtb \ aspeed-bmc-facebook-elbert.dtb \ @@ -1543,4 +1544,8 @@ dtb-$(CONFIG_ARCH_ASPEED) += \ aspeed-bmc-quanta-q71l.dtb \ aspeed-bmc-supermicro-x11spi.dtb \ aspeed-bmc-inventec-transformers.dtb \ - aspeed-bmc-tyan-s7106.dtb + aspeed-bmc-tyan-s7106.dtb \ + aspeed-bmc-tyan-s8036.dtb \ + aspeed-bmc-vegman-n110.dtb \ + aspeed-bmc-vegman-rx20.dtb \ + aspeed-bmc-vegman-sx20.dtb |