diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2023-01-29 14:34:44 +0300 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2023-01-29 14:34:44 +0300 |
| commit | 7c306cb1941e05f513db1c0ee35a6edcb48ac678 (patch) | |
| tree | 3fe1de27f25e092d97bef7eb5e4e39ec9cc27a64 /Documentation/ABI | |
| parent | 99ba2ad1db623df79456b8556b3f4900f394c8c2 (diff) | |
| parent | 9d18515e4a2b9d3828b6d64087feeeed3aa1cf65 (diff) | |
| download | linux-7c306cb1941e05f513db1c0ee35a6edcb48ac678.tar.xz | |
Merge tag 'fpga-for-v6.3-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/fpga/linux-fpga into char-misc-next
Xu writes:
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>
* tag 'fpga-for-v6.3-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/fpga/linux-fpga:
fpga: bridge: return errors in the show() method of the "state" attribute
fpga: dfl: more kernel-doc corrections
fpga: dfl: kernel-doc corrections
fpga: microchip-spi: separate data frame write routine
fpga: microchip-spi: rewrite status polling in a time measurable way
fpga: microchip-spi: move SPI I/O buffers out of stack
mfd: intel-m10-bmc: Add PMCI driver
fpga: m10bmc-sec: Make rsu status type specific
fpga: m10bmc-sec: Create helpers for rsu status/progress checks
mfd: intel-m10-bmc: Prefix register defines with M10BMC_N3000
fpga: intel-m10-bmc: Rework flash read/write
mfd: intel-m10-bmc: Support multiple CSR register layouts
mfd: intel-m10-bmc: Split into core and spi specific parts
mfd: intel-m10-bmc: Rename the local variables
mfd: intel-m10-bmc: Create m10bmc_platform_info for type specific info
mfd: intel-m10-bmc: Add missing includes to header
Diffstat (limited to 'Documentation/ABI')
| -rw-r--r-- | Documentation/ABI/testing/sysfs-driver-intel-m10-bmc | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/Documentation/ABI/testing/sysfs-driver-intel-m10-bmc b/Documentation/ABI/testing/sysfs-driver-intel-m10-bmc index 9773925138af..a8ab58035c95 100644 --- a/Documentation/ABI/testing/sysfs-driver-intel-m10-bmc +++ b/Documentation/ABI/testing/sysfs-driver-intel-m10-bmc @@ -1,4 +1,4 @@ -What: /sys/bus/spi/devices/.../bmc_version +What: /sys/bus/.../drivers/intel-m10-bmc/.../bmc_version Date: June 2020 KernelVersion: 5.10 Contact: Xu Yilun <yilun.xu@intel.com> @@ -6,7 +6,7 @@ Description: Read only. Returns the hardware build version of Intel MAX10 BMC chip. Format: "0x%x". -What: /sys/bus/spi/devices/.../bmcfw_version +What: /sys/bus/.../drivers/intel-m10-bmc/.../bmcfw_version Date: June 2020 KernelVersion: 5.10 Contact: Xu Yilun <yilun.xu@intel.com> @@ -14,7 +14,7 @@ Description: Read only. Returns the firmware version of Intel MAX10 BMC chip. Format: "0x%x". -What: /sys/bus/spi/devices/.../mac_address +What: /sys/bus/.../drivers/intel-m10-bmc/.../mac_address Date: January 2021 KernelVersion: 5.12 Contact: Russ Weight <russell.h.weight@intel.com> @@ -25,7 +25,7 @@ Description: Read only. Returns the first MAC address in a block space. Format: "%02x:%02x:%02x:%02x:%02x:%02x". -What: /sys/bus/spi/devices/.../mac_count +What: /sys/bus/.../drivers/intel-m10-bmc/.../mac_count Date: January 2021 KernelVersion: 5.12 Contact: Russ Weight <russell.h.weight@intel.com> |