diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2021-10-20 00:58:41 +0300 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2021-10-20 00:58:43 +0300 |
| commit | f6bfe0146895e26351d20e2368f3f3ec25925fbc (patch) | |
| tree | cbdaa0dfa3621b53709a90d9f54d10dc46734751 /arch/arm/boot/dts/Makefile | |
| parent | 6fa496fd7db67b872c2c3e72658d532b68db3860 (diff) | |
| parent | 4eb7fe3333a021c8d0f35bcb5cd7c4e42800df62 (diff) | |
| download | linux-f6bfe0146895e26351d20e2368f3f3ec25925fbc.tar.xz | |
Merge tag 'aspeed-5.16-devicetree' of git://git.kernel.org/pub/scm/linux/kernel/git/joel/bmc into arm/dt
ASPEED device tree updates for 5.15
- New machines:
* TYAN S7106 BMC, a x86 server from about four years ago
- Descriptions for the AST2600 ADC, which now has an upstream driver
- Lots of GPIO line names. The OpenBMC project has adopted a scheme for
naming the lines, and new additions will follow this guide
- New I2C devices for Rainier, Everest, EthanolX, Mt Jade
- Fixes for fp5280g2 which has seen some recent development, including
the addtion of a QEmu machine for testing
* tag 'aspeed-5.16-devicetree' of git://git.kernel.org/pub/scm/linux/kernel/git/joel/bmc:
ARM: dts: aspeed: fp5280g2: Use the 64M layout
ARM: dts: aspeed: Add TYAN S7106 BMC machine
ARM: dts: aspeed: rainier: Add power-config-full-load gpio
ARM: dts: aspeed: p10bmc: Define secure boot gpio
ARM: dts: aspeed: mtjade: Add some gpios
ARM: dts: aspeed: Add ADC for AST2600 and enable for Rainier and Everest
ARM: dts: everest: Define name for gpio line B6
ARM: dts: everest: Define name for gpio line Q2
ARM: dts: rainier: Define name for gpio line Q2
ARM: dts: everest: Add 'factory-reset-toggle' as GPIOF6
ARM: dts: aspeed: everest: Add I2C bus 15 muxes
ARM: dts: aspeed: rainier: Add system LEDs
ARM: dts: aspeed: amd-ethanolx: Add FRU EEPROM
ARM: dts: fp5280g2: Enable KCS 3 for MCTP binding
Link: https://lore.kernel.org/r/CACPK8XdrMzY9tzdof7KpzxKquTo7GcWW4N9Zqwtmmu73C7htXA@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, 2 insertions, 1 deletions
diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile index 73ed0b4bb2ac..98f5a9883236 100644 --- a/arch/arm/boot/dts/Makefile +++ b/arch/arm/boot/dts/Makefile @@ -1508,4 +1508,5 @@ dtb-$(CONFIG_ARCH_ASPEED) += \ aspeed-bmc-opp-zaius.dtb \ aspeed-bmc-portwell-neptune.dtb \ aspeed-bmc-quanta-q71l.dtb \ - aspeed-bmc-supermicro-x11spi.dtb + aspeed-bmc-supermicro-x11spi.dtb \ + aspeed-bmc-tyan-s7106.dtb |