diff options
| author | Olof Johansson <olof@lixom.net> | 2019-11-08 21:32:19 +0300 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2019-11-08 21:32:21 +0300 |
| commit | 743f4e5bc01f4f5b1d041c8dac5f471c010d8d8c (patch) | |
| tree | 7ff116ecba747017d7acc204d18bec7d572f5624 /arch/arm/boot/dts/Makefile | |
| parent | 44124df44db01b6ded323317f8d07b8541517c54 (diff) | |
| parent | 3eca037f2dfce07a31da0a837ac35d6d846614b0 (diff) | |
| download | linux-743f4e5bc01f4f5b1d041c8dac5f471c010d8d8c.tar.xz | |
Merge tag 'aspeed-5.5-devicetree' of git://git.kernel.org/pub/scm/linux/kernel/git/joel/aspeed into arm/dt
ASPEED device tree updates for 5.5
- Lots of work on the AST2600 boards as bringup continues. There's the
eval board, and two IBM boards called Tacoma and Rainier
- A new flash layout for OpenBMC systems with larger flashes
- Better support for the MAC clocking when talking to a NCSI device,
making Linux less reliant on u-boot having done the correct thing
- LED fixes for vesin and fp5280g2
- SGPIO support
- Facebook network BMC cleanup with the common hardware moved to a
shared dtsi
* tag 'aspeed-5.5-devicetree' of git://git.kernel.org/pub/scm/linux/kernel/git/joel/aspeed: (48 commits)
ARM: dts: aspeed-g6: Add timer description
ARM: dts: aspeed: ast2600evb: Enable i2c buses
ARM: dts: aspeed-g5: Add SGPIO description
ARM: dts: aspeed: yamp: Use common dtsi
ARM: dts: aspeed: minipack: Use common dtsi
ARM: dts: aspeed: cmm: Use common dtsi
ARM: dts: aspeed: Common dtsi for Facebook AST2500 Network BMCs
ARM: dts: aspeed: rainier: gpio-keys for PSU presence
ARM: dts: aspeed: rainier: Fix i2c eeprom size
ARM: dts: tacoma: Hog LPC pinmux
ARM: dts: aspeed: rainier: Enable VUART1
ARM: dts: aspeed: rainier: Add i2c eeproms
ARM: dts: aspeed: tacoma: Use 64MB for firmware memory
ARM: dts: aspeed: tacoma: Add host FSI description
ARM: dts: ast2600evb: Enable UART workaround
ARM: dts: aspeed: tacoma: Add UART1 and workaround
ARM: dts: aspeed-g6: Add remaining UARTs
ARM: dts: aspeed-g6: Fix i2c clock source
ARM: dts: aspeed: Add RCLK to MAC clocks for RMII interfaces
ARM: dts: aspeed: tacoma: Enable FMC and SPI devices
...
Link: https://lore.kernel.org/r/CACPK8Xe8XiJ+oEp3_AXO5Mox-mXWVrOJKQLJMKJxg1WdYCTzMw@mail.gmail.com
Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'arch/arm/boot/dts/Makefile')
| -rw-r--r-- | arch/arm/boot/dts/Makefile | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile index 7149fc1ccd90..847b5537f998 100644 --- a/arch/arm/boot/dts/Makefile +++ b/arch/arm/boot/dts/Makefile @@ -1298,6 +1298,7 @@ dtb-$(CONFIG_ARCH_ASPEED) += \ aspeed-bmc-facebook-wedge40.dtb \ aspeed-bmc-facebook-wedge100.dtb \ aspeed-bmc-facebook-yamp.dtb \ + aspeed-bmc-ibm-rainier.dtb \ aspeed-bmc-intel-s2600wf.dtb \ aspeed-bmc-inspur-fp5280g2.dtb \ aspeed-bmc-lenovo-hr630.dtb \ @@ -1308,6 +1309,7 @@ dtb-$(CONFIG_ARCH_ASPEED) += \ aspeed-bmc-opp-palmetto.dtb \ aspeed-bmc-opp-romulus.dtb \ aspeed-bmc-opp-swift.dtb \ + aspeed-bmc-opp-tacoma.dtb \ aspeed-bmc-opp-vesnin.dtb \ aspeed-bmc-opp-witherspoon.dtb \ aspeed-bmc-opp-zaius.dtb \ |