Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

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.

+11 -5
+5 -5
drivers/mfd/Kconfig
··· 1539 1539 through a register map. 1540 1540 1541 1541 config MFD_STMPE 1542 - bool "STMicroelectronics STMPE" 1543 - depends on I2C=y || SPI_MASTER=y 1542 + tristate "STMicroelectronics STMPE" 1543 + depends on I2C || SPI_MASTER 1544 1544 depends on OF 1545 1545 select MFD_CORE 1546 1546 help ··· 1568 1568 depends on MFD_STMPE 1569 1569 1570 1570 config STMPE_I2C 1571 - bool "STMicroelectronics STMPE I2C Interface" 1572 - depends on I2C=y 1571 + tristate "STMicroelectronics STMPE I2C Interface" 1572 + depends on I2C 1573 1573 default y 1574 1574 help 1575 1575 This is used to enable I2C interface of STMPE 1576 1576 1577 1577 config STMPE_SPI 1578 - bool "STMicroelectronics STMPE SPI Interface" 1578 + tristate "STMicroelectronics STMPE SPI Interface" 1579 1579 depends on SPI_MASTER 1580 1580 help 1581 1581 This is used to enable SPI interface of STMPE
+6
drivers/mfd/stmpe.c
··· 1482 1482 1483 1483 return ret; 1484 1484 } 1485 + EXPORT_SYMBOL_GPL(stmpe_probe); 1485 1486 1486 1487 void stmpe_remove(struct stmpe *stmpe) 1487 1488 { ··· 1495 1494 1496 1495 mfd_remove_devices(stmpe->dev); 1497 1496 } 1497 + EXPORT_SYMBOL_GPL(stmpe_remove); 1498 1498 1499 1499 static int stmpe_suspend(struct device *dev) 1500 1500 { ··· 1519 1517 1520 1518 EXPORT_GPL_SIMPLE_DEV_PM_OPS(stmpe_dev_pm_ops, 1521 1519 stmpe_suspend, stmpe_resume); 1520 + 1521 + MODULE_DESCRIPTION("STMPE Core driver"); 1522 + MODULE_AUTHOR("Rabin Vincent <rabin.vincent@stericsson.com>"); 1523 + MODULE_LICENSE("GPL");