Skip to content

Commit

Permalink
Merge tag 'aspeed-6.14-devicetree' of https://git.kernel.org/pub/scm/…
Browse files Browse the repository at this point in the history
…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>
  • Loading branch information
Arnd Bergmann committed Jan 23, 2025
2 parents d672510 + 3540adc commit 3c9690f
Show file tree
Hide file tree
Showing 17 changed files with 8,802 additions and 421 deletions.
2 changes: 2 additions & 0 deletions Documentation/devicetree/bindings/arm/aspeed/aspeed.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -74,6 +74,7 @@ properties:
- description: AST2600 based boards
items:
- enum:
- ampere,mtjefferson-bmc
- ampere,mtmitchell-bmc
- aspeed,ast2600-evb
- aspeed,ast2600-evb-a1
Expand All @@ -91,6 +92,7 @@ properties:
- ibm,everest-bmc
- ibm,fuji-bmc
- ibm,rainier-bmc
- ibm,sbp1-bmc
- ibm,system1-bmc
- ibm,tacoma-bmc
- inventec,starscream-bmc
Expand Down
2 changes: 2 additions & 0 deletions arch/arm/boot/dts/aspeed/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ dtb-$(CONFIG_ARCH_ASPEED) += \
aspeed-bmc-amd-daytonax.dtb \
aspeed-bmc-amd-ethanolx.dtb \
aspeed-bmc-ampere-mtjade.dtb \
aspeed-bmc-ampere-mtjefferson.dtb \
aspeed-bmc-ampere-mtmitchell.dtb \
aspeed-bmc-arm-stardragon4800-rep2.dtb \
aspeed-bmc-asrock-e3c246d4i.dtb \
Expand Down Expand Up @@ -40,6 +41,7 @@ dtb-$(CONFIG_ARCH_ASPEED) += \
aspeed-bmc-ibm-rainier.dtb \
aspeed-bmc-ibm-rainier-1s4u.dtb \
aspeed-bmc-ibm-rainier-4u.dtb \
aspeed-bmc-ibm-sbp1.dtb \
aspeed-bmc-ibm-system1.dtb \
aspeed-bmc-intel-s2600wf.dtb \
aspeed-bmc-inspur-fp5280g2.dtb \
Expand Down
Loading

0 comments on commit 3c9690f

Please sign in to comment.