diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2020-05-21 12:19:04 +0200 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2020-05-21 12:19:05 +0200 |
| commit | 18e48cc0ba9cf24eae73858c7c44a78f9a53bef0 (patch) | |
| tree | 531e40895f2ee35d36a20290f1a7f57a1b94b252 /arch/arm/boot/dts/Makefile | |
| parent | 4875d9e230cc95d71d0db8b66654e605e43ba6e5 (diff) | |
| parent | fa4c8ec6feaa3237f5d44cb8c6d0aa0dff6e1bcc (diff) | |
Merge tag 'aspeed-5.8-devicetree' of git://git.kernel.org/pub/scm/linux/kernel/git/joel/aspeed into arm/dt
ASPEED device tree updates for 5.8
New machines:
- YADRO's ast2500 OpenPower P9 Nicole BMC
- Facebook's ast2500 x86 Yosemite V2 BMC
The AST2600 machines Rainier and Tacoma were fleshed out.
Machines have started describing the GPIO names as userspace attempts
to use the GPIO chardev API.
* tag 'aspeed-5.8-devicetree' of git://git.kernel.org/pub/scm/linux/kernel/git/joel/aspeed: (32 commits)
ARM: dts: aspeed: Change KCS nodes to v2 binding
ARM: dts: Aspeed: AST2600: Add XDMA PCI-E root control reset
ARM: dts: aspeed: ast2600: Add XDMA Engine
ARM: dts: aspeed: ast2500: Add XDMA Engine
ARM: dts: aspeed: Adding Facebook Yosemite V2 BMC
ARM: dts: aspeed: Add YADRO Nicole BMC
ARM: dts: aspeed: mihawk: add aliases for i2c
ARM: dts: aspeed: tacoma: Add TPM
ARM: dts: aspeed: tacoma: Enable the second VUART
ARM: dts: aspeed: tacoma: Add iio-hwmon nodes for IIO devices
ARM: dts: aspeed: rainier: Add VGA reserved memory region
ARM: dts: aspeed: rainier: Add gpio line names
ARM: dts: aspeed: tacoma: Add gpio line names
ARM: dts: aspeed: zaius: Add gpio line names
ARM: dts: aspeed: romulus: Add gpio line names
ARM: dts: aspeed: witherspoon: Add gpio line names
ARM: dts: aspeed: ast2600: Set arch timer always-on
ARM: dts: aspeed: tacoma: Add GPIOs for FSI
ARM: dts: aspeed: mihawk: Change the name of leds
ARM: dts: aspeed: rainier: Remove regulators
...
Link: https://lore.kernel.org/r/CACPK8Xd-=XFREvvS-mK_ECyn14y0GPAMyy5BpEEUYfaw4jAgsw@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 | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile index b21f79521c0a..39a6967a0db0 100644 --- a/arch/arm/boot/dts/Makefile +++ b/arch/arm/boot/dts/Makefile @@ -1341,6 +1341,7 @@ dtb-$(CONFIG_ARCH_ASPEED) += \ aspeed-bmc-facebook-wedge40.dtb \ aspeed-bmc-facebook-wedge100.dtb \ aspeed-bmc-facebook-yamp.dtb \ + aspeed-bmc-facebook-yosemitev2.dtb \ aspeed-bmc-ibm-rainier.dtb \ aspeed-bmc-intel-s2600wf.dtb \ aspeed-bmc-inspur-fp5280g2.dtb \ @@ -1349,6 +1350,7 @@ dtb-$(CONFIG_ARCH_ASPEED) += \ aspeed-bmc-microsoft-olympus.dtb \ aspeed-bmc-opp-lanyang.dtb \ aspeed-bmc-opp-mihawk.dtb \ + aspeed-bmc-opp-nicole.dtb \ aspeed-bmc-opp-palmetto.dtb \ aspeed-bmc-opp-romulus.dtb \ aspeed-bmc-opp-swift.dtb \ |