Merge patch series "arm: aspeed: add initial AST2700 SoC support"

Ryan Chen <ryan_chen@aspeedtech.com> says:

AST2700 is the 8th generation of Integrated Remote Management
Processor introduced by ASPEED Technology Inc. It is a Board
Management Controller (BMC) SoC family with a dual-die architecture:
SoC0 ("CPU" die with four ARM Cortex-A35 application cores) and
SoC1 ("IO" die with peripherals) each SoC have its own SCU PLLs,
clock dividers and reset domains.

Link: https://lore.kernel.org/r/20260612-ast2700_clk-v4-0-9bea29cfdc39@aspeedtech.com

diff --cc MAINTAINERS
index 370bcff56c190e34e1dc0c241f3ba8dab5104062,74520244e805d473c4e12dff9759ef925b53888c..3ac7b151241e6940f16c7132de4664f689dccf74
--- 1/MAINTAINERS
--- 2/MAINTAINERS
+++ b/MAINTAINERS
@@@ -214,22 -208,25 +214,33 @@@ M:      Chia-Wei Wang <chiawei_wang@aspeedte
  R:    Aspeed BMC SW team <BMC-SW@aspeedtech.com>
  R:    Joel Stanley <joel@jms.id.au>
  S:    Maintained
 -F:    arch/arm/mach-aspeed/
 -F:    arch/arm/include/asm/arch-aspeed/
 -F:    arch/riscv/include/asm/arch-ast2700/
 -F:    board/aspeed/
 -F:    drivers/clk/aspeed/
 -F:    drivers/crypto/aspeed/
 -F:    drivers/gpio/gpio-aspeed.c
+ F:    arch/arm/dts/ast*
  F:    drivers/i2c/ast_i2c.[ch]
 -F:    drivers/mmc/aspeed_sdhci.c
 -F:    drivers/net/aspeed_mdio.c
  F:    drivers/net/ftgmac100.[ch]
 +F:    drivers/watchdog/ast_wdt.c
 +N:    aspeed
 +N:    ast2500
++N:    ast2700
 +
 +ARM AXIADO AX3005 SCM3005
 +M:    Siu Ming Tong <smtong@axiado.com>
 +M:    Karthikeyan Mitran <kmitran@axiado.com>
 +M:    Prasad Bolisetty <pbolisetty@axiado.com>
 +S:    Maintained
 +F:    arch/arm/dts/ax3005*
 +F:    arch/arm/mach-axiado/
 +F:    board/axiado/scm3005/
 +F:    configs/ax3005_scm3005_defconfig
 +F:    include/configs/ax3005-scm3005.h
++=======
+ F:    drivers/pinctrl/aspeed/
+ F:    drivers/pwm/pwm-aspeed.c
+ F:    drivers/ram/aspeed/
+ F:    drivers/reset/reset-ast*.c
+ F:    drivers/watchdog/ast_wdt.c
+ N:    aspeed
+ N:    ast2700
++>>>>>>> 4a72fd9fb09109857303ca64fd259009e1d4b554
  
  ARM BROADCOM BCM283X / BCM27XX
  M:    Matthias Brugger <mbrugger@suse.com>

diff --cc arch/arm/dts/Makefile
Simple merge

diff --cc drivers/ram/aspeed/Kconfig
Simple merge

diff --cc drivers/ram/aspeed/sdram_ast2700.c
Simple merge