diff options
author | Linus Walleij <linus.walleij@linaro.org> | 2013-03-14 10:54:24 -0400 |
---|---|---|
committer | Samuel Ortiz <sameo@linux.intel.com> | 2013-04-05 12:10:30 -0400 |
commit | 58eb893da99815ebdeee6cb3eeac897b99a246f7 (patch) | |
tree | 5cb455cb327a5d056b851e19508f2b8df3d9138f /drivers/mfd | |
parent | 3de764d4aa40109806cf7f9a9d811b970ff49374 (diff) |
mfd: abx500: Move the AB8500 Kconfig fragment
Move the AB8500 Kconfig fragment below the AB3100 so the
menuconfig menu gets hierarchically nested and looks nice.
Having the EZX PCAP in the middle disturbs the nice
hierarchical layout from kconfig.
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
Signed-off-by: Samuel Ortiz <sameo@linux.intel.com>
Diffstat (limited to 'drivers/mfd')
-rw-r--r-- | drivers/mfd/Kconfig | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/drivers/mfd/Kconfig b/drivers/mfd/Kconfig index 3c50c388c78f..d5b9b051ef15 100644 --- a/drivers/mfd/Kconfig +++ b/drivers/mfd/Kconfig | |||
@@ -877,13 +877,6 @@ config AB3100_OTP | |||
877 | programmable memory) support. This exposes a sysfs file to read | 877 | programmable memory) support. This exposes a sysfs file to read |
878 | out OTP values. | 878 | out OTP values. |
879 | 879 | ||
880 | config EZX_PCAP | ||
881 | bool "PCAP Support" | ||
882 | depends on GENERIC_HARDIRQS && SPI_MASTER | ||
883 | help | ||
884 | This enables the PCAP ASIC present on EZX Phones. This is | ||
885 | needed for MMC, TouchScreen, Sound, USB, etc.. | ||
886 | |||
887 | config AB8500_CORE | 880 | config AB8500_CORE |
888 | bool "ST-Ericsson AB8500 Mixed Signal Power Management chip" | 881 | bool "ST-Ericsson AB8500 Mixed Signal Power Management chip" |
889 | depends on GENERIC_HARDIRQS && ABX500_CORE && MFD_DB8500_PRCMU | 882 | depends on GENERIC_HARDIRQS && ABX500_CORE && MFD_DB8500_PRCMU |
@@ -912,6 +905,13 @@ config AB8500_GPADC | |||
912 | help | 905 | help |
913 | AB8500 GPADC driver used to convert Acc and battery/ac/usb voltage | 906 | AB8500 GPADC driver used to convert Acc and battery/ac/usb voltage |
914 | 907 | ||
908 | config EZX_PCAP | ||
909 | bool "PCAP Support" | ||
910 | depends on GENERIC_HARDIRQS && SPI_MASTER | ||
911 | help | ||
912 | This enables the PCAP ASIC present on EZX Phones. This is | ||
913 | needed for MMC, TouchScreen, Sound, USB, etc.. | ||
914 | |||
915 | config MFD_DB8500_PRCMU | 915 | config MFD_DB8500_PRCMU |
916 | bool "ST-Ericsson DB8500 Power Reset Control Management Unit" | 916 | bool "ST-Ericsson DB8500 Power Reset Control Management Unit" |
917 | depends on UX500_SOC_DB8500 | 917 | depends on UX500_SOC_DB8500 |