regmap: Use select .. if to get IRQ_DOMAIN enabled

Ensure that we can't get randconfig breakage by doing the IRQ_DOMAIN
select automatically. Don't just do the select from REGMAP_IRQ to ensure
that the select actually gets noticed.

Reported-by: Randy Dunlap <rdunlap@xenotime.net>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>

diff --git a/drivers/base/regmap/Kconfig b/drivers/base/regmap/Kconfig
index 9ef0a5326f170e9f4b0b8c3a661842c2f98e2668..6be390bd8bd1bc3f0fa1e3bfc38cd56f36bfa6be 100644 (file)
--- a/drivers/base/regmap/Kconfig
+++ b/drivers/base/regmap/Kconfig
@@ -6,6 +6,7 @@ config REGMAP
        default y if (REGMAP_I2C || REGMAP_SPI)
        select LZO_COMPRESS
        select LZO_DECOMPRESS
+       select IRQ_DOMAIN if REGMAP_IRQ
        bool
 
 config REGMAP_I2C

diff --git a/drivers/mfd/Kconfig b/drivers/mfd/Kconfig
index e35cb6bc9003068279249c5eb2a1a653ce3cc890..213304de181e1b36c1377947f4205b8c01778322 100644 (file)
--- a/drivers/mfd/Kconfig
+++ b/drivers/mfd/Kconfig
@@ -376,7 +376,6 @@ config PMIC_DA9052
 
 config MFD_DA9052_SPI
        bool "Support Dialog Semiconductor DA9052/53 PMIC variants with SPI"
-       select IRQ_DOMAIN
        select REGMAP_SPI
        select REGMAP_IRQ
        select PMIC_DA9052
@@ -389,7 +388,6 @@ config MFD_DA9052_SPI
 
 config MFD_DA9052_I2C
        bool "Support Dialog Semiconductor DA9052/53 PMIC variants with I2C"
-       select IRQ_DOMAIN
        select REGMAP_I2C
        select REGMAP_IRQ
        select PMIC_DA9052
@@ -560,7 +558,6 @@ config MFD_WM8994
        bool "Support Wolfson Microelectronics WM8994"
        select MFD_CORE
        select REGMAP_I2C
-       select IRQ_DOMAIN
        select REGMAP_IRQ
        depends on I2C=y && GENERIC_HARDIRQS
        help