mirrors/linux
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git synced 2025-12-27 11:06:41 -05:00
Code Issues Packages Projects Releases Wiki Activity

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

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

Allow building the MFD STMPE driver as module.
This commit is contained in:
Bartosz Golaszewski
2025-09-04 15:05:47 +02:00
parent d3441febbb df6a440039
commit da33df43e5
2 changed files with 11 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
drivers/mfd/Kconfig
View File

@@ -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

6
drivers/mfd/stmpe.c
View File

@@ -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");