Skip to content

Commit 73e52f8

Browse files
charleskeepaxlag-linaro
authored andcommitted
mfd: Minor Cirrus/Maxim Kconfig order fixes
Move some Cirrus parts so they are grouped together alphabetically in menuconfig. Also move the Maxim 5970 out of the middle of the Cirrus parts and put it with the other Maxim parts. No functional changes just alphabetising. Signed-off-by: Charles Keepax <[email protected]> Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Lee Jones <[email protected]>
1 parent 8b96324 commit 73e52f8

File tree

1 file changed

+48
-48
lines changed

1 file changed

+48
-48
lines changed

drivers/mfd/Kconfig

Lines changed: 48 additions & 48 deletions
Original file line numberDiff line numberDiff line change
@@ -261,6 +261,36 @@ config MFD_CROS_EC_DEV
261261
To compile this driver as a module, choose M here: the module will be
262262
called cros-ec-dev.
263263

264+
config MFD_CS40L50_CORE
265+
tristate
266+
select MFD_CORE
267+
select FW_CS_DSP
268+
select REGMAP_IRQ
269+
270+
config MFD_CS40L50_I2C
271+
tristate "Cirrus Logic CS40L50 (I2C)"
272+
select REGMAP_I2C
273+
select MFD_CS40L50_CORE
274+
depends on I2C
275+
help
276+
Select this to support the Cirrus Logic CS40L50 Haptic
277+
Driver over I2C.
278+
279+
This driver can be built as a module. If built as a module it will be
280+
called "cs40l50-i2c".
281+
282+
config MFD_CS40L50_SPI
283+
tristate "Cirrus Logic CS40L50 (SPI)"
284+
select REGMAP_SPI
285+
select MFD_CS40L50_CORE
286+
depends on SPI
287+
help
288+
Select this to support the Cirrus Logic CS40L50 Haptic
289+
Driver over SPI.
290+
291+
This driver can be built as a module. If built as a module it will be
292+
called "cs40l50-spi".
293+
264294
config MFD_CS42L43
265295
tristate
266296
select MFD_CORE
@@ -285,6 +315,14 @@ config MFD_CS42L43_SDW
285315
Select this to support the Cirrus Logic CS42L43 PC CODEC with
286316
headphone and class D speaker drivers over SoundWire.
287317

318+
config MFD_LOCHNAGAR
319+
bool "Cirrus Logic Lochnagar Audio Development Board"
320+
select MFD_CORE
321+
select REGMAP_I2C
322+
depends on I2C=y && OF
323+
help
324+
Support for Cirrus Logic Lochnagar audio development board.
325+
288326
config MFD_MACSMC
289327
tristate "Apple Silicon System Management Controller (SMC)"
290328
depends on ARCH_APPLE || COMPILE_TEST
@@ -332,16 +370,6 @@ config MFD_MADERA_SPI
332370
Support for the Cirrus Logic Madera platform audio SoC
333371
core functionality controlled via SPI.
334372

335-
config MFD_MAX5970
336-
tristate "Maxim 5970/5978 power switch and monitor"
337-
depends on I2C && OF
338-
select MFD_SIMPLE_MFD_I2C
339-
help
340-
This driver controls a Maxim 5970/5978 switch via I2C bus.
341-
The MAX5970/5978 is a smart switch with no output regulation, but
342-
fault protection and voltage and current monitoring capabilities.
343-
Also it supports upto 4 indication leds.
344-
345373
config MFD_CS47L15
346374
bool "Cirrus Logic CS47L15"
347375
select PINCTRL_CS47L15
@@ -848,6 +876,16 @@ config MFD_88PM886_PMIC
848876
This includes the I2C driver and the core APIs _only_, you have to
849877
select individual components like onkey under the corresponding menus.
850878

879+
config MFD_MAX5970
880+
tristate "Maxim 5970/5978 power switch and monitor"
881+
depends on I2C && OF
882+
select MFD_SIMPLE_MFD_I2C
883+
help
884+
This driver controls a Maxim 5970/5978 switch via I2C bus.
885+
The MAX5970/5978 is a smart switch with no output regulation, but
886+
fault protection and voltage and current monitoring capabilities.
887+
Also it supports upto 4 indication leds.
888+
851889
config MFD_MAX14577
852890
tristate "Maxim Semiconductor MAX14577/77836 MUIC + Charger Support"
853891
depends on I2C
@@ -1970,14 +2008,6 @@ config MFD_VX855
19702008
VIA VX855/VX875 south bridge. You will need to enable the vx855_spi
19712009
and/or vx855_gpio drivers for this to do anything useful.
19722010

1973-
config MFD_LOCHNAGAR
1974-
bool "Cirrus Logic Lochnagar Audio Development Board"
1975-
select MFD_CORE
1976-
select REGMAP_I2C
1977-
depends on I2C=y && OF
1978-
help
1979-
Support for Cirrus Logic Lochnagar audio development board.
1980-
19812011
config MFD_ARIZONA
19822012
select REGMAP
19832013
select REGMAP_IRQ
@@ -2335,36 +2365,6 @@ config MCP_UCB1200_TS
23352365

23362366
endmenu
23372367

2338-
config MFD_CS40L50_CORE
2339-
tristate
2340-
select MFD_CORE
2341-
select FW_CS_DSP
2342-
select REGMAP_IRQ
2343-
2344-
config MFD_CS40L50_I2C
2345-
tristate "Cirrus Logic CS40L50 (I2C)"
2346-
select REGMAP_I2C
2347-
select MFD_CS40L50_CORE
2348-
depends on I2C
2349-
help
2350-
Select this to support the Cirrus Logic CS40L50 Haptic
2351-
Driver over I2C.
2352-
2353-
This driver can be built as a module. If built as a module it will be
2354-
called "cs40l50-i2c".
2355-
2356-
config MFD_CS40L50_SPI
2357-
tristate "Cirrus Logic CS40L50 (SPI)"
2358-
select REGMAP_SPI
2359-
select MFD_CS40L50_CORE
2360-
depends on SPI
2361-
help
2362-
Select this to support the Cirrus Logic CS40L50 Haptic
2363-
Driver over SPI.
2364-
2365-
This driver can be built as a module. If built as a module it will be
2366-
called "cs40l50-spi".
2367-
23682368
config MFD_VEXPRESS_SYSREG
23692369
tristate "Versatile Express System Registers"
23702370
depends on VEXPRESS_CONFIG && GPIOLIB

0 commit comments

Comments
 (0)