diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2021-04-09 08:57:48 +0200 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2021-04-09 08:57:49 +0200 |
| commit | e3bbc53ac8827babb5001037883e4edd2068168d (patch) | |
| tree | 5439185ad8685959af1f9883f1b337327d638b86 /arch/arm/boot/dts/Makefile | |
| parent | d8fcfbf38fe168d55a1e73095f831a60e3e95b91 (diff) | |
| parent | ee33e2fb3d70267de00f7c0b09e7e3b309a686df (diff) | |
| download | linux-e3bbc53ac8827babb5001037883e4edd2068168d.tar.gz | |
Merge tag 'bmc-5.13-devicetree' of git://git.kernel.org/pub/scm/linux/kernel/git/joel/bmc into arm/dt
BMC device tree updates for 5.13
The ASPEED and Nuvoton pull request now comes as a combined BMC pull
request.
- New machines
* ASRock E3C246D4I, an AST2500 BMC for an Xeon E-2100/E-2200 mini-ITX
system
* Quanta GBS, an NPCM730 BMC for an x86 server
- Power10 BMC updates for Everest and Rainier
- GPIO line names for Mihawk
* tag 'bmc-5.13-devicetree' of git://git.kernel.org/pub/scm/linux/kernel/git/joel/bmc: (21 commits)
ARM: dts: nuvoton: Add Quanta GBS BMC Device Tree
ARM: dts: aspeed: mihawk: Add GPIO line names
ARM: dts: aspeed: Add Rainier 1S4U machine
ARM: dts: aspeed: everest: Add size/address cells
ARM: dts: aspeed: everest: Enable fan watchdog
ARM: dts: aspeed: everest: Add RTC
ARM: dts: aspeed: everest: GPIOs support
ARM: dts: aspeed: everest: Add UCD90320 power sequencer
ARM: dts: aspeed: everest: Add power supply i2c devices
ARM: dts: aspeed: everest: Add pca9552 fan presence
ARM: dts: aspeed: everest: Add FSI CFAMs and re-number engines
ARM: dts: aspeed: everest: Add max31785 fan controller device
ARM: dts: aspeed: everest: Add I2C components
ARM: dts: aspeed: rainier 4U: Fix fan configuration
ARM: dts: aspeed: rainier: Add missing fan nodes
ARM: dts: aspeed: rainier: Enable fan watchdog
ARM: dts: aspeed: rainier: Add presence GPIOs
ARM: dts: aspeed: rainier: Add additional processor CFAMs
ARM: dts: aspeed: rainier: Add gpio-keys-polled for fans
ARM: dts: aspeed: rainier: Add directly controlled LEDs
...
Link: https://lore.kernel.org/r/CACPK8Xe-KV5BeQwOH6NKC1++FCVqwwNCGBh7hEbBORfrmxfTtQ@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 | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile index f49443af7c82..1a1d423dc19e 100644 --- a/arch/arm/boot/dts/Makefile +++ b/arch/arm/boot/dts/Makefile @@ -335,6 +335,7 @@ dtb-$(CONFIG_ARCH_LPC32XX) += \ lpc3250-phy3250.dtb dtb-$(CONFIG_ARCH_NPCM7XX) += \ nuvoton-npcm730-gsj.dtb \ + nuvoton-npcm730-gbs.dtb \ nuvoton-npcm730-kudo.dtb \ nuvoton-npcm750-evb.dtb \ nuvoton-npcm750-runbmc-olympus.dtb @@ -1414,6 +1415,7 @@ dtb-$(CONFIG_ARCH_ASPEED) += \ aspeed-bmc-ampere-mtjade.dtb \ aspeed-bmc-arm-centriq2400-rep.dtb \ aspeed-bmc-arm-stardragon4800-rep2.dtb \ + aspeed-bmc-asrock-e3c246d4i.dtb \ aspeed-bmc-bytedance-g220a.dtb \ aspeed-bmc-facebook-cmm.dtb \ aspeed-bmc-facebook-galaxy100.dtb \ @@ -1426,6 +1428,7 @@ dtb-$(CONFIG_ARCH_ASPEED) += \ aspeed-bmc-facebook-yosemitev2.dtb \ aspeed-bmc-ibm-everest.dtb \ aspeed-bmc-ibm-rainier.dtb \ + aspeed-bmc-ibm-rainier-1s4u.dtb \ aspeed-bmc-ibm-rainier-4u.dtb \ aspeed-bmc-intel-s2600wf.dtb \ aspeed-bmc-inspur-fp5280g2.dtb \ |