Commit da33df43 authored by Bartosz Golaszewski's avatar Bartosz Golaszewski
Browse files

Merge tag 'gpio/mfd-stmpe-for-v6.18-rc1' of... 

Merge tag 'gpio/mfd-stmpe-for-v6.18-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/brgl/linux into gpio/for-next

Immutable branch between the MFD and GPIO trees for v6.18-rc1

Allow building the MFD STMPE driver as module.
parents d3441feb df6a4400

drivers/mfd/Kconfig

+5 −5
Original line number Diff line number Diff line
@@ -1539,8 +1539,8 @@ config MFD_DB8500_PRCMU 
	  through a register map.



config MFD_STMPE

	bool "STMicroelectronics STMPE"

	depends on I2C=y || SPI_MASTER=y

	tristate "STMicroelectronics STMPE"

	depends on I2C || SPI_MASTER

	depends on OF

	select MFD_CORE

	help
@@ -1568,14 +1568,14 @@ menu "STMicroelectronics STMPE Interface Drivers" 
depends on MFD_STMPE



config STMPE_I2C

	bool "STMicroelectronics STMPE I2C Interface"

	depends on I2C=y

	tristate "STMicroelectronics STMPE I2C Interface"

	depends on I2C

	default y

	help

	  This is used to enable I2C interface of STMPE



config STMPE_SPI

	bool "STMicroelectronics STMPE SPI Interface"

	tristate "STMicroelectronics STMPE SPI Interface"

	depends on SPI_MASTER

	help

	  This is used to enable SPI interface of STMPE

drivers/mfd/stmpe.c

+6 −0
Original line number Diff line number Diff line
@@ -1482,6 +1482,7 @@ int stmpe_probe(struct stmpe_client_info *ci, enum stmpe_partnum partnum) 


	return ret;

}

EXPORT_SYMBOL_GPL(stmpe_probe);



void stmpe_remove(struct stmpe *stmpe)

{
@@ -1494,6 +1495,7 @@ void stmpe_remove(struct stmpe *stmpe) 


	mfd_remove_devices(stmpe->dev);

}

EXPORT_SYMBOL_GPL(stmpe_remove);



static int stmpe_suspend(struct device *dev)

{
@@ -1517,3 +1519,7 @@ static int stmpe_resume(struct device *dev) 


EXPORT_GPL_SIMPLE_DEV_PM_OPS(stmpe_dev_pm_ops,

			     stmpe_suspend, stmpe_resume);



MODULE_DESCRIPTION("STMPE Core driver");

MODULE_AUTHOR("Rabin Vincent <rabin.vincent@stericsson.com>");

MODULE_LICENSE("GPL");