Commit 603aed8f authored by Ilpo Järvinen's avatar Ilpo Järvinen Committed by Lee Jones
Browse files

mfd: intel-m10-bmc: Split into core and spi specific parts 



Split the common code from intel-m10-bmc driver into intel-m10-bmc-core
and move the SPI bus parts into an interface specific file.

intel-m10-bmc-core becomes the core MFD functions which can support
multiple bus interface like SPI bus.

Co-developed-by: default avatarTianfei zhang <tianfei.zhang@intel.com>
Signed-off-by: default avatarTianfei zhang <tianfei.zhang@intel.com>
Reviewed-by: default avatarRuss Weight <russell.h.weight@intel.com>
Acked-by: Guenter Roeck <linux@roeck-us.net> # hwmon
Reviewed-by: default avatarXu Yilun <yilun.xu@intel.com>
Signed-off-by: default avatarIlpo Järvinen <ilpo.jarvinen@linux.intel.com>
Signed-off-by: default avatarLee Jones <lee@kernel.org>
Link: https://lore.kernel.org/r/20230116100845.6153-5-ilpo.jarvinen@linux.intel.com
parent 85ba4690

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/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.
































drivers/mfd/Kconfig



+18
−12






























Original line number
Diff line number
Diff line







@@ -2224,11 +2224,17 @@ config SGI_MFD_IOC3







	  If you have an SGI Origin, Octane, or a PCI IOC3 card,









	  then say Y. Otherwise say N.



















config MFD_INTEL_M10_BMC









	tristate "Intel MAX 10 Board Management Controller"









config MFD_INTEL_M10_BMC_CORE









        tristate









        select MFD_CORE









        select REGMAP









        default n



















config MFD_INTEL_M10_BMC_SPI









        tristate "Intel MAX 10 Board Management Controller with SPI"









        depends on SPI_MASTER









        select MFD_INTEL_M10_BMC_CORE









        select REGMAP_SPI_AVMM









	select MFD_CORE









        help









          Support for the Intel MAX 10 board management controller using the









          SPI interface.
































drivers/mfd/Makefile



+3
−1






























Original line number
Diff line number
Diff line







@@ -269,7 +269,9 @@ obj-$(CONFIG_MFD_QCOM_PM8008)	+= qcom-pm8008.o







obj-$(CONFIG_SGI_MFD_IOC3)	+= ioc3.o









obj-$(CONFIG_MFD_SIMPLE_MFD_I2C)	+= simple-mfd-i2c.o









obj-$(CONFIG_MFD_SMPRO)		+= smpro-core.o









obj-$(CONFIG_MFD_INTEL_M10_BMC)   += intel-m10-bmc.o



















obj-$(CONFIG_MFD_INTEL_M10_BMC_CORE)   += intel-m10-bmc-core.o









obj-$(CONFIG_MFD_INTEL_M10_BMC_SPI)    += intel-m10-bmc-spi.o



















obj-$(CONFIG_MFD_ATC260X)	+= atc260x-core.o









obj-$(CONFIG_MFD_ATC260X_I2C)	+= atc260x-i2c.o