Skip to content

Commit 680ef57

Browse files
andredlag-linaro
authored andcommitted
mfd: sec: Split into core and transport (i2c) drivers
As a preparation for adding support for Samsung's S2MPG10, which is connected via SPEEDY / ACPM rather than I2C, split out (move) all I2C-specific driver code into its own kernel module, sec-i2c, and make the existing sec-core module be just the transport-agnostic core driver kernel module. At the same time, update all defconfigs that reference the old kconfig symbol name. While at it, also update file header comments and module description(s) to drop references to 'mfd', and update comments to be C-style, not C++. Reviewed-by: Krzysztof Kozlowski <[email protected]> Signed-off-by: André Draszik <[email protected]> Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Lee Jones <[email protected]>
1 parent 8b88b5e commit 680ef57

File tree

9 files changed

+287
-227
lines changed

9 files changed

+287
-227
lines changed

arch/arm/configs/exynos_defconfig

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -167,7 +167,7 @@ CONFIG_MFD_MAX77686=y
167167
CONFIG_MFD_MAX77693=y
168168
CONFIG_MFD_MAX8997=y
169169
CONFIG_MFD_MAX8998=y
170-
CONFIG_MFD_SEC_CORE=y
170+
CONFIG_MFD_SEC_I2C=y
171171
CONFIG_MFD_STMPE=y
172172
CONFIG_STMPE_I2C=y
173173
CONFIG_MFD_TPS65090=y

arch/arm/configs/multi_v7_defconfig

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -612,7 +612,7 @@ CONFIG_MFD_QCOM_RPM=y
612612
CONFIG_MFD_SPMI_PMIC=y
613613
CONFIG_MFD_RK8XX_I2C=y
614614
CONFIG_MFD_RN5T618=y
615-
CONFIG_MFD_SEC_CORE=y
615+
CONFIG_MFD_SEC_I2C=y
616616
CONFIG_MFD_STMPE=y
617617
CONFIG_MFD_PALMAS=y
618618
CONFIG_MFD_TPS65090=y

arch/arm/configs/pxa_defconfig

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -335,7 +335,7 @@ CONFIG_MFD_MAX77693=y
335335
CONFIG_MFD_MAX8907=m
336336
CONFIG_EZX_PCAP=y
337337
CONFIG_UCB1400_CORE=m
338-
CONFIG_MFD_SEC_CORE=y
338+
CONFIG_MFD_SEC_I2C=y
339339
CONFIG_MFD_PALMAS=y
340340
CONFIG_MFD_TPS65090=y
341341
CONFIG_MFD_TPS6586X=y

arch/arm64/configs/defconfig

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -769,7 +769,7 @@ CONFIG_MFD_MT6397=y
769769
CONFIG_MFD_SPMI_PMIC=y
770770
CONFIG_MFD_RK8XX_I2C=y
771771
CONFIG_MFD_RK8XX_SPI=y
772-
CONFIG_MFD_SEC_CORE=y
772+
CONFIG_MFD_SEC_I2C=y
773773
CONFIG_MFD_SL28CPLD=y
774774
CONFIG_RZ_MTU3=y
775775
CONFIG_MFD_TI_AM335X_TSCADC=m

drivers/mfd/Kconfig

Lines changed: 11 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1312,21 +1312,25 @@ config MFD_RN5T618
13121312
functionality of the device.
13131313

13141314
config MFD_SEC_CORE
1315-
tristate "Samsung Electronics PMIC Series Support"
1315+
tristate
1316+
select MFD_CORE
1317+
select REGMAP_IRQ
1318+
1319+
config MFD_SEC_I2C
1320+
tristate "Samsung Electronics S2MPA/S2MPS1X/S2MPU/S5M series PMICs"
13161321
depends on I2C=y
13171322
depends on OF
1318-
select MFD_CORE
1323+
select MFD_SEC_CORE
13191324
select REGMAP_I2C
1320-
select REGMAP_IRQ
13211325
help
1322-
Support for the Samsung Electronics PMIC devices coming
1323-
usually along with Samsung Exynos SoC chipset.
1326+
Support for the Samsung Electronics PMIC devices with I2C interface
1327+
coming usually along with Samsung Exynos SoC chipset.
13241328
This driver provides common support for accessing the device,
13251329
additional drivers must be enabled in order to use the functionality
1326-
of the device
1330+
of the device.
13271331

13281332
To compile this driver as a module, choose M here: the
1329-
module will be called sec-core.
1333+
module will be called sec-i2c.
13301334
Have in mind that important core drivers (like regulators) depend
13311335
on this driver so building this as a module might require proper
13321336
initial ramdisk or might not boot up as well in certain scenarios.

drivers/mfd/Makefile

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -230,6 +230,7 @@ obj-$(CONFIG_MFD_RK8XX_I2C) += rk8xx-i2c.o
230230
obj-$(CONFIG_MFD_RK8XX_SPI) += rk8xx-spi.o
231231
obj-$(CONFIG_MFD_RN5T618) += rn5t618.o
232232
obj-$(CONFIG_MFD_SEC_CORE) += sec-core.o sec-irq.o
233+
obj-$(CONFIG_MFD_SEC_I2C) += sec-i2c.o
233234
obj-$(CONFIG_MFD_SYSCON) += syscon.o
234235
obj-$(CONFIG_MFD_LM3533) += lm3533-core.o lm3533-ctrlbank.o
235236
obj-$(CONFIG_MFD_VEXPRESS_SYSREG) += vexpress-sysreg.o

0 commit comments

Comments
 (0)