Commit 28e19580 authored by Lee Jones's avatar Lee Jones
Browse files

Merge tags 'ib-mfd-extcon-i2c-v6.3' and 'ib-mfd-fpga-hwmon-v6.3-1' into ibs-for-mfd-merged 

Immutable branch between MFD, Extcon and I2C due for the v6.3 merge window

Immutable branch between MFD, FPGA and HWMON due for the v6.3 merge window
parents 783422d0 acf63c45

Documentation/ABI/testing/sysfs-driver-intel-m10-bmc

+4 −4
Original line number Diff line number Diff line 
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>

MAINTAINERS

+1 −1
Original line number Diff line number Diff line
@@ -10576,7 +10576,7 @@ S: Maintained 
F:	Documentation/ABI/testing/sysfs-driver-intel-m10-bmc

F:	Documentation/hwmon/intel-m10-bmc-hwmon.rst

F:	drivers/hwmon/intel-m10-bmc-hwmon.c

F:	drivers/mfd/intel-m10-bmc.c

F:	drivers/mfd/intel-m10-bmc*

F:	include/linux/mfd/intel-m10-bmc.h









INTEL MENLOW THERMAL DRIVER
































drivers/fpga/Kconfig



+1
−1






























Original line number
Diff line number
Diff line







@@ -246,7 +246,7 @@ config FPGA_MGR_VERSAL_FPGA

















config FPGA_M10_BMC_SEC_UPDATE









	tristate "Intel MAX10 BMC Secure Update driver"









	depends on MFD_INTEL_M10_BMC









	depends on MFD_INTEL_M10_BMC_CORE









	select FW_LOADER









	select FW_UPLOAD









	help
































drivers/fpga/intel-m10-bmc-sec-update.c



+273
−142




























File changed.
Preview size limit exceeded, changes collapsed.
























drivers/hwmon/Kconfig



+1
−1






























Original line number
Diff line number
Diff line







@@ -2341,7 +2341,7 @@ config SENSORS_XGENE

















config SENSORS_INTEL_M10_BMC_HWMON









	tristate "Intel MAX10 BMC Hardware Monitoring"









	depends on MFD_INTEL_M10_BMC









	depends on MFD_INTEL_M10_BMC_CORE









	help









	  This driver provides support for the hardware monitoring functionality









	  on Intel MAX10 BMC chip.