diff options
author | Linus Walleij <linus.walleij@linaro.org> | 2011-05-15 16:53:56 -0400 |
---|---|---|
committer | Linus Walleij <linus.walleij@linaro.org> | 2011-05-24 16:14:31 -0400 |
commit | 650c2a2145981696c414be1d540a32447d0e353e (patch) | |
tree | f05aadb054bffb88fee3056b78310b148ceed9bf /drivers/mfd/Kconfig | |
parent | 118718905de6e32c11e09a8f41c7abff6155ba19 (diff) |
mach-ux500: move the DB8500 PRCMU driver to MFD
We have decided that this function arbiter fits better in the MFD
subsystem. Since we need to concatenate the split header files we move
it basically like this:
mv mach-ux500/prcmu-db8500.c drivers/mfd/db8500-prcmu.c
mv mach-ux500/include/mach/prcmu-defs.h include/linux/mfd/db8500-prcmu.h
mv mach-ux500/include/mach/prcmu-regs.h drivers/mfd/db8500-prcmu-regs.h
mach-ux500/include/mach/prcmu.h >> include/linux/mfd/db8500-prcmu.h
rm arch/arm/mach-ux500/include/mach/prcmu.h
Then we update different #include statements and Makefile orders etc
to make the PRCMU driver compile, link and boot in the new place
without really changing any code.
Acked-by: Samuel Ortiz <sameo@linux.intel.com>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
Diffstat (limited to 'drivers/mfd/Kconfig')
-rw-r--r-- | drivers/mfd/Kconfig | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/drivers/mfd/Kconfig b/drivers/mfd/Kconfig index 3ed3ff06be5d..7eaeb9750793 100644 --- a/drivers/mfd/Kconfig +++ b/drivers/mfd/Kconfig | |||
@@ -538,7 +538,7 @@ config AB8500_CORE | |||
538 | 538 | ||
539 | config AB8500_I2C_CORE | 539 | config AB8500_I2C_CORE |
540 | bool "AB8500 register access via PRCMU I2C" | 540 | bool "AB8500 register access via PRCMU I2C" |
541 | depends on AB8500_CORE && UX500_SOC_DB8500 | 541 | depends on AB8500_CORE && MFD_DB8500_PRCMU |
542 | default y | 542 | default y |
543 | help | 543 | help |
544 | This enables register access to the AB8500 chip via PRCMU I2C. | 544 | This enables register access to the AB8500 chip via PRCMU I2C. |
@@ -575,6 +575,16 @@ config AB3550_CORE | |||
575 | LEDs, vibrator, system power and temperature, power management | 575 | LEDs, vibrator, system power and temperature, power management |
576 | and ALSA sound. | 576 | and ALSA sound. |
577 | 577 | ||
578 | config MFD_DB8500_PRCMU | ||
579 | bool "ST-Ericsson DB8500 Power Reset Control Management Unit" | ||
580 | depends on UX500_SOC_DB8500 | ||
581 | select MFD_CORE | ||
582 | help | ||
583 | Select this option to enable support for the DB8500 Power Reset | ||
584 | and Control Management Unit. This is basically an autonomous | ||
585 | system controller running an XP70 microprocessor, which is accessed | ||
586 | through a register map. | ||
587 | |||
578 | config MFD_CS5535 | 588 | config MFD_CS5535 |
579 | tristate "Support for CS5535 and CS5536 southbridge core functions" | 589 | tristate "Support for CS5535 and CS5536 southbridge core functions" |
580 | select MFD_CORE | 590 | select MFD_CORE |