diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2022-11-23 12:29:23 +0100 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2022-11-23 12:29:32 +0100 |
| commit | 375aab1018181a9f7d123c5ec72fae8867afa8a1 (patch) | |
| tree | 8553cc40d11d027b91b408fc4a50fefd984f81e8 /arch/arm/boot/dts/Makefile | |
| parent | 714aac5dcd3a03cefa42ec4d7597eca36dd1a75f (diff) | |
| parent | 3973fc0f9f07fc4186bb581014404fbf77a659b5 (diff) | |
| download | linux-375aab1018181a9f7d123c5ec72fae8867afa8a1.tar.gz | |
Merge tag 'aspeed-6.2-devicetree' of git://git.kernel.org/pub/scm/linux/kernel/git/joel/bmc into soc/dt
ASPEED device tree updates for 6.2
- New machines
* IBM Bonnell AST2600 BMC, for a Power10 server
* Delta AHE-50DC AST1250 BMC, for a 1U Open19 power shelf
- Removed machines
* IBM Mihawk AST2500 BMC, a Power9 server similar to Witherspoon
- Fixes and updates for bletchley, mtjade/mtmitchell, rainier/everest
* tag 'aspeed-6.2-devicetree' of git://git.kernel.org/pub/scm/linux/kernel/git/joel/bmc:
ARM: dts: aspeed: mtjade: Add SMPro nodes
ARM: dts: aspeed: mtjade,mtmitchell: Add BMC SSIF nodes
ARM: dts: aspeed: Add Delta AHE-50DC BMC
dt-bindings: arm: aspeed: document Delta AHE-50DC BMC
ARM: dts: aspeed: rainier: Fix pca9551 nodes
ARM: dts: aspeed: p10bmc: Add occ-hwmon nodes
ARM: dts: aspeed-g6: Add aliases for mdio nodes
ARM: dts: aspeed: Remove Mihawk
ARM: dts: aspeed: rainier,everest: Move reserved memory regions
ARM: dts: aspeed: Add IBM Bonnell system BMC devicetree
ARM: dts: aspeed: bletchley: Enable emmc and ehci1
ARM: dts: aspeed: bletchley: Update and fix gpio-line-names
ARM: dts: aspeed: bletchley: Update fusb302 nodes
ARM: dts: aspeed: bletchley: Bind presence-sledX pins via gpio-keys
ARM: dts: aspeed: bletchley: Disable GPIOV2 pull-down
ARM: dts: aspeed: bletchley: Change LED sys_log_id to active low
Link: https://lore.kernel.org/r/CACPK8Xfsc8BaL_qAgV+3Rk-AFcQoDVfTpMzHvq_rR-UYqwpNNQ@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 cbb75d234905..b3ab92a66a82 100644 --- a/arch/arm/boot/dts/Makefile +++ b/arch/arm/boot/dts/Makefile @@ -1592,6 +1592,7 @@ dtb-$(CONFIG_ARCH_ASPEED) += \ aspeed-bmc-asrock-e3c246d4i.dtb \ aspeed-bmc-asrock-romed8hm3.dtb \ aspeed-bmc-bytedance-g220a.dtb \ + aspeed-bmc-delta-ahe50dc.dtb \ aspeed-bmc-facebook-bletchley.dtb \ aspeed-bmc-facebook-cloudripper.dtb \ aspeed-bmc-facebook-cmm.dtb \ @@ -1605,6 +1606,7 @@ dtb-$(CONFIG_ARCH_ASPEED) += \ aspeed-bmc-facebook-wedge400.dtb \ aspeed-bmc-facebook-yamp.dtb \ aspeed-bmc-facebook-yosemitev2.dtb \ + aspeed-bmc-ibm-bonnell.dtb \ aspeed-bmc-ibm-everest.dtb \ aspeed-bmc-ibm-rainier.dtb \ aspeed-bmc-ibm-rainier-1s4u.dtb \ @@ -1616,7 +1618,6 @@ dtb-$(CONFIG_ARCH_ASPEED) += \ aspeed-bmc-lenovo-hr855xg2.dtb \ aspeed-bmc-microsoft-olympus.dtb \ aspeed-bmc-opp-lanyang.dtb \ - aspeed-bmc-opp-mihawk.dtb \ aspeed-bmc-opp-mowgli.dtb \ aspeed-bmc-opp-nicole.dtb \ aspeed-bmc-opp-palmetto.dtb \ |