github-mirror/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux.git synced 2026-06-04 20:46:48 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity Graph

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

Browse Source 
Allow building the MFD STMPE driver as module.
 -----BEGIN PGP SIGNATURE-----
 
 iQIzBAABCgAdFiEEFp3rbAvDxGAT0sefEacuoBRx13IFAmi5jc4ACgkQEacuoBRx
 13J5CBAAthN5NuM8sDXz15GzzkHYrlDBUWNReMNFdJHZFTsTgiQPyq2ZZU6VeC1F
 0Sa3nKmuQLs08Kd2Msb9VvB4vzSlgWmiK+inheoqW0tMn5JE+pMkfMZEoIGU05B2
 UpH3gys34K9Sbhk4gmKnmQUaKHc6RsMHMA0CboWS50yWXiNNRUayhRAgDgZmpyP2
 X+Ryt2KVyD30umfWdwMEOQ78YtV5CY4lW0VgZQSAtrrduAGGYEQQF0k9T4t24w8g
 g7LwnX/jZkcXT/VDXUWPu0NNuGM6OfJwTVlfwh7j5x4g0wdSVJW12B0l1fYcd5EJ
 vfI1Hw1hylXvHRRV6mAGPrb4qaqQ6WUsbjdHw0u0fXEWdJCq38jhCsPKizRAjEkk
 Lv3967u8j8CNq+h7kb3rQxgPiF+Z3yj2m9TJHF3/MZOUR0md6Il4r/q4AXFlDTvn
 STxD0D2o22scgPDO3JLEjuuFFkjpjRL0G44UEecWEyQVYSVEy/fyaAYnnzcBX8uc
 1sncPTsvjGjRXKKgSU3Rtgbq8oLvuf7h6Xhl5FdUB2td7zojB1TQDn6k04ZDTJek
 CyM2Ookzqg4Oh1alJRUVXc4zkbJFGWsO2QmTQqWhi63HgaLKlnfzRhnKat6wrANJ
 O0kBB8Lq/zFFMnwnA5cQOwZj00Kq6JsUZzewqv4aRkHBs3tRRGU=
 =ZRFB
 -----END PGP SIGNATURE-----

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.
This commit is contained in:
Bartosz Golaszewski 2025-09-04 15:05:47 +02:00
commit da33df43e5
2 changed files with 11 additions and 5 deletions
Show Stats 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");