diff options
| author | Olof Johansson <olof@lixom.net> | 2018-09-23 06:32:33 -0700 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2018-09-23 06:32:33 -0700 |
| commit | da4cf9cdec9bdc68aaac0f1f0d171d32b05fa342 (patch) | |
| tree | 35ab6e1367c9810bd660aa25dab93b2bd2139df7 /arch/arm/boot/dts/Makefile | |
| parent | f240bd3b4b91430aaa5eb6be8a14812eff8f9f32 (diff) | |
| parent | 3368e06e2a91a65cff59e520acc51b9adf4900bf (diff) | |
Merge tag 'aspeed-4.20-devicetree' of git://git.kernel.org/pub/scm/linux/kernel/git/joel/aspeed into next/dt
ASPEED device tree updates for 4.20
- Two new ast2500-based machines:
* Facebook TiogaPass (x86 server)
* HXT StarDragon 4800 Reference Evaluation Platform 2 (arm64 server)
- Updates for the Quanta q71l system
- i2c device tree cleanups
* tag 'aspeed-4.20-devicetree' of git://git.kernel.org/pub/scm/linux/kernel/git/joel/aspeed:
ARM: dts: aspeed: Adding Facebook TiogaPass BMC
ARM: dts: aspeed: Add HXT StarDragon 4800 REP2 BMC
ARM: dts: aspeed: quanta-q71l: Enable adc & ibt nodes
ARM: dts: aspeed: quanta-q71l: Add four PSUs
ARM: dts: aspeed: quanta-q71l: add aliases for i2c
ARM: dts: aspeed: Fix I2C bus warnings
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 4009fc30aa31..fc210987768c 100644 --- a/arch/arm/boot/dts/Makefile +++ b/arch/arm/boot/dts/Makefile @@ -1200,6 +1200,8 @@ dtb-$(CONFIG_ARCH_ZX) += zx296702-ad1.dtb dtb-$(CONFIG_ARCH_ASPEED) += \ aspeed-ast2500-evb.dtb \ aspeed-bmc-arm-centriq2400-rep.dtb \ + aspeed-bmc-arm-stardragon4800-rep2.dtb \ + aspeed-bmc-facebook-tiogapass.dtb \ aspeed-bmc-intel-s2600wf.dtb \ aspeed-bmc-opp-lanyang.dtb \ aspeed-bmc-opp-palmetto.dtb \ |