[PATCH linux dev-6.12 v1 0/6] Port linux fixes from dev-6.6
Ninad Palsule
ninad at linux.ibm.com
Wed Sep 3 04:31:41 AEST 2025
This patchset forward port fixes from dev-6.6 to dev-6.12 branch.
The conflicts were seen only in one patch listed below.
- soc: aspeed: Add XDMA Engine Driver
Eddie James (6):
soc: aspeed: Add XDMA Engine Driver
soc: aspeed: xdma: Add user interface
soc: aspeed: xdma: Add reset ioctl
soc: aspeed: xdma: Add trace events
i2c: core: Add mux root adapter operations
iio: si7020: Lock root adapter to wait for reset
MAINTAINERS | 2 +
drivers/i2c/i2c-core-base.c | 38 +
drivers/i2c/i2c-mux.c | 50 ++
drivers/iio/humidity/si7020.c | 16 +-
drivers/soc/aspeed/Kconfig | 10 +
drivers/soc/aspeed/Makefile | 1 +
drivers/soc/aspeed/aspeed-xdma.c | 1224 ++++++++++++++++++++++++++++++
include/linux/i2c.h | 42 +
include/trace/events/xdma.h | 139 ++++
include/uapi/linux/aspeed-xdma.h | 42 +
10 files changed, 1562 insertions(+), 2 deletions(-)
create mode 100644 drivers/soc/aspeed/aspeed-xdma.c
create mode 100644 include/trace/events/xdma.h
create mode 100644 include/uapi/linux/aspeed-xdma.h
--
2.48.1
More information about the openbmc
mailing list