mfd: da9055: Drop "select PMIC_DA9055"

[cascardo/linux.git] / drivers / mfd / Kconfig

diff --git a/drivers/mfd/Kconfig b/drivers/mfd/Kconfig
index 671f5b1..cc7f6a2 100644 (file)
--- a/drivers/mfd/Kconfig
+++ b/drivers/mfd/Kconfig
@@ -21,6 +21,35 @@ config MFD_88PM860X
          select individual components like voltage regulators, RTC and
          battery-charger under the corresponding menus.
 
+config MFD_CROS_EC
+       tristate "Support ChromeOS Embedded Controller"
+       select MFD_CORE
+       help
+         If you say Y here you get support for the ChromeOS Embedded
+         Controller (EC) providing keyboard, battery and power services.
+         You also ned to enable the driver for the bus you are using. The
+         protocol for talking to the EC is defined by the bus driver.
+
+config MFD_CROS_EC_I2C
+       tristate "ChromeOS Embedded Controller (I2C)"
+       depends on MFD_CROS_EC && I2C
+
+       help
+         If you say Y here, you get support for talking to the ChromeOS
+         EC through an I2C bus. This uses a simple byte-level protocol with
+         a checksum. Failing accesses will be retried three times to
+         improve reliability.
+
+config MFD_CROS_EC_SPI
+       tristate "ChromeOS Embedded Controller (SPI)"
+       depends on MFD_CROS_EC && SPI
+
+       ---help---
+         If you say Y here, you get support for talking to the ChromeOS EC
+         through a SPI bus, using a byte-level protocol. Since the EC's
+         response time cannot be guaranteed, we support ignoring
+         'pre-amble' bytes before the response actually starts.
+
 config MFD_88PM800
        tristate "Support Marvell 88PM800"
        depends on I2C=y && GENERIC_HARDIRQS
@@ -487,7 +516,6 @@ config MFD_DA9055
        bool "Dialog Semiconductor DA9055 PMIC Support"
        select REGMAP_I2C
        select REGMAP_IRQ
-       select PMIC_DA9055
        select MFD_CORE
        depends on I2C=y && GENERIC_HARDIRQS
        help
@@ -848,16 +876,10 @@ config AB3100_OTP
          programmable memory) support. This exposes a sysfs file to read
          out OTP values.
 
-config EZX_PCAP
-       bool "PCAP Support"
-       depends on GENERIC_HARDIRQS && SPI_MASTER
-       help
-         This enables the PCAP ASIC present on EZX Phones. This is
-         needed for MMC, TouchScreen, Sound, USB, etc..
-
 config AB8500_CORE
        bool "ST-Ericsson AB8500 Mixed Signal Power Management chip"
        depends on GENERIC_HARDIRQS && ABX500_CORE && MFD_DB8500_PRCMU
+       select POWER_SUPPLY
        select MFD_CORE
        select IRQ_DOMAIN
        help
@@ -882,6 +904,13 @@ config AB8500_GPADC
        help
          AB8500 GPADC driver used to convert Acc and battery/ac/usb voltage
 
+config EZX_PCAP
+       bool "PCAP Support"
+       depends on GENERIC_HARDIRQS && SPI_MASTER
+       help
+         This enables the PCAP ASIC present on EZX Phones. This is
+         needed for MMC, TouchScreen, Sound, USB, etc..
+
 config MFD_DB8500_PRCMU
        bool "ST-Ericsson DB8500 Power Reset Control Management Unit"
        depends on UX500_SOC_DB8500
@@ -1070,7 +1099,6 @@ config MFD_STA2X11
 
 config MFD_SYSCON
        bool "System Controller Register R/W Based on Regmap"
-       depends on OF
        select REGMAP_MMIO
        help
          Select this option to enable accessing system control registers