]> git.ipfire.org Git - thirdparty/qemu.git/commitdiff
Merge tag 'pull-aspeed-20260608' of https://github.com/legoater/qemu into staging
authorStefan Hajnoczi <stefanha@redhat.com>
Mon, 8 Jun 2026 13:28:42 +0000 (09:28 -0400)
committerStefan Hajnoczi <stefanha@redhat.com>
Mon, 8 Jun 2026 13:28:42 +0000 (09:28 -0400)
aspeed queue:

* Convert 14 Aspeed device models to DEFINE_TYPES().
* Improve Aspeed I2C: unify DMA address handling with a dma_addr_lo_mask
  field and increase the AST2700 buffer mode size.
* Add ADC, PECI, GPIO, SGPIO, I2C and watchdog support to the AST1040
  SoC model, and wire onboard I2C devices to the AST1040 EVB.
* Fix DW-I3C CMD/data FIFO reset values to match real silicon, rename
  queue capacity properties from _bytes to _words, keeping the old
  names as aliases for backward compatibility.

# -----BEGIN PGP SIGNATURE-----
#
# iQIzBAABCAAdFiEEoPZlSPBIlev+awtgUaNDx8/77KEFAmomV3cACgkQUaNDx8/7
# 7KHYJQ/8Dib2fzm3ew4JYZXwrXxxdeaavzlEcOR7MRJ8sV93De+jY4DO1y/0Stgo
# /uJe3f5w6RYN8Qq6BDllx2mXJ8Qk3K+Jdz6An3pDWbeGSOqgO747kLutHHfBHvZU
# Bv5fTecncRyqa10U0E2nNx90FME5+df7Q38jTVF/0VabEikCmnyxN2M/0stqurS9
# X7MzsOmLVvK8fmNDCBFvkFncSpTji4AWR8xnjBF5LzPi+/Sw3ldiCSZjMypQHSWD
# hKlaFQ5vTLvm4xT124epkl43bXEmT9JZY0GHySEAVxt3wyQuhOMb3AZZlwY92Dzl
# keynjTJf/pnPzP7+zx263otxZ/aYyjC6vgleCcSAoPcDUxU0wjO9QL/17jSkV5gT
# xSPYwE5WYc7SNDds0LD/9LNOEkEeOoMIVS8ov+GFl+TO2oIYVkj4ZhEJY+itNf/t
# PaCTfNwD/qxT28SO7kEkehnBZc8UIoTdm3uJPjesg0aSwPvf91C1G4d4DHF0LzOE
# VdaVuGnRRYFluJJmLcsShvHPAS3GjtLMPoAHQfPP0laRyErYCYwv9gnUqun2aZPG
# XGp9mPL9XsukiMYbvohMcsXZs24zzyctzlbvMvixdAxLFgRZDPYh6MfvLqTu3C63
# SE07hRFK89RjGUc/ia0xFzKW3khF/1fLz6mjc8rrGmPSRlGjrdc=
# =kYF+
# -----END PGP SIGNATURE-----
# gpg: Signature made Mon 08 Jun 2026 01:47:35 EDT
# gpg:                using RSA key A0F66548F04895EBFE6B0B6051A343C7CFFBECA1
# gpg: Good signature from "Cédric Le Goater <clg@redhat.com>" [full]
# gpg:                 aka "Cédric Le Goater <clg@kaod.org>" [full]
# Primary key fingerprint: A0F6 6548 F048 95EB FE6B  0B60 51A3 43C7 CFFB ECA1

* tag 'pull-aspeed-20260608' of https://github.com/legoater/qemu: (37 commits)
  hw/i3c: keep _bytes aliases for renamed queue-capacity properties
  hw/i3c: rename DW-I3C queue capacity fields from _bytes to _words
  hw/i3c: fix CMD/data FIFO depth reset values to match real silicon
  hw/arm/aspeed_ast1040: Reuse AST2700 watchdog models
  hw/arm/aspeed_ast1040_evb: Introduce onboard I2C device
  hw/arm/aspeed_ast1040: Introduce I2C support
  hw/i2c/aspeed_i2c: Introduce AST1040 I2C model
  hw/arm/aspeed_ast1040: Add SGPIO controller support
  hw/arm/aspeed_ast1040: Reuse AST2700 GPIO controller model
  hw/arm/aspeed_ast1040: Introduce PECI support
  hw/arm/aspeed_ast1040: Reuse AST2700 ADC model
  hw/i2c/aspeed_i2c: Increase AST2700 buffer mode size and adjust offset
  hw/i2c/aspeed_i2c: Introduce dma_addr_lo_mask to unify DMA address handling
  hw/ssi/aspeed_smc: Convert to DEFINE_TYPES() with inlined TypeInfo
  hw/net/ftgmac100: Convert to DEFINE_TYPES() with inlined TypeInfo
  hw/i2c/aspeed_i2c: Convert to DEFINE_TYPES() with inlined TypeInfo
  hw/pci-host/aspeed_pcie: Convert to DEFINE_TYPES() with inlined TypeInfo
  hw/fsi/aspeed_apb2opb: Convert to DEFINE_TYPES() with inlined TypeInfo
  hw/timer/aspeed_timer: Convert to DEFINE_TYPES() with inlined TypeInfo
  hw/nvram/aspeed_otp: Convert to DEFINE_TYPES() with inlined TypeInfo
  ...

Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>

Trivial merge