Skip to content

Commit 3c9690f

Browse files
committed
Merge tag 'aspeed-6.14-devicetree' of https://git.kernel.org/pub/scm/linux/kernel/git/joel/bmc into soc/dt
ASPEED device tree updates for 6.14 - New machines * IBM SPB1 AST2600 BMC machine, a Sapphire Rapids x86 server * Ampre Mt Jefferson AST2600 BMC - Updates to mtmitchell, rainier, blueridge, everest, fuji, system1, harma, catalina and minerva - A big rework of yosemite4 * tag 'aspeed-6.14-devicetree' of https://git.kernel.org/pub/scm/linux/kernel/git/joel/bmc: (55 commits) ARM: dts: aspeed: yosemite4: adjust secondary flash name ARM: dts: aspeed: system1: Use crps PSU driver ARM: dts: aspeed: minerva: add second source RTC ARM: dts: aspeed: minerva: add bmc ready led setting ARM: dts: aspeed: minerva: add i/o expanders on each FCB ARM: dts: aspeed: minerva: add i/o expanders on bus 0 ARM: dts: aspeed: catalina: remove interrupt of GPIOB4 form all IOEXP ARM: dts: aspeed: catalina: revise ltc4287 shunt-resistor value arm: dts: aspeed: Blueridge and Rainer: Add VRM presence GPIOs ARM: dts: aspeed: Blueridge and Fuji: Fix LED node names arm: dts: aspeed: Everest and Fuji: Add VRM presence gpio expander ARM: dts: aspeed: sbp1: IBM sbp1 BMC board dt-bindings: arm: aspeed: add IBM SBP1 board ARM: dts: aspeed: Add device tree for Ampere's Mt. Jefferson BMC dt-bindings: arm: aspeed: add Mt. Jefferson board ARM: dts: aspeed: yosemite4: Add i2c-mux for ADC monitor on Spider Board ARM: dts: aspeed: yosemite4: Revise adc128d818 adc mode on Fan Boards ARM: dts: aspeed: yosemite4: Change the address of Fan IC on fan boards ARM: dts: aspeed: yosemite4: Revise address of i2c-mux for two fan boards ARM: dts: aspeed: yosemite4: correct the compatible string for max31790 ... Link: https://lore.kernel.org/r/CACPK8Xe8yZLXzEQPp=1D2f0TsKA7hBZG=pHHW6U51FMpp_BiRQ@mail.gmail.com Signed-off-by: Arnd Bergmann <arnd@arndb.de>
2 parents d672510 + 3540adc commit 3c9690f

17 files changed

+8802
-421
lines changed

Documentation/devicetree/bindings/arm/aspeed/aspeed.yaml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -74,6 +74,7 @@ properties:
7474
- description: AST2600 based boards
7575
items:
7676
- enum:
77+
- ampere,mtjefferson-bmc
7778
- ampere,mtmitchell-bmc
7879
- aspeed,ast2600-evb
7980
- aspeed,ast2600-evb-a1
@@ -91,6 +92,7 @@ properties:
9192
- ibm,everest-bmc
9293
- ibm,fuji-bmc
9394
- ibm,rainier-bmc
95+
- ibm,sbp1-bmc
9496
- ibm,system1-bmc
9597
- ibm,tacoma-bmc
9698
- inventec,starscream-bmc

arch/arm/boot/dts/aspeed/Makefile

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ dtb-$(CONFIG_ARCH_ASPEED) += \
66
aspeed-bmc-amd-daytonax.dtb \
77
aspeed-bmc-amd-ethanolx.dtb \
88
aspeed-bmc-ampere-mtjade.dtb \
9+
aspeed-bmc-ampere-mtjefferson.dtb \
910
aspeed-bmc-ampere-mtmitchell.dtb \
1011
aspeed-bmc-arm-stardragon4800-rep2.dtb \
1112
aspeed-bmc-asrock-e3c246d4i.dtb \
@@ -40,6 +41,7 @@ dtb-$(CONFIG_ARCH_ASPEED) += \
4041
aspeed-bmc-ibm-rainier.dtb \
4142
aspeed-bmc-ibm-rainier-1s4u.dtb \
4243
aspeed-bmc-ibm-rainier-4u.dtb \
44+
aspeed-bmc-ibm-sbp1.dtb \
4345
aspeed-bmc-ibm-system1.dtb \
4446
aspeed-bmc-intel-s2600wf.dtb \
4547
aspeed-bmc-inspur-fp5280g2.dtb \

0 commit comments

Comments
 (0)