mfd: unused driver purge

deleted file mode 100644
index e8a54c2a5821..000000000000
@@ -1,38 +0,0 @@
-Marvell 88PM800 regulator
-
-Required properties:
-- compatible: "marvell,88pm800"
-- reg: I2C slave address
-- regulators: A node that houses a sub-node for each regulator within the
-  device. Each sub-node is identified using the node's name (or the deprecated
-  regulator-compatible property if present), with valid values listed below.
-  The content of each sub-node is defined by the standard binding for
-  regulators; see regulator.txt.
-
-The valid names for regulators are:
-
-  buck1, buck2, buck3, buck4, buck5, ldo1, ldo2, ldo3, ldo4, ldo5, ldo6, ldo7,
-  ldo8, ldo9, ldo10, ldo11, ldo12, ldo13, ldo14, ldo15, ldo16, ldo17, ldo18, ldo19
-
-Example:
-
-	pmic: 88pm800@31 {
-		compatible = "marvell,88pm800";
-		reg = <0x31>;
-
-		regulators {
-			buck1 {
-			        regulator-min-microvolt = <600000>;
-			        regulator-max-microvolt = <3950000>;
-			        regulator-boot-on;
-			        regulator-always-on;
-			};
-			ldo1 {
-			        regulator-min-microvolt = <600000>;
-			        regulator-max-microvolt = <15000000>;
-			        regulator-boot-on;
-			        regulator-always-on;
-			};
-...
-		};
-	};

index 169768e3d5bb..013ae22311ee 100644
@@ -23,16 +23,6 @@ config INPUT_88PM860X_ONKEY
 	  To compile this driver as a module, choose M here: the module
 	  will be called 88pm860x_onkey.
 
-config INPUT_88PM80X_ONKEY
-	tristate "88PM80x ONKEY support"
-	depends on MFD_88PM800
-	help
-	  Support the ONKEY of Marvell 88PM80x PMICs as an input device
-	  reporting power button status.
-
-	  To compile this driver as a module, choose M here: the module
-	  will be called 88pm80x_onkey.
-
 config INPUT_88PM886_ONKEY
 	tristate "Marvell 88PM886 onkey support"
 	depends on MFD_88PM886_PMIC

index 1339619f0769..b120799b05eb 100644
@@ -6,7 +6,6 @@
 # Each configuration option enables a list of files.
 
 obj-$(CONFIG_INPUT_88PM860X_ONKEY)	+= 88pm860x_onkey.o
-obj-$(CONFIG_INPUT_88PM80X_ONKEY)	+= 88pm80x_onkey.o
 obj-$(CONFIG_INPUT_88PM886_ONKEY)	+= 88pm886-onkey.o
 obj-$(CONFIG_INPUT_AB8500_PONKEY)	+= ab8500-ponkey.o
 obj-$(CONFIG_INPUT_AD714X)		+= ad714x.o

index e4fd4572472f..de81d2bb4917 100644
@@ -858,30 +858,6 @@ config MFD_KEMPLD
 	  This driver can also be built as a module. If so, the module
 	  will be called kempld-core.
 
-config MFD_88PM800
-	tristate "Marvell 88PM800"
-	depends on I2C
-	select REGMAP_I2C
-	select REGMAP_IRQ
-	select MFD_CORE
-	help
-	  This supports for Marvell 88PM800 Power Management IC.
-	  This includes the I2C driver and the core APIs _only_, you have to
-	  select individual components like voltage regulators, RTC and
-	  battery-charger under the corresponding menus.
-
-config MFD_88PM805
-	tristate "Marvell 88PM805"
-	depends on I2C
-	select REGMAP_I2C
-	select REGMAP_IRQ
-	select MFD_CORE
-	help
-	  This supports for Marvell 88PM805 Power Management IC. This includes
-	  the I2C driver and the core APIs _only_, you have to select individual
-	  components like codec device, headset/Mic device under the
-	  corresponding menus.
-
 config MFD_88PM860X
 	bool "Marvell 88PM8606/88PM8607"
 	depends on I2C=y

index 72d3944b0ad8..fe7156a5187a 100644
@@ -5,8 +5,6 @@
 
 88pm860x-objs			:= 88pm860x-core.o 88pm860x-i2c.o
 obj-$(CONFIG_MFD_88PM860X)	+= 88pm860x.o
-obj-$(CONFIG_MFD_88PM800)	+= 88pm800.o 88pm80x.o
-obj-$(CONFIG_MFD_88PM805)	+= 88pm805.o 88pm80x.o
 obj-$(CONFIG_MFD_88PM886_PMIC)	+= 88pm886.o
 obj-$(CONFIG_MFD_ACT8945A)	+= act8945a.o
 obj-$(CONFIG_MFD_SM501)		+= sm501.o

index 89789ac7a786..73b43dc1b3be 100644
@@ -75,16 +75,6 @@ config REGULATOR_88PG86X
 	  They provide two I2C-controlled DC/DC step-down converters with
 	  sleep mode and separate enable pins.
 
-config REGULATOR_88PM800
-	tristate "Marvell 88PM800 Power regulators"
-	depends on MFD_88PM800
-	help
-	  This driver supports Marvell 88PM800 voltage regulator chips.
-	  It delivers digitally programmable output,
-	  the voltage is programmed via I2C interface.
-	  It's suitable to support PXA988 chips to control VCC_MAIN and
-	  various voltages.
-
 config REGULATOR_88PM8607
 	tristate "Marvell 88PM8607 Power regulators"
 	depends on MFD_88PM860X=y

index 5a764cec8df8..972f105567b5 100644
@@ -12,7 +12,6 @@ obj-$(CONFIG_REGULATOR_VIRTUAL_CONSUMER) += virtual.o
 obj-$(CONFIG_REGULATOR_USERSPACE_CONSUMER) += userspace-consumer.o
 
 obj-$(CONFIG_REGULATOR_88PG86X) += 88pg86x.o
-obj-$(CONFIG_REGULATOR_88PM800) += 88pm800-regulator.o
 obj-$(CONFIG_REGULATOR_88PM8607) += 88pm8607.o
 obj-$(CONFIG_REGULATOR_88PM886) += 88pm886-regulator.o
 obj-$(CONFIG_REGULATOR_CROS_EC) += cros-ec-regulator.o

index 0636b9ead2c2..5674211afe91 100644
@@ -172,16 +172,6 @@ config RTC_DRV_88PM860X
 	  This driver can also be built as a module. If so, the module
 	  will be called rtc-88pm860x.
 
-config RTC_DRV_88PM80X
-	tristate "Marvell 88PM80x"
-	depends on MFD_88PM800
-	help
-	  If you say yes here you get support for RTC function in Marvell
-	  88PM80x chips.
-
-	  This driver can also be built as a module. If so, the module
-	  will be called rtc-88pm80x.
-
 config RTC_DRV_88PM886
 	tristate "Marvell 88PM886 RTC driver"
 	depends on MFD_88PM886_PMIC

index 0347645b021f..84bb2af5849e 100644
@@ -19,7 +19,6 @@ obj-$(CONFIG_RTC_LIB_KUNIT_TEST)	+= test_rtc_lib.o
 
 # Keep the list ordered.
 
-obj-$(CONFIG_RTC_DRV_88PM80X)	+= rtc-88pm80x.o
 obj-$(CONFIG_RTC_DRV_88PM860X)	+= rtc-88pm860x.o
 obj-$(CONFIG_RTC_DRV_88PM886)	+= rtc-88pm886.o
 obj-$(CONFIG_RTC_DRV_AB8500)	+= rtc-ab8500.o

index a48586bb8edb..aef0db9fe101 100644
@@ -1946,14 +1946,6 @@ config GPIO_PCIE_IDIO_24
 	  Input filter control is not supported by this driver, and the input
 	  filters are deactivated by this driver.
 
-config GPIO_RDC321X
-	tristate "RDC R-321x GPIO support"
-	select MFD_CORE
-	select MFD_RDC321X
-	help
-	  Support for the RDC R321x SoC GPIOs over southbridge
-	  PCI configuration space.
-
 config GPIO_SODAVILLE
 	bool "Intel Sodaville GPIO support"
 	depends on X86 && OF

index dc9e6d643b5b..2e3a14688b59 100644
@@ -156,7 +156,6 @@ obj-$(CONFIG_GPIO_RASPBERRYPI_EXP)	+= gpio-raspberrypi-exp.o
 obj-$(CONFIG_GPIO_RC5T583)		+= gpio-rc5t583.o
 obj-$(CONFIG_GPIO_RCAR)			+= gpio-rcar.o
 obj-$(CONFIG_GPIO_RDA)			+= gpio-rda.o
-obj-$(CONFIG_GPIO_RDC321X)		+= gpio-rdc321x.o
 obj-$(CONFIG_GPIO_REALTEK_OTTO)		+= gpio-realtek-otto.o
 obj-$(CONFIG_GPIO_REG)			+= gpio-reg.o
 obj-$(CONFIG_GPIO_ROCKCHIP)	+= gpio-rockchip.o

index de81d2bb4917..ce0c39b50af7 100644
@@ -1289,15 +1289,6 @@ config MFD_SY7636A
 	  To enable support for building sub-devices as modules,
 	  choose M here.
 
-config MFD_RDC321X
-	tristate "RDC R-321x southbridge"
-	select MFD_CORE
-	depends on PCI
-	help
-	  Say yes here if you want to have support for the RDC R-321x SoC
-	  southbridge which provides access to GPIOs and Watchdog using the
-	  southbridge PCI device configuration space.
-
 config MFD_RT4831
 	tristate "Richtek RT4831 four channel WLED and Display Bias Voltage"
 	depends on I2C

index fe7156a5187a..a54eb18af56a 100644
@@ -200,7 +200,6 @@ obj-$(CONFIG_MFD_KEMPLD)	+= kempld-core.o
 obj-$(CONFIG_MFD_INTEL_QUARK_I2C_GPIO)	+= intel_quark_i2c_gpio.o
 obj-$(CONFIG_LPC_SCH)		+= lpc_sch.o
 obj-$(CONFIG_LPC_ICH)		+= lpc_ich.o
-obj-$(CONFIG_MFD_RDC321X)	+= rdc321x-southbridge.o
 obj-$(CONFIG_MFD_JANZ_CMODIO)	+= janz-cmodio.o
 obj-$(CONFIG_MFD_TPS6586X)	+= tps6586x.o
 obj-$(CONFIG_MFD_VX855)		+= vx855.o

index ddf88b07ce34..7832cb8b2e7a 100644
@@ -1572,17 +1572,6 @@ config NV_TCO
 	  To compile this driver as a module, choose M here: the
 	  module will be called nv_tco.
 
-config RDC321X_WDT
-	tristate "RDC R-321x SoC watchdog"
-	depends on X86_32 || COMPILE_TEST
-	depends on PCI
-	help
-	  This is the driver for the built in hardware watchdog
-	  in the RDC R-321x SoC.
-
-	  To compile this driver as a module, choose M here: the
-	  module will be called rdc321x_wdt.
-
 config 60XX_WDT
 	tristate "SBC-60XX Watchdog Timer"
 	depends on (X86 || COMPILE_TEST) && HAS_IOPORT

index 9ac406677aba..460be2a566c4 100644
@@ -138,7 +138,6 @@ obj-$(CONFIG_SC1200_WDT) += sc1200wdt.o
 obj-$(CONFIG_SCx200_WDT) += scx200_wdt.o
 obj-$(CONFIG_PC87413_WDT) += pc87413_wdt.o
 obj-$(CONFIG_NV_TCO) += nv_tco.o
-obj-$(CONFIG_RDC321X_WDT) += rdc321x_wdt.o
 obj-$(CONFIG_60XX_WDT) += sbc60xxwdt.o
 obj-$(CONFIG_SBC8360_WDT) += sbc8360.o
 obj-$(CONFIG_SBC7240_WDT) += sbc7240_wdt.o

index cec724256812..244ff59fb6b2 100644
@@ -23,7 +23,6 @@ radio-sf16fmr2         SF16-FMR2/SF16-FMD2 Radio
 radio-shark            Griffin radioSHARK USB radio receiver
 shark2                 Griffin radioSHARK2 USB radio receiver
 radio-si470x-common    Silicon Labs Si470x FM Radio Receiver
-radio-si476x           Silicon Laboratories Si476x I2C FM Radio
 radio-tea5764          TEA5764 I2C FM radio
 tef6862                TEF6862 Car Radio Enhanced Selectivity Tuner
 radio-terratec         TerraTec ActiveRadio ISA Standalone

160 lines not on this page · raw message

index 4621eae9fa1e..d131146f5869 100644
@@ -33,7 +33,6 @@ Video4Linux (V4L) driver-specific documentation
 	saa7134
 	si470x
 	si4713
-	si476x
 	vimc
 	visl
 	vivid

index bbbdd054ba64..7b757f34463e 100644
@@ -79,23 +79,6 @@ config RADIO_SHARK2
 config RADIO_SI4713
 	tristate "Silicon Labs Si4713 FM Radio with RDS Transmitter support"
 
-config RADIO_SI476X
-	tristate "Silicon Laboratories Si476x I2C FM Radio"
-	depends on I2C
-	depends on MFD_SI476X_CORE
-	depends on SND_SOC
-	select SND_SOC_SI476X
-	help
-	  Choose Y here if you have this FM radio chip.
-
-	  In order to control your radio card, you will need to use programs
-	  that are compatible with the Video For Linux 2 API.  Information on
-	  this API and pointers to "v4l2" programs may be found at
-	  <file:Documentation/userspace-api/media/index.rst>.
-
-	  To compile this driver as a module, choose M here: the
-	  module will be called radio-si476x.
-
 config RADIO_TEA575X
 	tristate
 

index f54693ebdb30..ea948520382d 100644
@@ -22,7 +22,6 @@ obj-$(CONFIG_RADIO_SHARK2) += shark2.o
 obj-$(CONFIG_RADIO_SHARK) += radio-shark.o
 obj-$(CONFIG_RADIO_SI470X) += si470x/
 obj-$(CONFIG_RADIO_SI4713) += si4713/
-obj-$(CONFIG_RADIO_SI476X) += radio-si476x.o
 obj-$(CONFIG_RADIO_TEA575X) += tea575x.o
 obj-$(CONFIG_RADIO_TEA5764) += radio-tea5764.o
 obj-$(CONFIG_RADIO_TEF6862) += tef6862.o

index ce0c39b50af7..b271c9f0c5fc 100644
@@ -1425,19 +1425,6 @@ config MFD_SEC_I2C
 	  on this driver so building this as a module might require proper
 	  initial ramdisk or might not boot up as well in certain scenarios.
 
-config MFD_SI476X_CORE
-	tristate "Silicon Laboratories 4761/64/68 AM/FM radio."
-	depends on I2C
-	select MFD_CORE
-	select REGMAP_I2C
-	help
-	  This is the core driver for the SI476x series of AM/FM
-	  radio. This MFD driver connects the radio-si476x V4L2 module
-	  and the si476x audio codec.
-
-	  To compile this driver as a module, choose M here: the
-	  module will be called si476x-core.
-
 config MFD_SIMPLE_MFD_I2C
 	tristate
 	depends on I2C

index a54eb18af56a..649262eb0f5c 100644
@@ -204,9 +204,6 @@ obj-$(CONFIG_MFD_JANZ_CMODIO)	+= janz-cmodio.o
 obj-$(CONFIG_MFD_TPS6586X)	+= tps6586x.o
 obj-$(CONFIG_MFD_VX855)		+= vx855.o
 
-si476x-core-y := si476x-cmd.o si476x-prop.o si476x-i2c.o
-obj-$(CONFIG_MFD_SI476X_CORE)	+= si476x-core.o
-
 obj-$(CONFIG_MFD_CS5535)	+= cs5535-mfd.o
 obj-$(CONFIG_MFD_OMAP_USB_HOST)	+= omap-usb-host.o omap-usb-tll.o
 obj-$(CONFIG_MFD_PM8XXX) 	+= qcom-pm8xxx.o ssbi.o

index f9a47e262a77..1f7dc2c7e338 100644

Lines of this file are not shown. View the raw message.

index 3d122ace75ad..f4f20a8e112e 100644

Lines of this file are not shown. View the raw message.

index 2f5a5c053439..c5e2140cdac0 100644
@@ -29398,7 +29398,6 @@ F:	drivers/watchdog/wm83*_wdt.c
 F:	include/linux/mfd/arizona/
 F:	include/linux/mfd/wm831x/
 F:	include/linux/mfd/wm8350/
-F:	include/linux/mfd/wm8400*
 F:	include/linux/regulator/arizona*
 F:	include/linux/wm97xx.h
 F:	include/sound/wm????.h

index b271c9f0c5fc..2b621a77619c 100644
@@ -2068,17 +2068,6 @@ config MFD_WM8998
 	help
 	  Support for Wolfson Microelectronics WM8998 low power audio SoC
 
-config MFD_WM8400
-	bool "Wolfson Microelectronics WM8400"
-	select MFD_CORE
-	depends on I2C=y
-	select REGMAP_I2C
-	help
-	  Support for the Wolfson Microelecronics WM8400 PMIC and audio
-	  CODEC.  This driver provides common support for accessing
-	  the device, additional drivers must be enabled in order to use
-	  the functionality of the device.
-
 config MFD_WM831X
 	bool
 

index 649262eb0f5c..36f0ab039b77 100644
@@ -55,7 +55,6 @@ ifeq ($(CONFIG_MFD_CS47L24),y)
 arizona-objs			+= cs47l24-tables.o
 endif
 obj-$(CONFIG_MFD_WCD934X)	+= wcd934x.o
-obj-$(CONFIG_MFD_WM8400)	+= wm8400-core.o
 wm831x-objs			:= wm831x-core.o wm831x-irq.o wm831x-otp.o
 wm831x-objs			+= wm831x-auxadc.o
 obj-$(CONFIG_MFD_WM831X)	+= wm831x.o

index 73b43dc1b3be..4869a1d5041b 100644
@@ -1862,13 +1862,6 @@ config REGULATOR_WM8350
 	  This driver provides support for the voltage and current regulators
 	  of the WM8350 AudioPlus PMIC.
 
-config REGULATOR_WM8400
-	tristate "Wolfson Microelectronics WM8400 AudioPlus PMIC"
-	depends on MFD_WM8400
-	help
-	  This driver provides support for the voltage regulators of the
-	  WM8400 AudioPlus PMIC.
-
 config REGULATOR_WM8994
 	tristate "Wolfson Microelectronics WM8994 CODEC"
 	depends on MFD_WM8994

index 972f105567b5..86b5afcc974e 100644
@@ -215,7 +215,6 @@ obj-$(CONFIG_REGULATOR_WM831X) += wm831x-dcdc.o
 obj-$(CONFIG_REGULATOR_WM831X) += wm831x-isink.o
 obj-$(CONFIG_REGULATOR_WM831X) += wm831x-ldo.o
 obj-$(CONFIG_REGULATOR_WM8350) += wm8350-regulator.o
-obj-$(CONFIG_REGULATOR_WM8400) += wm8400-regulator.o
 obj-$(CONFIG_REGULATOR_WM8994) += wm8994-regulator.o
 
 ccflags-$(CONFIG_REGULATOR_DEBUG) += -DDEBUG

index 1f7dc2c7e338..422e50ee0560 100644
@@ -318,7 +318,6 @@ config SND_SOC_ALL_CODECS
 	imply SND_SOC_WM5102
 	imply SND_SOC_WM5110
 	imply SND_SOC_WM8350
-	imply SND_SOC_WM8400
 	imply SND_SOC_WM8510
 	imply SND_SOC_WM8523
 	imply SND_SOC_WM8524

@@ -2556,11 +2555,6 @@ config SND_SOC_WM8350
 	tristate
 	depends on MFD_WM8350
 
-config SND_SOC_WM8400
-	tristate
-	# FIXME nothing selects SND_SOC_WM8400??
-	depends on MFD_WM8400
-
 config SND_SOC_WM8510
 	tristate "Wolfson Microelectronics WM8510 CODEC"
 	depends on SND_SOC_I2C_AND_SPI

index f4f20a8e112e..3fc78f3b44ba 100644
@@ -375,7 +375,6 @@ snd-soc-wm5100-y := wm5100.o wm5100-tables.o
 snd-soc-wm5102-y := wm5102.o
 snd-soc-wm5110-y := wm5110.o
 snd-soc-wm8350-y := wm8350.o
-snd-soc-wm8400-y := wm8400.o
 snd-soc-wm8510-y := wm8510.o
 snd-soc-wm8523-y := wm8523.o
 snd-soc-wm8524-y := wm8524.o

@@ -825,7 +824,6 @@ obj-$(CONFIG_SND_SOC_WM5100)	+= snd-soc-wm5100.o
 obj-$(CONFIG_SND_SOC_WM5102)	+= snd-soc-wm5102.o
 obj-$(CONFIG_SND_SOC_WM5110)	+= snd-soc-wm5110.o
 obj-$(CONFIG_SND_SOC_WM8350)	+= snd-soc-wm8350.o
-obj-$(CONFIG_SND_SOC_WM8400)	+= snd-soc-wm8400.o
 obj-$(CONFIG_SND_SOC_WM8510)	+= snd-soc-wm8510.o
 obj-$(CONFIG_SND_SOC_WM8523)	+= snd-soc-wm8523.o
 obj-$(CONFIG_SND_SOC_WM8524)	+= snd-soc-wm8524.o

index c453646b06e2..b73d66942fbb 100644
@@ -97,17 +97,6 @@ Description:
 
 		The <ambient light zone> is device-driver specific:
 
-		For ADP5520 and ADP5501, <ambient light zone> can be:
-
-		===========  ================================================
-		Ambient      sysfs entry
-		light zone
-		===========  ================================================
-		daylight     /sys/class/backlight/<backlight>/daylight_max
-		office       /sys/class/backlight/<backlight>/office_max
-		dark         /sys/class/backlight/<backlight>/dark_max
-		===========  ================================================
-
 		For ADP8860, <ambient light zone> can be:
 
 		===========  ================================================

index c5e2140cdac0..86df3fadba87 100644
@@ -550,17 +550,6 @@ F:	Documentation/devicetree/bindings/media/i2c/adi,adp1653.txt
 F:	drivers/media/i2c/adp1653.c
 F:	include/media/i2c/adp1653.h
 
-ADP5520 BACKLIGHT DRIVER WITH IO EXPANDER (ADP5520/ADP5501)
-M:	Michael Hennerich <[email protected]>
-S:	Supported
-W:	http://wiki.analog.com/ADP5520
-W:	https://ez.analog.com/linux-software-drivers
-F:	drivers/gpio/gpio-adp5520.c
-F:	drivers/input/keyboard/adp5520-keys.c
-F:	drivers/leds/leds-adp5520.c
-F:	drivers/mfd/adp5520.c
-F:	drivers/video/backlight/adp5520_bl.c
-
 ADP5585 GPIO EXPANDER, PWM AND KEYPAD CONTROLLER DRIVER
 M:	Laurent Pinchart <[email protected]>
 L:	[email protected]

index aef0db9fe101..98b9931c59ff 100644
@@ -1325,13 +1325,6 @@ endmenu
 
 menu "MFD GPIO expanders"
 
-config GPIO_ADP5520
-	tristate "GPIO Support for ADP5520 PMIC"
-	depends on PMIC_ADP5520
-	help
-	  This option enables support for on-chip GPIO found
-	  on Analog Devices ADP5520 PMICs.
-
 config GPIO_ADP5585
 	tristate "GPIO Support for ADP5585"
 	depends on MFD_ADP5585

index 2e3a14688b59..1fafd15d3fa6 100644
@@ -28,7 +28,6 @@ obj-$(CONFIG_GPIO_104_IDIO_16)		+= gpio-104-idio-16.o
 obj-$(CONFIG_GPIO_74X164)		+= gpio-74x164.o
 obj-$(CONFIG_GPIO_74XX_MMIO)		+= gpio-74xx-mmio.o
 obj-$(CONFIG_GPIO_ADNP)			+= gpio-adnp.o
-obj-$(CONFIG_GPIO_ADP5520)		+= gpio-adp5520.o
 obj-$(CONFIG_GPIO_ADP5585)		+= gpio-adp5585.o
 obj-$(CONFIG_GPIO_AGGREGATOR)		+= gpio-aggregator.o
 obj-$(CONFIG_GPIO_ALTERA_A10SR)		+= gpio-altera-a10sr.o

index d8c64f333462..ec3fe4632d8d 100644
@@ -27,16 +27,6 @@ config KEYBOARD_ADC
 	  To compile this driver as a module, choose M here: the
 	  module will be called adc_keys.
 
-config KEYBOARD_ADP5520
-	tristate "Keypad Support for ADP5520 PMIC"
-	depends on PMIC_ADP5520
-	help
-	  This option enables support for the keypad scan matrix
-	  on Analog Devices ADP5520 PMICs.
-
-	  To compile this driver as a module, choose M here: the module will
-	  be called adp5520-keys.
-
 config KEYBOARD_ADP5585
 	tristate "ADP558x keypad support"
 	depends on MFD_ADP5585

index 60bb7baf802f..c1a443c64962 100644
@@ -6,7 +6,6 @@
 # Each configuration option enables a list of files.
 
 obj-$(CONFIG_KEYBOARD_ADC)		+= adc-keys.o
-obj-$(CONFIG_KEYBOARD_ADP5520)		+= adp5520-keys.o
 obj-$(CONFIG_KEYBOARD_ADP5585)		+= adp5585-keys.o
 obj-$(CONFIG_KEYBOARD_ADP5588)		+= adp5588-keys.o
 obj-$(CONFIG_KEYBOARD_AMIGA)		+= amikbd.o

index d0d3182236be..5d6fc2a06016 100644
@@ -718,17 +718,6 @@ config LEDS_LT3593
 	  LT3593 controller. This controller uses a special one-wire pulse
 	  coding protocol to set the brightness.
 
-config LEDS_ADP5520
-	tristate "LED Support for ADP5520/ADP5501 PMIC"
-	depends on LEDS_CLASS
-	depends on PMIC_ADP5520
-	help
-	  This option enables support for on-chip LED drivers found
-	  on Analog Devices ADP5520/ADP5501 PMICs.
-
-	  To compile this driver as a module, choose M here: the module will
-	  be called leds-adp5520.
-
 config LEDS_MAX5970
 	tristate "LED Support for Maxim 5970"
 	depends on LEDS_CLASS

index a68244bd50fb..96deebbca9d5 100644
@@ -11,7 +11,6 @@ obj-$(CONFIG_LEDS_KUNIT_TEST)		+= led-test.o
 # LED Platform Drivers (keep this sorted, M-| sort)
 obj-$(CONFIG_LEDS_88PM860X)		+= leds-88pm860x.o
 obj-$(CONFIG_LEDS_ACER_A500)		+= leds-acer-a500.o
-obj-$(CONFIG_LEDS_ADP5520)		+= leds-adp5520.o
 obj-$(CONFIG_LEDS_AN30259A)		+= leds-an30259a.o
 obj-$(CONFIG_LEDS_APU)			+= leds-apu.o
 obj-$(CONFIG_LEDS_ARIEL)		+= leds-ariel.o

index 2b621a77619c..5126bae8e61f 100644
@@ -115,16 +115,6 @@ config MFD_AS3722
 	  controllers, 11 LDOs, RTC, automatic battery, temperature and
 	  over current monitoring, GPIOs, ADC and a watchdog.
 
-config PMIC_ADP5520
-	bool "Analog Devices ADP5520/01 MFD PMIC Core Support"
-	depends on I2C=y
-	help
-	  Say yes here to add support for Analog Devices ADP5520 and ADP5501,
-	  Multifunction Power Management IC. This includes
-	  the I2C driver and the core APIs _only_, you have to select
-	  individual components like LCD backlight, LEDs, GPIOs and Kepad
-	  under the corresponding menus.
-
 config MFD_AAT2870_CORE
 	bool "AnalogicTech AAT2870"
 	select MFD_CORE

index 36f0ab039b77..a6cc4fcc3e1d 100644
@@ -193,7 +193,6 @@ obj-$(CONFIG_MFD_DB8500_PRCMU)	+= db8500-prcmu.o
 # ab8500-core need to come after db8500-prcmu (which provides the channel)
 obj-$(CONFIG_AB8500_CORE)	+= ab8500-core.o ab8500-sysctrl.o
 obj-$(CONFIG_MFD_TIMBERDALE)    += timberdale.o
-obj-$(CONFIG_PMIC_ADP5520)	+= adp5520.o
 obj-$(CONFIG_MFD_ADP5585)	+= adp5585.o
 obj-$(CONFIG_MFD_KEMPLD)	+= kempld-core.o
 obj-$(CONFIG_MFD_INTEL_QUARK_I2C_GPIO)	+= intel_quark_i2c_gpio.o

index dbf4ca23a9b6..63e5059563b4 100644
@@ -365,16 +365,6 @@ config BACKLIGHT_WM831X
 	  If you have a backlight driven by the ISINK and DCDC of a
 	  WM831x PMIC say y to enable the backlight driver for it.
 
-config BACKLIGHT_ADP5520
-	tristate "Backlight Driver for ADP5520/ADP5501 using WLED"
-	depends on PMIC_ADP5520
-	help
-	  If you have a LCD backlight connected to the BST/BL_SNK output of
-	  ADP5520 or ADP5501, say Y here to enable this driver.
-
-	  To compile this driver as a module, choose M here: the module will
-	  be called adp5520_bl.
-
 config BACKLIGHT_ADP8860
 	tristate "Backlight Driver for ADP8860/ADP8861/ADP8863 using WLED"
 	depends on I2C

index 34469711c6cd..1a6bef13430b 100644
@@ -19,7 +19,6 @@ obj-$(CONFIG_LCD_VGG2432A4)		+= vgg2432a4.o
 
 obj-$(CONFIG_BACKLIGHT_88PM860X)	+= 88pm860x_bl.o
 obj-$(CONFIG_BACKLIGHT_AAT2870)		+= aat2870_bl.o
-obj-$(CONFIG_BACKLIGHT_ADP5520)		+= adp5520_bl.o
 obj-$(CONFIG_BACKLIGHT_ADP8860)		+= adp8860_bl.o
 obj-$(CONFIG_BACKLIGHT_ADP8870)		+= adp8870_bl.o
 obj-$(CONFIG_BACKLIGHT_APPLE)		+= apple_bl.o

index 86df3fadba87..360655cce7d1 100644
@@ -7509,7 +7509,6 @@ F:	drivers/input/misc/da72??.[ch]
 F:	drivers/input/misc/da90??_onkey.c
 F:	drivers/input/touchscreen/da9052_tsi.c
 F:	drivers/leds/leds-da90??.c
-F:	drivers/mfd/da903x.c
 F:	drivers/mfd/da90??-*.c
 F:	drivers/mfd/da91??-*.c
 F:	drivers/pinctrl/pinctrl-da90??.c

index 9b9ae8ac3f7f..80bffbead88b 100644
@@ -282,19 +282,6 @@ config TOUCHSCREEN_CYTTSP5
 	  To compile this driver as a module, choose M here: the
 	  module will be called cyttsp5.
 
-config TOUCHSCREEN_DA9034
-	tristate "Touchscreen support for Dialog Semiconductor DA9034"
-	depends on PMIC_DA903X
-	default y
-	help
-	  Say Y here to enable the support for the touchscreen found
-	  on Dialog Semiconductor DA9034 PMIC.
-
-	  If unsure, say N.
-
-	  To compile this driver as a module, choose M here: the
-	  module will be called da9034-ts.
-
 config TOUCHSCREEN_DA9052
 	tristate "Dialog DA9052/DA9053 TSI"
 	depends on PMIC_DA9052

index bfd9de83389d..31ebdce6d09f 100644
@@ -29,7 +29,6 @@ obj-$(CONFIG_TOUCHSCREEN_CYTTSP_CORE)	+= cyttsp_core.o
 obj-$(CONFIG_TOUCHSCREEN_CYTTSP_I2C)	+= cyttsp_i2c.o
 obj-$(CONFIG_TOUCHSCREEN_CYTTSP_SPI)	+= cyttsp_spi.o
 obj-$(CONFIG_TOUCHSCREEN_CYTTSP5)	+= cyttsp5.o
-obj-$(CONFIG_TOUCHSCREEN_DA9034)	+= da9034-ts.o
 obj-$(CONFIG_TOUCHSCREEN_DA9052)	+= da9052_tsi.o
 obj-$(CONFIG_TOUCHSCREEN_DYNAPRO)	+= dynapro.o
 obj-$(CONFIG_TOUCHSCREEN_EDT_FT5X06)	+= edt-ft5x06.o

index 5d6fc2a06016..5aab4765d6d7 100644
@@ -638,14 +638,6 @@ config LEDS_WM8350
 	  This option enables support for LEDs driven by the Wolfson
 	  Microelectronics WM8350 AudioPlus PMIC.
 
-config LEDS_DA903X
-	tristate "LED Support for DA9030/DA9034 PMIC"
-	depends on LEDS_CLASS
-	depends on PMIC_DA903X
-	help
-	  This option enables support for on-chip LED drivers found
-	  on Dialog Semiconductor DA9030/DA9034 PMICs.
-
 config LEDS_DA9052
 	tristate "Dialog DA9052/DA9053 LEDS"
 	depends on LEDS_CLASS

index 96deebbca9d5..148301cf4865 100644
@@ -28,7 +28,6 @@ obj-$(CONFIG_LEDS_COBALT_QUBE)		+= leds-cobalt-qube.o
 obj-$(CONFIG_LEDS_COBALT_RAQ)		+= leds-cobalt-raq.o
 obj-$(CONFIG_LEDS_CPCAP)		+= leds-cpcap.o
 obj-$(CONFIG_LEDS_CROS_EC)		+= leds-cros_ec.o
-obj-$(CONFIG_LEDS_DA903X)		+= leds-da903x.o
 obj-$(CONFIG_LEDS_DA9052)		+= leds-da9052.o
 obj-$(CONFIG_LEDS_GPIO)			+= leds-gpio.o
 obj-$(CONFIG_LEDS_GPIO_REGISTER)	+= leds-gpio-register.o

index 5126bae8e61f..fda9d7ad5743 100644
@@ -408,17 +408,6 @@ config MFD_TN48M_CPLD
 	  for the SFP slots as well as power supply related information.
 	  SFP support depends on the GPIO driver being selected.
 
-config PMIC_DA903X
-	bool "Dialog Semiconductor DA9030/DA9034 PMIC Support"
-	depends on I2C=y
-	help
-	  Say yes here to add support for Dialog Semiconductor DA9030 (a.k.a
-	  ARAVA) and DA9034 (a.k.a MICCO), these are Power Management IC
-	  usually found on PXA processors-based platforms. This includes
-	  the I2C driver and the core APIs _only_, you have to select
-	  individual components like LCD backlight, voltage regulators,
-	  LEDs and battery-charger under the corresponding menus.
-
 config PMIC_DA9052
 	bool
 	select MFD_CORE

index a6cc4fcc3e1d..82795e65cbe7 100644
@@ -139,8 +139,6 @@ ifeq ($(CONFIG_SA1100_ASSABET),y)
 obj-$(CONFIG_MCP_UCB1200)	+= ucb1x00-assabet.o
 endif
 
-obj-$(CONFIG_PMIC_DA903X)	+= da903x.o
-
 obj-$(CONFIG_PMIC_DA9052)	+= da9052-irq.o
 obj-$(CONFIG_PMIC_DA9052)	+= da9052-core.o
 obj-$(CONFIG_MFD_DA9052_SPI)	+= da9052-spi.o

index b89ef40df7f8..a492c86e879a 100644
@@ -345,13 +345,6 @@ config BATTERY_BQ27XXX_DT_UPDATES_NVM
 	  general-purpose kernels, as this can cause misconfiguration of a
 	  smart battery with embedded NVM/flash.
 
-config BATTERY_DA9030
-	tristate "DA9030 battery driver"
-	depends on PMIC_DA903X
-	help
-	  Say Y here to enable support for batteries charger integrated into
-	  DA9030 PMIC.
-
 config BATTERY_DA9052
 	tristate "Dialog DA9052 Battery"
 	depends on PMIC_DA9052

index f3c0d1006c1a..380546080112 100644
@@ -52,7 +52,6 @@ obj-$(CONFIG_MANAGER_SBS)	+= sbs-manager.o
 obj-$(CONFIG_BATTERY_BQ27XXX)	+= bq27xxx_battery.o
 obj-$(CONFIG_BATTERY_BQ27XXX_I2C) += bq27xxx_battery_i2c.o
 obj-$(CONFIG_BATTERY_BQ27XXX_HDQ) += bq27xxx_battery_hdq.o
-obj-$(CONFIG_BATTERY_DA9030)	+= da9030_battery.o
 obj-$(CONFIG_BATTERY_DA9052)	+= da9052-battery.o
 obj-$(CONFIG_CHARGER_DA9150)	+= da9150-charger.o
 obj-$(CONFIG_BATTERY_DA9150)	+= da9150-fg.o

index 4869a1d5041b..7d587ffc0a89 100644
@@ -312,14 +312,6 @@ config REGULATOR_CROS_EC
 	  This driver can also be built as a module. If so, the module
 	  will be called cros-ec-regulator.
 
-config REGULATOR_DA903X
-	tristate "Dialog Semiconductor DA9030/DA9034 regulators"
-	depends on PMIC_DA903X
-	depends on !CC_IS_CLANG # https://llvm.org/pr38789
-	help
-	  Say y here to support the BUCKs and LDOs regulators found on
-	  Dialog Semiconductor DA9030/DA9034 PMIC.
-
 config REGULATOR_DA9052
 	tristate "Dialog Semiconductor DA9052/DA9053 regulators"
 	depends on PMIC_DA9052

index 86b5afcc974e..a1344d3c3fd3 100644
@@ -38,7 +38,6 @@ obj-$(CONFIG_REGULATOR_BD718XX) += bd718x7-regulator.o
 obj-$(CONFIG_REGULATOR_BD9571MWV) += bd9571mwv-regulator.o
 obj-$(CONFIG_REGULATOR_BD957XMUF) += bd9576-regulator.o
 obj-$(CONFIG_REGULATOR_BQ257XX) += bq257xx-regulator.o
-obj-$(CONFIG_REGULATOR_DA903X)	+= da903x-regulator.o
 obj-$(CONFIG_REGULATOR_BD96801) += bd96801-regulator.o
 obj-$(CONFIG_REGULATOR_DA9052)	+= da9052-regulator.o
 obj-$(CONFIG_REGULATOR_DA9055)	+= da9055-regulator.o

index 63e5059563b4..413ed6c38b53 100644
@@ -277,13 +277,6 @@ config BACKLIGHT_CGBC
 	  backlight subsystem. It communicates with the board controller to
 	  adjust LCD backlight using PWM signals.
 
-config BACKLIGHT_DA903X
-	tristate "Backlight Driver for DA9030/DA9034 using WLED"
-	depends on PMIC_DA903X
-	help
-	  If you have a LCD backlight connected to the WLED output of DA9030
-	  or DA9034 WLED output, say Y here to enable this driver.
-
 config BACKLIGHT_DA9052
 	tristate "Dialog DA9052/DA9053 WLED"
 	depends on PMIC_DA9052

index 1a6bef13430b..3dc3580d82c7 100644
@@ -28,7 +28,6 @@ obj-$(CONFIG_BACKLIGHT_AW99706)		+= aw99706.o
 obj-$(CONFIG_BACKLIGHT_BD6107)		+= bd6107.o
 obj-$(CONFIG_BACKLIGHT_CGBC)		+= cgbc_bl.o
 obj-$(CONFIG_BACKLIGHT_CLASS_DEVICE)	+= backlight.o
-obj-$(CONFIG_BACKLIGHT_DA903X)		+= da903x_bl.o
 obj-$(CONFIG_BACKLIGHT_DA9052)		+= da9052_bl.o
 obj-$(CONFIG_BACKLIGHT_EP93XX)		+= ep93xx_bl.o
 obj-$(CONFIG_BACKLIGHT_GPIO)		+= gpio_backlight.o

index 415e519ad4eb..af9651003449 100644
@@ -905,15 +905,6 @@ config IMX93_ADC
 	  This driver can also be built as a module. If so, the module will be
 	  called imx93_adc.
 
-config LP8788_ADC
-	tristate "LP8788 ADC driver"
-	depends on MFD_LP8788
-	help
-	  Say yes here to build support for TI LP8788 ADC.
-
-	  To compile this driver as a module, choose M here: the module will be
-	  called lp8788_adc.
-
 config LPC18XX_ADC
 	tristate "NXP LPC18xx ADC driver"
 	depends on ARCH_LPC18XX || COMPILE_TEST

index dcec0abb03b7..845ddf628f22 100644
@@ -77,7 +77,6 @@ obj-$(CONFIG_INA2XX_ADC) += ina2xx-adc.o
 obj-$(CONFIG_INGENIC_ADC) += ingenic-adc.o
 obj-$(CONFIG_INTEL_DC_TI_ADC) += intel_dc_ti_adc.o
 obj-$(CONFIG_INTEL_MRFLD_ADC) += intel_mrfld_adc.o
-obj-$(CONFIG_LP8788_ADC) += lp8788_adc.o
 obj-$(CONFIG_LPC18XX_ADC) += lpc18xx_adc.o
 obj-$(CONFIG_LPC32XX_ADC) += lpc32xx_adc.o
 obj-$(CONFIG_LTC2309) += ltc2309.o

index 5aab4765d6d7..f0cd10ad6279 100644
@@ -511,13 +511,6 @@ config LEDS_LP8501
 	  It is similar as LP5523, but output power selection is available.
 	  And register layout and engine program schemes are different.
 
-config LEDS_LP8788
-	tristate "LED support for the TI LP8788 PMIC"
-	depends on LEDS_CLASS
-	depends on MFD_LP8788
-	help
-	  This option enables support for the Keyboard LEDs on the LP8788 PMIC.
-
 config LEDS_LP8860
 	tristate "LED support for the TI LP8860 4 channel LED driver"
 	depends on LEDS_CLASS && I2C && OF

index 148301cf4865..63dc0b0c5a51 100644
@@ -55,7 +55,6 @@ obj-$(CONFIG_LEDS_LP5562)		+= leds-lp5562.o
 obj-$(CONFIG_LEDS_LP5569)		+= leds-lp5569.o
 obj-$(CONFIG_LEDS_LP55XX_COMMON)	+= leds-lp55xx-common.o
 obj-$(CONFIG_LEDS_LP8501)		+= leds-lp8501.o
-obj-$(CONFIG_LEDS_LP8788)		+= leds-lp8788.o
 obj-$(CONFIG_LEDS_LP8860)		+= leds-lp8860.o
 obj-$(CONFIG_LEDS_LP8864)		+= leds-lp8864.o
 obj-$(CONFIG_LEDS_LT3593)		+= leds-lt3593.o

index fda9d7ad5743..09e400e1f4b0 100644
@@ -1603,16 +1603,6 @@ config MFD_LP3943
 	  With these functionalities, it can be used for LED string control or
 	  general usage such like a GPIO controller and a PWM controller.
 
-config MFD_LP8788
-	bool "TI LP8788 Power Management Unit Driver"
-	depends on I2C=y
-	select MFD_CORE
-	select REGMAP_I2C
-	select IRQ_DOMAIN
-	help
-	  TI LP8788 PMU supports regulators, battery charger, RTC,
-	  ADC, backlight driver and current sinks.
-
 config MFD_TI_LMU
 	tristate "TI Lighting Management Unit driver"
 	depends on I2C

index 82795e65cbe7..e3fe998c3513 100644
@@ -150,7 +150,6 @@ obj-$(CONFIG_MFD_AXP20X_I2C)	+= axp20x-i2c.o
 obj-$(CONFIG_MFD_AXP20X_RSB)	+= axp20x-rsb.o
 
 obj-$(CONFIG_MFD_LP3943)	+= lp3943.o
-obj-$(CONFIG_MFD_LP8788)	+= lp8788.o lp8788-irq.o
 
 obj-$(CONFIG_MFD_TI_LMU)	+= ti-lmu.o
 

index a492c86e879a..9bb2ac78dca9 100644
@@ -555,14 +555,6 @@ config CHARGER_LP8727
 	help
 	  Say Y here to enable support for LP8727 Charger Driver.
 
-config CHARGER_LP8788
-	tristate "TI LP8788 charger driver"
-	depends on MFD_LP8788
-	depends on LP8788_ADC
-	depends on IIO
-	help
-	  Say Y to enable support for the LP8788 linear charger.
-
 config CHARGER_GPIO
 	tristate "GPIO charger"
 	depends on GPIOLIB || COMPILE_TEST

index 380546080112..76422bece94c 100644
@@ -76,7 +76,6 @@ obj-$(CONFIG_CHARGER_MAX8903)	+= max8903_charger.o
 obj-$(CONFIG_CHARGER_TWL4030)	+= twl4030_charger.o
 obj-$(CONFIG_CHARGER_TWL6030)	+= twl6030_charger.o
 obj-$(CONFIG_CHARGER_LP8727)	+= lp8727_charger.o
-obj-$(CONFIG_CHARGER_LP8788)	+= lp8788-charger.o
 obj-$(CONFIG_CHARGER_GPIO)	+= gpio-charger.o
 obj-$(CONFIG_CHARGER_MANAGER)	+= charger-manager.o
 obj-$(CONFIG_CHARGER_LT3651)	+= lt3651-charger.o

index 7d587ffc0a89..4b90d1cb045c 100644
@@ -555,12 +555,6 @@ config REGULATOR_LP87565
 	  provides four step-down converters. It supports software based
 	  voltage control for different voltage domains
 
-config REGULATOR_LP8788
-	tristate "TI LP8788 Power Regulators"
-	depends on MFD_LP8788
-	help
-	  This driver supports LP8788 voltage regulator chip.
-
 config REGULATOR_LTC3589
 	tristate "LTC3589 8-output voltage regulator"
 	depends on I2C

index a1344d3c3fd3..fe0f099c217b 100644
@@ -65,8 +65,6 @@ obj-$(CONFIG_REGULATOR_LP3972) += lp3972.o
 obj-$(CONFIG_REGULATOR_LP872X) += lp872x.o
 obj-$(CONFIG_REGULATOR_LP873X) += lp873x-regulator.o
 obj-$(CONFIG_REGULATOR_LP87565) += lp87565-regulator.o
-obj-$(CONFIG_REGULATOR_LP8788) += lp8788-buck.o
-obj-$(CONFIG_REGULATOR_LP8788) += lp8788-ldo.o
 obj-$(CONFIG_REGULATOR_LP8755) += lp8755.o
 obj-$(CONFIG_REGULATOR_LTC3589) += ltc3589.o
 obj-$(CONFIG_REGULATOR_LTC3676) += ltc3676.o

index 5674211afe91..c201948b4d5b 100644
@@ -317,12 +317,6 @@ config RTC_DRV_HYM8563
 	  This driver can also be built as a module. If so, the module
 	  will be called rtc-hym8563.
 
-config RTC_DRV_LP8788
-	tristate "TI LP8788 RTC driver"
-	depends on MFD_LP8788
-	help
-	  Say Y to enable support for the LP8788 RTC/ALARM driver.
-
 config RTC_DRV_MAX6900
 	tristate "Maxim MAX6900"
 	help

index 413ed6c38b53..2c206d2713e3 100644

Lines of this file are not shown. View the raw message.

index 3dc3580d82c7..0497eaa639cd 100644

Lines of this file are not shown. View the raw message.

index 09e400e1f4b0..b0c7df448445 100644
@@ -115,18 +115,6 @@ config MFD_AS3722
 	  controllers, 11 LDOs, RTC, automatic battery, temperature and
 	  over current monitoring, GPIOs, ADC and a watchdog.
 
-config MFD_AAT2870_CORE
-	bool "AnalogicTech AAT2870"
-	select MFD_CORE
-	depends on I2C=y
-	depends on GPIOLIB || COMPILE_TEST
-	depends on GPIOLIB_LEGACY
-	help
-	  If you say yes here you get support for the AAT2870.
-	  This driver provides common support for accessing the device,
-	  additional drivers must be enabled in order to use the
-	  functionality of the device.
-
 config MFD_AT91_USART
 	tristate "AT91 USART Driver"
 	select MFD_CORE

index e3fe998c3513..cf3c70364538 100644
@@ -206,7 +206,6 @@ obj-$(CONFIG_MFD_QCOM_RPM)	+= qcom_rpm.o
 obj-$(CONFIG_MFD_SPMI_PMIC)	+= qcom-spmi-pmic.o
 obj-$(CONFIG_TPS65911_COMPARATOR)	+= tps65911-comparator.o
 obj-$(CONFIG_MFD_TPS65090)	+= tps65090.o
-obj-$(CONFIG_MFD_AAT2870_CORE)	+= aat2870-core.o
 obj-$(CONFIG_MFD_AT91_USART)	+= at91-usart.o
 obj-$(CONFIG_MFD_ATMEL_FLEXCOM)	+= atmel-flexcom.o
 obj-$(CONFIG_MFD_ATMEL_HLCDC)	+= atmel-hlcdc.o

index 4b90d1cb045c..12d883e729bc 100644
@@ -132,13 +132,6 @@ config REGULATOR_ANATOP
 	  regulators. It is recommended that this option be
 	  enabled on i.MX6 platform.
 
-config REGULATOR_AAT2870
-	tristate "AnalogicTech AAT2870 Regulators"
-	depends on MFD_AAT2870_CORE
-	help
-	  If you have a AnalogicTech AAT2870 say Y to enable the
-	  regulator driver.
-
 config REGULATOR_AB8500
 	bool "ST-Ericsson AB8500 Power Regulators"
 	depends on AB8500_CORE

index fe0f099c217b..321c6ea73ee0 100644
@@ -16,7 +16,6 @@ obj-$(CONFIG_REGULATOR_88PM8607) += 88pm8607.o
 obj-$(CONFIG_REGULATOR_88PM886) += 88pm886-regulator.o
 obj-$(CONFIG_REGULATOR_CROS_EC) += cros-ec-regulator.o
 obj-$(CONFIG_REGULATOR_CPCAP) += cpcap-regulator.o
-obj-$(CONFIG_REGULATOR_AAT2870) += aat2870-regulator.o
 obj-$(CONFIG_REGULATOR_AB8500)	+= ab8500-ext.o ab8500.o
 obj-$(CONFIG_REGULATOR_ACT8865) += act8865-regulator.o
 obj-$(CONFIG_REGULATOR_ACT8945A) += act8945a-regulator.o

index 2c206d2713e3..4acbac1bbb9e 100644
@@ -388,13 +388,6 @@ config BACKLIGHT_88PM860X
 	help
 	  Say Y to enable the backlight driver for Marvell 88PM8606.
 
-config BACKLIGHT_AAT2870
-	tristate "AnalogicTech AAT2870 Backlight"
-	depends on MFD_AAT2870_CORE
-	help
-	  If you have a AnalogicTech AAT2870 say Y to enable the
-	  backlight driver.
-
 config BACKLIGHT_LM3509
 	tristate "Backlight Driver for LM3509"
 	depends on I2C

index 0497eaa639cd..e11175bdd500 100644
@@ -18,7 +18,6 @@ obj-$(CONFIG_LCD_TDO24M)		+= tdo24m.o
 obj-$(CONFIG_LCD_VGG2432A4)		+= vgg2432a4.o
 
 obj-$(CONFIG_BACKLIGHT_88PM860X)	+= 88pm860x_bl.o
-obj-$(CONFIG_BACKLIGHT_AAT2870)		+= aat2870_bl.o
 obj-$(CONFIG_BACKLIGHT_ADP8860)		+= adp8860_bl.o
 obj-$(CONFIG_BACKLIGHT_ADP8870)		+= adp8870_bl.o
 obj-$(CONFIG_BACKLIGHT_APPLE)		+= apple_bl.o

index f23bbce12c72..afef3d25e6ed 100644
@@ -394,23 +394,6 @@ config RPR0521
 	  To compile this driver as a module, choose M here:
 	  the module will be called rpr0521.
 
-config SENSORS_LM3533
-	tristate "LM3533 ambient light sensor"
-	depends on MFD_LM3533
-	help
-	  If you say yes here you get support for the ambient light sensor
-	  interface on National Semiconductor / TI LM3533 Lighting Power
-	  chips.
-
-	  The sensor interface can be used to control the LEDs and backlights
-	  of the chip through defining five light zones and three sets of
-	  corresponding output-current values.
-
-	  The driver provides raw and mean adc readings along with the current
-	  light zone through sysfs. A threshold event can be generated on zone
-	  changes. The ALS-control output values can be set per zone for the
-	  three current output channels.
-
 config LTR390
 	tristate "LTR-390UV-01 ambient light and UV sensor"
 	depends on I2C

index 64e354c49ed8..7b9de7c83999 100644
@@ -35,7 +35,6 @@ obj-$(CONFIG_SENSORS_ISL29028)	+= isl29028.o
 obj-$(CONFIG_ISL29125)		+= isl29125.o
 obj-$(CONFIG_ISL76682)		+= isl76682.o
 obj-$(CONFIG_JSA1212)		+= jsa1212.o
-obj-$(CONFIG_SENSORS_LM3533)	+= lm3533-als.o
 obj-$(CONFIG_LTR390)		+= ltr390.o
 obj-$(CONFIG_LTR501)		+= ltr501.o
 obj-$(CONFIG_LTRF216A)		+= ltrf216a.o

index f0cd10ad6279..1a0663a6501c 100644
@@ -262,19 +262,6 @@ config LEDS_LM3532
 	  controlled manually or using PWM input or using ambient
 	  light automatically.
 
-config LEDS_LM3533
-	tristate "LED support for LM3533"
-	depends on LEDS_CLASS
-	depends on MFD_LM3533
-	help
-	  This option enables support for the LEDs on National Semiconductor /
-	  TI LM3533 Lighting Power chips.
-
-	  The LEDs can be controlled directly, through PWM input, or by the
-	  ambient-light-sensor interface. The chip supports
-	  hardware-accelerated blinking with maximum on and off periods of 9.8
-	  and 77 seconds respectively.
-
 config LEDS_LM3642
 	tristate "LED support for LM3642 Chip"
 	depends on LEDS_CLASS && I2C

index 63dc0b0c5a51..b989803bedb9 100644
@@ -39,7 +39,6 @@ obj-$(CONFIG_LEDS_IS31FL319X)		+= leds-is31fl319x.o
 obj-$(CONFIG_LEDS_IS31FL32XX)		+= leds-is31fl32xx.o
 obj-$(CONFIG_LEDS_LM3530)		+= leds-lm3530.o
 obj-$(CONFIG_LEDS_LM3532)		+= leds-lm3532.o
-obj-$(CONFIG_LEDS_LM3533)		+= leds-lm3533.o
 obj-$(CONFIG_LEDS_LM355x)		+= leds-lm355x.o
 obj-$(CONFIG_LEDS_LM36274)		+= leds-lm36274.o
 obj-$(CONFIG_LEDS_LM3642)		+= leds-lm3642.o

index b0c7df448445..2cb2efafa8a4 100644
@@ -1917,19 +1917,6 @@ config MENELAUS
 	  and other features that are often used in portable devices like
 	  cell phones and PDAs.
 
-config MFD_LM3533
-	tristate "TI/National Semiconductor LM3533 Lighting Power chip"
-	depends on I2C
-	select MFD_CORE
-	select REGMAP_I2C
-	help
-	  Say yes here to enable support for National Semiconductor / TI
-	  LM3533 Lighting Power chips.
-
-	  This driver provides common support for accessing the device;
-	  additional drivers must be enabled in order to use the LED,
-	  backlight or ambient-light-sensor functionality of the device.
-
 config MFD_TIMBERDALE
 	tristate "Timberdale FPGA"
 	select MFD_CORE

index cf3c70364538..8bd4c3e218bb 100644
@@ -227,7 +227,6 @@ obj-$(CONFIG_MFD_SEC_CORE)	+= sec-core.o
 obj-$(CONFIG_MFD_SEC_ACPM)	+= sec-acpm.o
 obj-$(CONFIG_MFD_SEC_I2C)	+= sec-i2c.o
 obj-$(CONFIG_MFD_SYSCON)	+= syscon.o
-obj-$(CONFIG_MFD_LM3533)	+= lm3533-core.o lm3533-ctrlbank.o
 obj-$(CONFIG_MFD_VEXPRESS_SYSREG)	+= vexpress-sysreg.o
 obj-$(CONFIG_MFD_RETU)		+= retu-mfd.o
 obj-$(CONFIG_MFD_AS3711)	+= as3711.o

index 4acbac1bbb9e..bd88c88d7cf2 100644
@@ -215,17 +215,6 @@ config BACKLIGHT_SY7758
 	  Say Y to enable the backlight driver for the Silergy SY7758
 	  backlight controller found in Ayaneo Pocket S2.
 
-config BACKLIGHT_LM3533
-	tristate "Backlight Driver for LM3533"
-	depends on MFD_LM3533
-	help
-	  Say Y to enable the backlight driver for National Semiconductor / TI
-	  LM3533 Lighting Power chips.
-
-	  The backlights can be controlled directly, through PWM input, or by
-	  the ambient-light-sensor interface. The chip supports 256 brightness
-	  levels.
-
 config BACKLIGHT_LOCOMO
 	tristate "Sharp LOCOMO LCD/Backlight Driver"
 	depends on SHARP_LOCOMO

index e11175bdd500..d98e60664af6 100644
@@ -37,7 +37,6 @@ obj-$(CONFIG_BACKLIGHT_KTD253)		+= ktd253-backlight.o
 obj-$(CONFIG_BACKLIGHT_KTD2801)		+= ktd2801-backlight.o
 obj-$(CONFIG_BACKLIGHT_KTZ8866)		+= ktz8866.o
 obj-$(CONFIG_BACKLIGHT_LM3509)		+= lm3509_bl.o
-obj-$(CONFIG_BACKLIGHT_LM3533)		+= lm3533_bl.o
 obj-$(CONFIG_BACKLIGHT_LM3630A)		+= lm3630a_bl.o
 obj-$(CONFIG_BACKLIGHT_LM3639)		+= lm3639_bl.o
 obj-$(CONFIG_BACKLIGHT_LOCOMO)		+= locomolcd.o

index 2cb2efafa8a4..fbcc45d2b0c4 100644
@@ -1291,20 +1291,6 @@ config MFD_RT5120
 	  is targeted at providing the CPU voltage, memory, I/O and peripheral
 	  power rails in home entertainment devices.
 
-config MFD_RC5T583
-	bool "Ricoh RC5T583 Power Management system device"
-	depends on I2C=y
-	select MFD_CORE
-	select REGMAP_I2C
-	help
-	  Select this option to get support for the RICOH583 Power
-	  Management system device.
-	  This driver provides common support for accessing the device
-	  through i2c interface. The device supports multiple sub-devices
-	  like GPIO, interrupts, RTC, LDO and DCDC regulators, onkey.
-	  Additional drivers must be enabled in order to use the
-	  different functionality of the device.
-
 config MFD_RK8XX
 	tristate
 	select MFD_CORE

index 8bd4c3e218bb..7aaad5855681 100644
@@ -217,7 +217,6 @@ obj-$(CONFIG_MFD_INTEL_PMC_BXT)	+= intel_pmc_bxt.o
 obj-$(CONFIG_MFD_PALMAS)	+= palmas.o
 obj-$(CONFIG_MFD_VIPERBOARD)    += viperboard.o
 obj-$(CONFIG_MFD_NTXEC)		+= ntxec.o
-obj-$(CONFIG_MFD_RC5T583)	+= rc5t583.o rc5t583-irq.o
 obj-$(CONFIG_MFD_RK8XX)		+= rk8xx-core.o
 obj-$(CONFIG_MFD_RK8XX_I2C)	+= rk8xx-i2c.o
 obj-$(CONFIG_MFD_RK8XX_SPI)	+= rk8xx-spi.o

index 12d883e729bc..2d5eb954d122 100644
@@ -1214,16 +1214,6 @@ config REGULATOR_RASPBERRYPI_TOUCHSCREEN_V2
 	  unit. The regulator is used to enable power to the display and to
 	  control backlight PWM.
 
-config REGULATOR_RC5T583
-	tristate "RICOH RC5T583 Power regulators"
-	depends on MFD_RC5T583
-	help
-	  Select this option to enable the power regulator of RICOH
-	  PMIC RC5T583.
-	  This driver supports the control of different power rails of device
-	  through regulator interface. The device supports multiple DCDC/LDO
-	  outputs which can be controlled by i2c communication.
-
 config REGULATOR_RK808
 	tristate "Rockchip RK805/RK808/RK809/RK817/RK818 Power regulators"
 	depends on MFD_RK8XX

index 321c6ea73ee0..861f86c30c73 100644
@@ -140,7 +140,6 @@ obj-$(CONFIG_REGULATOR_PBIAS) += pbias-regulator.o
 obj-$(CONFIG_REGULATOR_RAA215300) += raa215300.o
 obj-$(CONFIG_REGULATOR_RASPBERRYPI_TOUCHSCREEN_ATTINY)  += rpi-panel-attiny-regulator.o
 obj-$(CONFIG_REGULATOR_RASPBERRYPI_TOUCHSCREEN_V2)  += rpi-panel-v2-regulator.o
-obj-$(CONFIG_REGULATOR_RC5T583)  += rc5t583-regulator.o
 obj-$(CONFIG_REGULATOR_RK808)   += rk808-regulator.o
 obj-$(CONFIG_REGULATOR_RN5T618) += rn5t618-regulator.o
 obj-$(CONFIG_REGULATOR_ROHM)	+= rohm-regulator.o

index c201948b4d5b..c71398368f6d 100644
@@ -630,16 +630,6 @@ config RTC_DRV_TPS65910
 	  This driver can also be built as a module. If so, the module
 	  will be called rtc-tps65910.
 
-config RTC_DRV_RC5T583
-	tristate "RICOH 5T583 RTC driver"
-	depends on MFD_RC5T583
-	help
-	  If you say yes here you get support for the RTC on the
-	  RICOH 5T583 chips.
-
-	  This driver can also be built as a module. If so, the module
-	  will be called rtc-rc5t583.
-
 config RTC_DRV_RC5T619
 	tristate "RICOH RC5T619 RTC driver"
 	depends on MFD_RN5T618

index 84bb2af5849e..b8fc1a17d27f 100644
@@ -143,7 +143,6 @@ obj-$(CONFIG_RTC_DRV_PS3)	+= rtc-ps3.o
 obj-$(CONFIG_RTC_DRV_PXA)	+= rtc-pxa.o
 obj-$(CONFIG_RTC_DRV_R7301)	+= rtc-r7301.o
 obj-$(CONFIG_RTC_DRV_R9701)	+= rtc-r9701.o
-obj-$(CONFIG_RTC_DRV_RC5T583)	+= rtc-rc5t583.o
 obj-$(CONFIG_RTC_DRV_RC5T619)	+= rtc-rc5t619.o
 obj-$(CONFIG_RTC_DRV_RK808)	+= rtc-rk808.o
 obj-$(CONFIG_RTC_DRV_RP5C01)	+= rtc-rp5c01.o

index 9955a525436a..263fbad189c7 100644
@@ -296,7 +296,6 @@ Hardware Monitoring Kernel Drivers
    w83l785ts
    w83l786ng
    wm831x
-   wm8350
    xgene-hwmon
    xdp710
    xdpe12284

deleted file mode 100644
index cec044ca5900..000000000000
@@ -1,30 +0,0 @@
-Kernel driver wm8350-hwmon
-==========================
-
-Supported chips:
-
-  * Wolfson Microelectronics WM835x PMICs
-
-    Prefix: 'wm8350'
-
-    Datasheet:
-
-	- http://www.wolfsonmicro.com/products/WM8350
-	- http://www.wolfsonmicro.com/products/WM8351
-	- http://www.wolfsonmicro.com/products/WM8352
-
-Authors: Mark Brown <[email protected]>
-
-Description
------------
-
-The WM835x series of PMICs include an AUXADC which can be used to
-monitor a range of system operating parameters, including the voltages
-of the major supplies within the system.  Currently the driver provides
-simple access to these major supplies.
-
-Voltage Monitoring
-------------------
-
-Voltages are sampled by a 12 bit ADC.  For the internal supplies the ADC
-is referenced to the system VRTC.

index 502cb6adbeda..8299d6e8d070 100644
@@ -699,13 +699,6 @@ wm831x_wdt:
 
 -------------------------------------------------
 
-wm8350_wdt:
-    nowayout:
-	Watchdog cannot be stopped once started
-	(default=kernel config parameter)
-
--------------------------------------------------
-
 sun4v_wdt:
     timeout_ms:
 	Watchdog timeout in milliseconds 1..180000, default=60000)

index 360655cce7d1..fa15f7f72454 100644
@@ -29385,7 +29385,6 @@ F:	drivers/video/backlight/wm83*_bl.c
 F:	drivers/watchdog/wm83*_wdt.c
 F:	include/linux/mfd/arizona/
 F:	include/linux/mfd/wm831x/
-F:	include/linux/mfd/wm8350/
 F:	include/linux/regulator/arizona*
 F:	include/linux/wm97xx.h
 F:	include/sound/wm????.h

index 98b9931c59ff..b64dcc0aa9af 100644
@@ -1792,13 +1792,6 @@ config GPIO_WM831X
 	  Say yes here to access the GPIO signals of WM831x power management
 	  chips from Wolfson Microelectronics.
 
-config GPIO_WM8350
-	tristate "WM8350 GPIOs"
-	depends on MFD_WM8350
-	help
-	  Say yes here to access the GPIO signals of WM8350 power management
-	  chips from Wolfson Microelectronics.
-
 config GPIO_WM8994
 	tristate "WM8994 GPIOs"
 	depends on MFD_WM8994

index 1fafd15d3fa6..2663a9cb435d 100644
@@ -211,7 +211,6 @@ obj-$(CONFIG_GPIO_WCD934X)		+= gpio-wcd934x.o
 obj-$(CONFIG_GPIO_WHISKEY_COVE)		+= gpio-wcove.o
 obj-$(CONFIG_GPIO_WINBOND)		+= gpio-winbond.o
 obj-$(CONFIG_GPIO_WM831X)		+= gpio-wm831x.o
-obj-$(CONFIG_GPIO_WM8350)		+= gpio-wm8350.o
 obj-$(CONFIG_GPIO_WM8994)		+= gpio-wm8994.o
 obj-$(CONFIG_GPIO_WS16C48)		+= gpio-ws16c48.o
 obj-$(CONFIG_GPIO_XGENE)		+= gpio-xgene.o

index fecff8610ea8..74e82fa1b099 100644
@@ -2728,16 +2728,6 @@ config SENSORS_WM831X
 	  This driver can also be built as a module. If so, the module
 	  will be called wm831x-hwmon.
 
-config SENSORS_WM8350
-	tristate "Wolfson Microelectronics WM835x"
-	depends on MFD_WM8350
-	help
-	  If you say yes here you get support for the hardware
-	  monitoring features of the WM835x series of PMICs.
-
-	  This driver can also be built as a module. If so, the module
-	  will be called wm8350-hwmon.
-
 config SENSORS_ULTRA45
 	tristate "Sun Ultra45 PIC16F747"
 	depends on SPARC64

index 1229b6b3996d..64c97f337e40 100644
@@ -251,7 +251,6 @@ obj-$(CONFIG_SENSORS_W83627EHF)	+= w83627ehf.o
 obj-$(CONFIG_SENSORS_W83L785TS)	+= w83l785ts.o
 obj-$(CONFIG_SENSORS_W83L786NG)	+= w83l786ng.o
 obj-$(CONFIG_SENSORS_WM831X)	+= wm831x-hwmon.o
-obj-$(CONFIG_SENSORS_WM8350)	+= wm8350-hwmon.o
 obj-$(CONFIG_SENSORS_XGENE)	+= xgene-hwmon.o
 obj-$(CONFIG_SENSORS_YOGAFAN)	+= yogafan.o
 

index 1a0663a6501c..7afcf00dea49 100644
@@ -610,14 +610,6 @@ config LEDS_WM831X_STATUS
 	  This option enables support for the status LEDs of the WM831x
 	  series of PMICs.
 
-config LEDS_WM8350
-	tristate "LED Support for WM8350 AudioPlus PMIC"
-	depends on LEDS_CLASS
-	depends on MFD_WM8350
-	help
-	  This option enables support for LEDs driven by the Wolfson
-	  Microelectronics WM8350 AudioPlus PMIC.
-
 config LEDS_DA9052
 	tristate "Dialog DA9052/DA9053 LEDS"
 	depends on LEDS_CLASS

index b989803bedb9..8de413d714d0 100644
@@ -94,7 +94,6 @@ obj-$(CONFIG_LEDS_TPS6105X)		+= leds-tps6105x.o
 obj-$(CONFIG_LEDS_TURRIS_OMNIA)		+= leds-turris-omnia.o
 obj-$(CONFIG_LEDS_UPBOARD)		+= leds-upboard.o
 obj-$(CONFIG_LEDS_WM831X_STATUS)	+= leds-wm831x-status.o
-obj-$(CONFIG_LEDS_WM8350)		+= leds-wm8350.o
 obj-$(CONFIG_LEDS_WRAP)			+= leds-wrap.o
 
 # Kinetic ExpressWire Protocol

index fbcc45d2b0c4..8a3bbb628693 100644
@@ -2027,21 +2027,6 @@ config MFD_WM831X_SPI
 	  for accessing the device, additional drivers must be enabled in
 	  order to use the functionality of the device.
 
-config MFD_WM8350
-	bool
-
-config MFD_WM8350_I2C
-	bool "Wolfson Microelectronics WM8350 with I2C"
-	select MFD_WM8350
-	select REGMAP_I2C
-	depends on I2C=y
-	help
-	  The WM8350 is an integrated audio and power management
-	  subsystem with watchdog and RTC functionality for embedded
-	  systems.  This option enables core support for the WM8350 with
-	  I2C as the control interface.  Additional options must be
-	  selected to enable support for the functionality of the chip.
-
 config MFD_WM8994
 	tristate "Wolfson Microelectronics WM8994"
 	select MFD_CORE

index 7aaad5855681..2cdbc693ee33 100644
@@ -60,10 +60,6 @@ wm831x-objs			+= wm831x-auxadc.o
 obj-$(CONFIG_MFD_WM831X)	+= wm831x.o
 obj-$(CONFIG_MFD_WM831X_I2C)	+= wm831x-i2c.o
 obj-$(CONFIG_MFD_WM831X_SPI)	+= wm831x-spi.o
-wm8350-objs			:= wm8350-core.o wm8350-regmap.o wm8350-gpio.o
-wm8350-objs			+= wm8350-irq.o
-obj-$(CONFIG_MFD_WM8350)	+= wm8350.o
-obj-$(CONFIG_MFD_WM8350_I2C)	+= wm8350-i2c.o
 wm8994-objs			:= wm8994-core.o wm8994-irq.o wm8994-regmap.o
 obj-$(CONFIG_MFD_WM8994)	+= wm8994.o
 obj-$(CONFIG_MFD_WM97xx)	+= wm97xx-core.o

index 9bb2ac78dca9..d0b291db3f00 100644
@@ -74,13 +74,6 @@ config WM831X_POWER
 	  Say Y here to enable support for the power management unit
 	  provided by Wolfson Microelectronics WM831x PMICs.
 
-config WM8350_POWER
-	tristate "WM8350 PMU support"
-	depends on MFD_WM8350
-	help
-	  Say Y here to enable support for the power management unit
-	  provided by the Wolfson Microelectronics WM8350 PMIC.
-
 config TEST_POWER
 	tristate "Test power driver"
 	help

index 76422bece94c..22d5f32966f6 100644
@@ -16,7 +16,6 @@ obj-$(CONFIG_IP5XXX_POWER)	+= ip5xxx_power.o
 obj-$(CONFIG_MAX8925_POWER)	+= max8925_power.o
 obj-$(CONFIG_WM831X_BACKUP)	+= wm831x_backup.o
 obj-$(CONFIG_WM831X_POWER)	+= wm831x_power.o
-obj-$(CONFIG_WM8350_POWER)	+= wm8350_power.o
 obj-$(CONFIG_TEST_POWER)	+= test_power.o
 
 obj-$(CONFIG_BATTERY_88PM860X)	+= 88pm860x_battery.o

index 2d5eb954d122..940456a62b0b 100644
@@ -1824,13 +1824,6 @@ config REGULATOR_WM831X
 	  Support the voltage and current regulators of the WM831x series
 	  of PMIC devices.
 
-config REGULATOR_WM8350
-	tristate "Wolfson Microelectronics WM8350 AudioPlus PMIC"
-	depends on MFD_WM8350
-	help
-	  This driver provides support for the voltage and current regulators
-	  of the WM8350 AudioPlus PMIC.
-
 config REGULATOR_WM8994
 	tristate "Wolfson Microelectronics WM8994 CODEC"
 	depends on MFD_WM8994

index 861f86c30c73..da4c6b3b21c8 100644
@@ -209,7 +209,6 @@ obj-$(CONFIG_REGULATOR_VQMMC_IPQ4019) += vqmmc-ipq4019-regulator.o
 obj-$(CONFIG_REGULATOR_WM831X) += wm831x-dcdc.o
 obj-$(CONFIG_REGULATOR_WM831X) += wm831x-isink.o
 obj-$(CONFIG_REGULATOR_WM831X) += wm831x-ldo.o
-obj-$(CONFIG_REGULATOR_WM8350) += wm8350-regulator.o
 obj-$(CONFIG_REGULATOR_WM8994) += wm8994-regulator.o
 
 ccflags-$(CONFIG_REGULATOR_DEBUG) += -DDEBUG

index c71398368f6d..4120ff2cebc3 100644

Lines of this file are not shown. View the raw message.

index b8fc1a17d27f..0c805fe59608 100644

Lines of this file are not shown. View the raw message.

index 7832cb8b2e7a..0327e36fc86a 100644

Lines of this file are not shown. View the raw message.

index 460be2a566c4..8626f812c657 100644

Lines of this file are not shown. View the raw message.

index 422e50ee0560..ff3a6e9c26c7 100644

Lines of this file are not shown. View the raw message.

index 3fc78f3b44ba..633c1bf8dd32 100644

Lines of this file are not shown. View the raw message.

index f544399675fa..eaaa03118fc1 100644
@@ -262,7 +262,6 @@
 		 10 = /dev/adbmouse	Apple Desktop Bus mouse
 		 11 = /dev/vrtpanel	Vr41xx embedded touch panel
 		 13 = /dev/vpcmouse	Connectix Virtual PC Mouse
-		 14 = /dev/touchscreen/ucb1x00  UCB 1x00 touchscreen
 		 15 = /dev/touchscreen/mk712	MK712 touchscreen
 		128 = /dev/beep		Fancy beep device
 		129 =

index 8a3bbb628693..0395af7270f9 100644
@@ -2258,30 +2258,6 @@ config MFD_QCOM_PM8008
 	  under it in the device tree. Additional drivers must be enabled in
 	  order to use the functionality of the device.
 
-menu "Multimedia Capabilities Port drivers"
-	depends on ARCH_SA1100
-
-config MCP
-	tristate
-
-# Interface drivers
-config MCP_SA11X0
-	tristate "Support SA11x0 MCP interface"
-	depends on ARCH_SA1100
-	select MCP
-
-# Chip drivers
-config MCP_UCB1200
-	tristate "Support for UCB1200 / UCB1300"
-	depends on MCP_SA11X0
-	select MCP
-
-config MCP_UCB1200_TS
-	tristate "Touchscreen interface support"
-	depends on MCP_UCB1200 && INPUT
-
-endmenu
-
 config MFD_VEXPRESS_SYSREG
 	tristate "Versatile Express System Registers"
 	depends on VEXPRESS_CONFIG && GPIOLIB

index 2cdbc693ee33..ff62e922209e 100644
@@ -126,14 +126,6 @@ obj-$(CONFIG_MFD_OCELOT)	+= ocelot-soc.o
 
 obj-$(CONFIG_MFD_CPCAP)		+= motorola-cpcap.o
 
-obj-$(CONFIG_MCP)		+= mcp-core.o
-obj-$(CONFIG_MCP_SA11X0)	+= mcp-sa11x0.o
-obj-$(CONFIG_MCP_UCB1200)	+= ucb1x00-core.o
-obj-$(CONFIG_MCP_UCB1200_TS)	+= ucb1x00-ts.o
-
-ifeq ($(CONFIG_SA1100_ASSABET),y)
-obj-$(CONFIG_MCP_UCB1200)	+= ucb1x00-assabet.o
-endif
 
 obj-$(CONFIG_PMIC_DA9052)	+= da9052-irq.o
 obj-$(CONFIG_PMIC_DA9052)	+= da9052-core.o

index 0395af7270f9..02e52398fcd2 100644
@@ -1893,16 +1893,6 @@ config TWL6040_CORE
 	  additional drivers must be enabled in order to use the
 	  functionality of the device (audio, vibra).
 
-config MENELAUS
-	bool "TI TWL92330/Menelaus PM chip"
-	depends on I2C=y && ARCH_OMAP2
-	help
-	  If you say yes here you get support for the Texas Instruments
-	  TWL92330/Menelaus Power Management chip. This include voltage
-	  regulators, Dual slot memory card transceivers, real-time clock
-	  and other features that are often used in portable devices like
-	  cell phones and PDAs.
-
 config MFD_TIMBERDALE
 	tristate "Timberdale FPGA"
 	select MFD_CORE

index ff62e922209e..a88a13c8bab8 100644
@@ -102,7 +102,6 @@ obj-$(CONFIG_MFD_TPS65912_SPI)  += tps65912-spi.o
 obj-$(CONFIG_MFD_TPS6594)	+= tps6594-core.o
 obj-$(CONFIG_MFD_TPS6594_I2C)	+= tps6594-i2c.o
 obj-$(CONFIG_MFD_TPS6594_SPI)	+= tps6594-spi.o
-obj-$(CONFIG_MENELAUS)		+= menelaus.o
 
 obj-$(CONFIG_TWL4030_CORE)	+= twl-core.o twl4030-irq.o twl6030-irq.o
 obj-$(CONFIG_TWL4030_POWER)    += twl4030-power.o

index 4120ff2cebc3..52be691c62ac 100644
@@ -570,15 +570,6 @@ config RTC_DRV_BQ32K
 	  This driver can also be built as a module. If so, the module
 	  will be called rtc-bq32k.
 
-config RTC_DRV_TWL92330
-	bool "TI TWL92330/Menelaus"
-	depends on MENELAUS
-	help
-	  If you say yes here you get support for the RTC on the
-	  TWL92330 "Menelaus" power management chip, used with OMAP2
-	  platforms. The support is integrated with the rest of
-	  the Menelaus driver; it's not separate module.
-
 config RTC_DRV_TWL4030
 	tristate "TI TWL4030/TWL5030/TWL6030/TPS659x0"
 	depends on TWL4030_CORE

index 02e52398fcd2..6189bd7cc109 100644
@@ -780,16 +780,6 @@ config MFD_INTEL_PMC_BXT
 	  Register and P-unit access. In addition this creates devices
 	  for iTCO watchdog and telemetry that are part of the PMC.
 
-config MFD_IPAQ_MICRO
-	bool "Atmel Micro ASIC (iPAQ h3100/h3600/h3700) Support"
-	depends on SA1100_H3600
-	select MFD_CORE
-	help
-	  Select this to get support for the Microcontroller found in
-	  the Compaq iPAQ handheld computers. This is an Atmel
-	  AT90LS8535 microcontroller flashed with a special iPAQ
-	  firmware using the custom protocol implemented in this driver.
-
 config MFD_IQS62X
 	tristate "Azoteq IQS620A/621/622/624/625 core support"
 	depends on I2C

index a88a13c8bab8..b56ff2e68d4a 100644
@@ -218,7 +218,6 @@ obj-$(CONFIG_MFD_RETU)		+= retu-mfd.o
 obj-$(CONFIG_MFD_AS3711)	+= as3711.o
 obj-$(CONFIG_MFD_AS3722)	+= as3722.o
 obj-$(CONFIG_MFD_STW481X)	+= stw481x.o
-obj-$(CONFIG_MFD_IPAQ_MICRO)	+= ipaq-micro.o
 obj-$(CONFIG_MFD_IQS62X)	+= iqs62x.o
 obj-$(CONFIG_MFD_MENF21BMC)	+= menf21bmc.o
 obj-$(CONFIG_MFD_HI6421_PMIC)	+= hi6421-pmic-core.o