* [GIT PULL] FPGA Manager changes for 6.3-rc1
@ 2023-01-29 10:18 Xu Yilun
2023-01-29 11:36 ` Greg KH
0 siblings, 1 reply; 2+ messages in thread
From: Xu Yilun @ 2023-01-29 10:18 UTC (permalink / raw)
To: gregkh; +Cc: yilun.xu, linux-fpga, hao.wu, mdf
The following changes since commit 1b929c02afd37871d5afb9d498426f83432e71c2:
Linux 6.2-rc1 (2022-12-25 13:41:39 -0800)
are available in the Git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/fpga/linux-fpga tags/fpga-for-v6.3-rc1
for you to fetch changes up to 9d18515e4a2b9d3828b6d64087feeeed3aa1cf65:
Merge tag 'ib-mfd-fpga-hwmon-v6.3' of git://git.kernel.org/pub/scm/linux/kernel/git/lee/mfd into for-fpga-v6.3-rc1 (2023-01-29 00:34:59 +0800)
My first time trying to resolve conflict and merge another branch for
upstream, not sure if it's correct. See from Documentation that merging
a sibling tree should usually be avoided, but I assume merging a topic
tree should be OK?
----------------------------------------------------------------
FPGA Manager changes for 6.3-rc1
Microchip:
- Ivan's reliability improvements for Microchip Polarfire FPGA
FPGA DFL doc:
- Randy and Yilun's kernel doc fixes.
The 2 patches, "fpga: dfl: more kernel-doc corrections" &
"fpga: dfl: kernel-doc corrections" conflicts with Matthew's FPGA
patch "fpga: dfl: add basic support for DFHv1" on tty-next. Yilun
resolved the conflicts on:
--branch for-next https://git.kernel.org/pub/scm/linux/kernel/git/fpga/linux-fpga.git/
On that branch, Matthew's patch is applied first then kernel doc fixes
follow.
Intel m10 bmc MFD & sub devices:
- Lee's topic branch merged, to support new BMC board type with new
PMCI interface to host, as well as its new sub devices.
Signed-off-by: Xu Yilun <yilun.xu@intel.com>
----------------------------------------------------------------
Ilpo Järvinen (10):
mfd: intel-m10-bmc: Add missing includes to header
mfd: intel-m10-bmc: Create m10bmc_platform_info for type specific info
mfd: intel-m10-bmc: Rename the local variables
mfd: intel-m10-bmc: Split into core and spi specific parts
mfd: intel-m10-bmc: Support multiple CSR register layouts
fpga: intel-m10-bmc: Rework flash read/write
mfd: intel-m10-bmc: Prefix register defines with M10BMC_N3000
fpga: m10bmc-sec: Create helpers for rsu status/progress checks
fpga: m10bmc-sec: Make rsu status type specific
mfd: intel-m10-bmc: Add PMCI driver
Ivan Bornyakov (3):
fpga: microchip-spi: move SPI I/O buffers out of stack
fpga: microchip-spi: rewrite status polling in a time measurable way
fpga: microchip-spi: separate data frame write routine
Marco Pagani (1):
fpga: bridge: return errors in the show() method of the "state" attribute
Randy Dunlap (1):
fpga: dfl: kernel-doc corrections
Xu Yilun (2):
fpga: dfl: more kernel-doc corrections
Merge tag 'ib-mfd-fpga-hwmon-v6.3' of git://git.kernel.org/pub/scm/linux/kernel/git/lee/mfd into for-fpga-v6.3-rc1
.../ABI/testing/sysfs-driver-intel-m10-bmc | 8 +-
MAINTAINERS | 2 +-
drivers/fpga/Kconfig | 2 +-
drivers/fpga/dfl-afu-region.c | 1 +
drivers/fpga/dfl-afu.h | 2 +-
drivers/fpga/dfl-fme-perf.c | 2 +-
drivers/fpga/dfl-fme-pr.c | 4 +-
drivers/fpga/dfl-fme-pr.h | 2 +-
drivers/fpga/dfl.c | 5 +-
drivers/fpga/dfl.h | 1 +
drivers/fpga/fpga-bridge.c | 11 +-
drivers/fpga/intel-m10-bmc-sec-update.c | 364 +++++++++++++--------
drivers/fpga/microchip-spi.c | 145 ++++----
drivers/hwmon/Kconfig | 2 +-
drivers/mfd/Kconfig | 32 +-
drivers/mfd/Makefile | 5 +-
drivers/mfd/intel-m10-bmc-core.c | 122 +++++++
drivers/mfd/intel-m10-bmc-pmci.c | 219 +++++++++++++
drivers/mfd/intel-m10-bmc-spi.c | 168 ++++++++++
drivers/mfd/intel-m10-bmc.c | 238 --------------
include/linux/mfd/intel-m10-bmc.h | 154 ++++++---
21 files changed, 984 insertions(+), 505 deletions(-)
create mode 100644 drivers/mfd/intel-m10-bmc-core.c
create mode 100644 drivers/mfd/intel-m10-bmc-pmci.c
create mode 100644 drivers/mfd/intel-m10-bmc-spi.c
delete mode 100644 drivers/mfd/intel-m10-bmc.c
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2023-01-29 11:38 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2023-01-29 10:18 [GIT PULL] FPGA Manager changes for 6.3-rc1 Xu Yilun
2023-01-29 11:36 ` Greg KH
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.