diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2018-03-15 15:54:24 +0100 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2018-03-15 15:54:24 +0100 |
| commit | 5b5c7ffe8d37d3434c3b9a984d4484542e96599b (patch) | |
| tree | a56627540c60fd63d5269652a97c416ae8be77b4 /arch/arm/boot/dts/Makefile | |
| parent | 206c12fc48fc31cb4ddaa38c48638df9eb0715ef (diff) | |
| parent | 3719a1b130566cf91c3b3ec4707e1ed61bff6d54 (diff) | |
| download | op-kernel-dev-5b5c7ffe8d37d3434c3b9a984d4484542e96599b.zip op-kernel-dev-5b5c7ffe8d37d3434c3b9a984d4484542e96599b.tar.gz | |
Merge tag 'aspeed-4.17-devicetree' of ssh://gitolite.kernel.org/pub/scm/linux/kernel/git/joel/aspeed into next/dt
Pull "ASPEED device tree updates for 4.17" from Joel Stanley:
Updates to OpenPower BMC systems:
A number of updates to use recently merged drivers, including moving to
upstreamed IPMI BT nodes, a temp sensor for Romulus, and adding
simple-reset for UARTs.
This includes more of Palmetto's device tree, so that it's ever so
close to booting the host with an upstream kernel.
New machines:
Add Qualcomm Centriq ARM64 server reference platform, which will run
OpenBMC on an AST2500.
* tag 'aspeed-4.17-devicetree' of ssh://gitolite.kernel.org/pub/scm/linux/kernel/git/joel/aspeed:
ARM: dts: aspeed: Add Qualcomm Centriq 2400 REP BMC
ARM: dts: aspeed: romulus: Add w83773g temp sensor
ARM: dts: aspeed: romulus: hog GPIOS7
ARM: dts: romulus: Remove MAX31785 device
ARM: dts: palmetto: Request mux as per strapping configuration
ARM: dts: palmetto: Enable rear UART
ARM: dts: aspeed: Add LPC reset controller node
ARM: dts: aspeed: Add Palmetto GPIO hogs
ARM: dts: palmetto: Add LEDs and GPIO keys
ARM: dts: aspeed: Add LPC clock phandles
ARM: dts: aspeed-g5: Update LPC node
ARM: dts: aspeed: Enable IPMI BT node on OpenPower machines
ARM: dts: aspeed: Add IPMI BT node
Diffstat (limited to 'arch/arm/boot/dts/Makefile')
| -rw-r--r-- | arch/arm/boot/dts/Makefile | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile index c4842fa..d191305 100644 --- a/arch/arm/boot/dts/Makefile +++ b/arch/arm/boot/dts/Makefile @@ -1143,6 +1143,7 @@ dtb-$(CONFIG_ARCH_MEDIATEK) += \ dtb-$(CONFIG_ARCH_ZX) += zx296702-ad1.dtb dtb-$(CONFIG_ARCH_ASPEED) += \ aspeed-ast2500-evb.dtb \ + aspeed-bmc-arm-centriq2400-rep.dtb \ aspeed-bmc-opp-palmetto.dtb \ aspeed-bmc-opp-romulus.dtb \ aspeed-bmc-opp-witherspoon.dtb \ |
