minor cleanup of some of the MFD and associated options (NFC)

5 files changed, 70 insertions, 78 deletions

diff --git a/config-arm64 b/config-arm64
index b8d477f3c..c13e44f5f 100644
--- a/config-arm64
+++ b/config-arm64
@@ -164,6 +164,7 @@ CONFIG_ARCH_TEGRA_132_SOC=y
 CONFIG_ARCH_TEGRA_210_SOC=y
 CONFIG_TEGRA210_ADMA=y
 CONFIG_MFD_MAX77620=y
+CONFIG_REGULATOR_MAX77620=m
 
 # AllWinner
 CONFIG_MACH_SUN50I=y
diff --git a/config-armv7-generic b/config-armv7-generic
index a1e4bf95e..5f275be66 100644
--- a/config-armv7-generic
+++ b/config-armv7-generic
@@ -577,7 +577,6 @@ CONFIG_RTC_DRV_DS1390=m
 CONFIG_RTC_DRV_M41T93=m
 CONFIG_RTC_DRV_M41T94=m
 CONFIG_RTC_DRV_MAX6902=m
-CONFIG_RTC_DRV_PCF2123=m
 CONFIG_RTC_DRV_R9701=m
 CONFIG_RTC_DRV_RS5C348=m
 CONFIG_RTC_DRV_RX4581=m
diff --git a/config-generic b/config-generic
index 03f129372..8ac3fbb59 100644
--- a/config-generic
+++ b/config-generic
@@ -4442,82 +4442,90 @@ CONFIG_MFD_SM501=m
 CONFIG_MFD_SM501_GPIO=y
 CONFIG_MFD_RTSX_PCI=m
 CONFIG_MFD_RTSX_USB=m
-# CONFIG_MFD_TI_AM335X_TSCADC is not set
 CONFIG_MFD_VIPERBOARD=m
-# CONFIG_MFD_RETU is not set
-# CONFIG_MFD_TC6393XB is not set
-# CONFIG_MFD_WM8400 is not set
-# CONFIG_MFD_WM8350_I2C is not set
-# CONFIG_MFD_WM8350 is not set
-# CONFIG_MFD_WM831X is not set
 # CONFIG_AB3100_OTP is not set
-# CONFIG_MFD_TIMBERDALE is not set
-# CONFIG_MFD_WM8994 is not set
-# CONFIG_MFD_88PM860X is not set
-# CONFIG_LPC_SCH is not set
-# CONFIG_LPC_ICH is not set
-# CONFIG_HTC_I2CPLD is not set
-# CONFIG_MFD_MAX8925 is not set
-# CONFIG_MFD_ASIC3 is not set
-# CONFIG_MFD_AS3722 is not set
-# CONFIG_HTC_EGPIO is not set
-# CONFIG_TPS6507X is not set
 # CONFIG_ABX500_CORE is not set
-# CONFIG_MFD_RDC321X is not set
-# CONFIG_MFD_JANZ_CMODIO is not set
-# CONFIG_MFD_KEMPLD is not set
-# CONFIG_MFD_WM831X_I2C is not set
-# CONFIG_MFD_CS5535 is not set
-# CONFIG_MFD_STMPE is not set
-# CONFIG_MFD_MAX8998 is not set
-# CONFIG_MFD_MT6397 is not set
-# CONFIG_MFD_TPS6586X is not set
-# CONFIG_MFD_TC3589X is not set
-# CONFIG_MFD_WL1273_CORE is not set
-# CONFIG_MFD_TPS65217 is not set
-# CONFIG_MFD_LM3533 is not set
-# CONFIG_MFD_MC13XXX_I2C is not set
-# CONFIG_MFD_ARIZONA is not set
+# CONFIG_EZX_PCAP is not set
+# CONFIG_HTC_EGPIO is not set
+# CONFIG_HTC_I2CPLD is not set
+# CONFIG_INTEL_SOC_PMIC is not set
+# CONFIG_LPC_ICH is not set
+# CONFIG_LPC_SCH is not set
+# CONFIG_MFD_88PM800 is not set
+# CONFIG_MFD_88PM805 is not set
+# CONFIG_MFD_88PM860X is not set
+# CONFIG_MFD_ACT8945A is not set
 # CONFIG_MFD_ARIZONA_I2C is not set
+# CONFIG_MFD_ARIZONA is not set
+# CONFIG_MFD_ARIZONA_SPI is not set
+# CONFIG_MFD_AS3722 is not set
+# CONFIG_MFD_ASIC3 is not set
+# CONFIG_MFD_ATMEL_FLEXCOM is not set
+# CONFIG_MFD_ATMEL_HLCDC is not set
+# CONFIG_MFD_AXP20X_I2C is not set
+# CONFIG_MFD_AXP20X_RSB is not set
+# CONFIG_MFD_BCM590XX is not set
 # CONFIG_MFD_CROS_EC is not set
-# CONFIG_MFD_SI476X_CORE is not set
-# CONFIG_MFD_TPS65912 is not set
-# CONFIG_MFD_TPS65912_SPI is not set
-# CONFIG_MFD_TPS65912_I2C is not set
-# CONFIG_MFD_SYSCON is not set
+# CONFIG_MFD_CS5535 is not set
+# CONFIG_MFD_DA9052_SPI is not set
+# CONFIG_MFD_DA9062 is not set
 # CONFIG_MFD_DA9063 is not set
+# CONFIG_MFD_DA9150 is not set
 # CONFIG_MFD_DLN2 is not set
+# CONFIG_MFD_HI6421_PMIC is not set
+# CONFIG_MFD_JANZ_CMODIO is not set
+# CONFIG_MFD_KEMPLD is not set
+# CONFIG_MFD_LM3533 is not set
 # CONFIG_MFD_LP3943 is not set
-# CONFIG_MFD_ATMEL_HLCDC is not set
-# CONFIG_MFD_BCM590XX is not set
-# CONFIG_MFD_TPS65218 is not set
-# CONFIG_MFD_WM831X_SPI is not set
-# CONFIG_MFD_ARIZONA_SPI is not set
+# CONFIG_MFD_MAX14577 is not set
+# CONFIG_MFD_MAX77620 is not set
+# CONFIG_MFD_MAX77686 is not set
+# CONFIG_MFD_MAX77693 is not set
+# CONFIG_MFD_MAX77843 is not set
+# CONFIG_MFD_MAX8907 is not set
+# CONFIG_MFD_MAX8925 is not set
+# CONFIG_MFD_MAX8997 is not set
+# CONFIG_MFD_MAX8998 is not set
+# CONFIG_MFD_MC13XXX_I2C is not set
 # CONFIG_MFD_MC13XXX_SPI is not set
-# CONFIG_MFD_DA9052_SPI is not set
 # CONFIG_MFD_MENF21BMC is not set
-# CONFIG_MFD_HI6421_PMIC is not set
+# CONFIG_MFD_MT6397 is not set
+# CONFIG_MFD_PALMAS is not set
+# CONFIG_MFD_RDC321X is not set
+# CONFIG_MFD_RETU is not set
 # CONFIG_MFD_RK808 is not set
 # CONFIG_MFD_RN5T618 is not set
-# CONFIG_MFD_DA9150 is not set
 # CONFIG_MFD_RT5033 is not set
+# CONFIG_MFD_SI476X_CORE is not set
 # CONFIG_MFD_SKY81452 is not set
-# CONFIG_MFD_MAX77843 is not set
-# CONFIG_MFD_DA9062 is not set
-# CONFIG_EZX_PCAP is not set
-# CONFIG_INTEL_SOC_PMIC is not set
-# CONFIG_MFD_ATMEL_FLEXCOM is not set
-# CONFIG_TS4800_IRQ is not set
-# CONFIG_MFD_ACT8945A is not set
-# CONFIG_MFD_AXP20X_I2C is not set
-# CONFIG_MFD_AXP20X_RSB is not set
-# CONFIG_MFD_88PM800 is not set
-# CONFIG_MFD_88PM805 is not set
-# CONFIG_MFD_MAX77686 is not set
-# CONFIG_MFD_MAX8907 is not set
+# CONFIG_MFD_STMPE is not set
+# CONFIG_MFD_SYSCON is not set
+# CONFIG_MFD_TC3589X is not set
+# CONFIG_MFD_TC6393XB is not set
+# CONFIG_MFD_TI_AM335X_TSCADC is not set
+# CONFIG_MFD_TIMBERDALE is not set
 # CONFIG_MFD_TPS65086 is not set
-# CONFIG_MFD_MAX77620 is not set
-# CONFIG_MFD_MAX77693 is not set
+# CONFIG_MFD_TPS65090 is not set
+# CONFIG_MFD_TPS65217 is not set
+# CONFIG_MFD_TPS65218 is not set
+# CONFIG_MFD_TPS6586X is not set
+# CONFIG_MFD_TPS65910 is not set
+# CONFIG_MFD_TPS65912 is not set
+# CONFIG_MFD_TPS65912_I2C is not set
+# CONFIG_MFD_TPS65912_SPI is not set
+# CONFIG_MFD_TPS80031 is not set
+# CONFIG_MFD_WL1273_CORE is not set
+# CONFIG_MFD_WM831X_I2C is not set
+# CONFIG_MFD_WM831X is not set
+# CONFIG_MFD_WM831X_SPI is not set
+# CONFIG_MFD_WM8350_I2C is not set
+# CONFIG_MFD_WM8350 is not set
+# CONFIG_MFD_WM8400 is not set
+# CONFIG_MFD_WM8994 is not set
+# CONFIG_TPS6507X is not set
+# CONFIG_TS4800_IRQ is not set
+# CONFIG_TWL4030_CORE is not set
+# CONFIG_TWL6040_CORE is not set
 
 #
 # File systems
diff --git a/config-powerpc64-generic b/config-powerpc64-generic
index af4bbb251..6135a9bd0 100644
--- a/config-powerpc64-generic
+++ b/config-powerpc64-generic
@@ -321,10 +321,6 @@ CONFIG_GPIO_WM831X=m
 # CONFIG_CAN_MSCAN is not set
 # CONFIG_CAN_MPC5XXX is not set
 # CONFIG_PMIC_ADP5520 is not set
-# CONFIG_MFD_MAX8997 is not set
-# CONFIG_MFD_TPS65910 is not set
-# CONFIG_MFD_TPS65912_I2C is not set
-# CONFIG_MFD_WL1273_CORE is not set
 # CONFIG_XPS_USB_HCD_XILINX is not set
 # CONFIG_MMC_SDHCI_OF_HLWD is not set
 
diff --git a/config-x86-generic b/config-x86-generic
index d7dc0e365..8ae20bab7 100644
--- a/config-x86-generic
+++ b/config-x86-generic
@@ -437,22 +437,10 @@ CONFIG_GPIO_ICH=m
 # CONFIG_MFD_DA9055 is not set
 # CONFIG_MFD_88PM800 is not set
 # CONFIG_MFD_88PM805 is not set
-# CONFIG_MFD_MAX14577 is not set
-# CONFIG_MFD_MAX77686 is not set
-# CONFIG_MFD_MAX77693 is not set
-# CONFIG_MFD_MAX8907 is not set
-# CONFIG_MFD_MAX8997 is not set
 # CONFIG_MFD_RC5T583 is not set
 # CONFIG_MFD_SEC_CORE is not set
 # CONFIG_MFD_SMSC is not set
 # CONFIG_MFD_LP8788 is not set
-# CONFIG_MFD_PALMAS is not set
-# CONFIG_MFD_TPS65090 is not set
-# CONFIG_MFD_TPS65910 is not set
-# CONFIG_MFD_TPS65912_I2C is not set
-# CONFIG_MFD_TPS80031 is not set
-# CONFIG_TWL4030_CORE is not set
-# CONFIG_TWL6040_CORE is not set
 
 CONFIG_PCI_CNB20LE_QUIRK=y