[PATCH 00/14] mfd: unused driver purge

@@ -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;
-			};
-...
-		};
-	};

@@ -1,152 +0,0 @@
-// SPDX-License-Identifier: GPL-2.0-only
-/*
- * Marvell 88PM80x ONKEY driver
- *
- * Copyright (C) 2012 Marvell International Ltd.
- * Haojian Zhuang <haojian.zhuang@marvell.com>
- * Qiao Zhou <zhouqiao@marvell.com>
- */
-
-#include <linux/kernel.h>
-#include <linux/module.h>
-#include <linux/input.h>
-#include <linux/mfd/88pm80x.h>
-#include <linux/regmap.h>
-#include <linux/slab.h>
-
-#define PM800_LONG_ONKEY_EN		(1 << 0)
-#define PM800_LONG_KEY_DELAY		(8)	/* 1 .. 16 seconds */
-#define PM800_LONKEY_PRESS_TIME		((PM800_LONG_KEY_DELAY-1) << 4)
-#define PM800_LONKEY_PRESS_TIME_MASK	(0xF0)
-#define PM800_SW_PDOWN			(1 << 5)
-
-struct pm80x_onkey_info {
-	struct input_dev *idev;
-	struct pm80x_chip *pm80x;
-	struct regmap *map;
-	int irq;
-};
-
-/* 88PM80x gives us an interrupt when ONKEY is held */
-static irqreturn_t pm80x_onkey_handler(int irq, void *data)
-{
-	struct pm80x_onkey_info *info = data;
-	int ret = 0;
-	unsigned int val;
-
-	ret = regmap_read(info->map, PM800_STATUS_1, &val);
-	if (ret < 0) {
-		dev_err(info->idev->dev.parent, "failed to read status: %d\n", ret);
-		return IRQ_NONE;
-	}
-	val &= PM800_ONKEY_STS1;
-
-	input_report_key(info->idev, KEY_POWER, val);
-	input_sync(info->idev);
-
-	return IRQ_HANDLED;
-}
-
-static SIMPLE_DEV_PM_OPS(pm80x_onkey_pm_ops, pm80x_dev_suspend,
-			 pm80x_dev_resume);
-
-static int pm80x_onkey_probe(struct platform_device *pdev)
-{
-
-	struct pm80x_chip *chip = dev_get_drvdata(pdev->dev.parent);
-	struct pm80x_onkey_info *info;
-	int err;
-
-	info = kzalloc_obj(*info);
-	if (!info)
-		return -ENOMEM;
-
-	info->pm80x = chip;
-
-	info->irq = platform_get_irq(pdev, 0);
-	if (info->irq < 0) {
-		err = -EINVAL;
-		goto out;
-	}
-
-	info->map = info->pm80x->regmap;
-	if (!info->map) {
-		dev_err(&pdev->dev, "no regmap!\n");
-		err = -EINVAL;
-		goto out;
-	}
-
-	info->idev = input_allocate_device();
-	if (!info->idev) {
-		dev_err(&pdev->dev, "Failed to allocate input dev\n");
-		err = -ENOMEM;
-		goto out;
-	}
-
-	info->idev->name = "88pm80x_on";
-	info->idev->phys = "88pm80x_on/input0";
-	info->idev->id.bustype = BUS_I2C;
-	info->idev->dev.parent = &pdev->dev;
-	info->idev->evbit[0] = BIT_MASK(EV_KEY);
-	__set_bit(KEY_POWER, info->idev->keybit);
-
-	err = pm80x_request_irq(info->pm80x, info->irq, pm80x_onkey_handler,
-					    IRQF_ONESHOT, "onkey", info);
-	if (err < 0) {
-		dev_err(&pdev->dev, "Failed to request IRQ: #%d: %d\n",
-			info->irq, err);
-		goto out_reg;
-	}
-
-	err = input_register_device(info->idev);
-	if (err) {
-		dev_err(&pdev->dev, "Can't register input device: %d\n", err);
-		goto out_irq;
-	}
-
-	platform_set_drvdata(pdev, info);
-
-	/* Enable long onkey detection */
-	regmap_update_bits(info->map, PM800_RTC_MISC4, PM800_LONG_ONKEY_EN,
-			   PM800_LONG_ONKEY_EN);
-	/* Set 8-second interval */
-	regmap_update_bits(info->map, PM800_RTC_MISC3,
-			   PM800_LONKEY_PRESS_TIME_MASK,
-			   PM800_LONKEY_PRESS_TIME);
-
-	device_init_wakeup(&pdev->dev, 1);
-	return 0;
-
-out_irq:
-	pm80x_free_irq(info->pm80x, info->irq, info);
-out_reg:
-	input_free_device(info->idev);
-out:
-	kfree(info);
-	return err;
-}
-
-static void pm80x_onkey_remove(struct platform_device *pdev)
-{
-	struct pm80x_onkey_info *info = platform_get_drvdata(pdev);
-
-	pm80x_free_irq(info->pm80x, info->irq, info);
-	input_unregister_device(info->idev);
-	kfree(info);
-}
-
-static struct platform_driver pm80x_onkey_driver = {
-	.driver = {
-		   .name = "88pm80x-onkey",
-		   .pm = &pm80x_onkey_pm_ops,
-		   },
-	.probe = pm80x_onkey_probe,
-	.remove = pm80x_onkey_remove,
-};
-
-module_platform_driver(pm80x_onkey_driver);
-
-MODULE_LICENSE("GPL");
-MODULE_DESCRIPTION("Marvell 88PM80x ONKEY driver");
-MODULE_AUTHOR("Qiao Zhou <zhouqiao@marvell.com>");
-MODULE_ALIAS("platform:88pm80x-onkey");

@@ -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

@@ -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

@@ -1,619 +0,0 @@
-/*
- * Base driver for Marvell 88PM800
- *
- * Copyright (C) 2012 Marvell International Ltd.
- * Haojian Zhuang <haojian.zhuang@marvell.com>
- * Joseph(Yossi) Hanin <yhanin@marvell.com>
- * Qiao Zhou <zhouqiao@marvell.com>
- *
- * This file is subject to the terms and conditions of the GNU General
- * Public License. See the file "COPYING" in the main directory of this
- * archive for more details.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- */
-
-#include <linux/kernel.h>
-#include <linux/module.h>
-#include <linux/err.h>
-#include <linux/i2c.h>
-#include <linux/mfd/core.h>
-#include <linux/mfd/88pm80x.h>
-#include <linux/slab.h>
-
-/* Interrupt Registers */
-#define PM800_INT_STATUS1		(0x05)
-#define PM800_ONKEY_INT_STS1		(1 << 0)
-#define PM800_EXTON_INT_STS1		(1 << 1)
-#define PM800_CHG_INT_STS1			(1 << 2)
-#define PM800_BAT_INT_STS1			(1 << 3)
-#define PM800_RTC_INT_STS1			(1 << 4)
-#define PM800_CLASSD_OC_INT_STS1	(1 << 5)
-
-#define PM800_INT_STATUS2		(0x06)
-#define PM800_VBAT_INT_STS2		(1 << 0)
-#define PM800_VSYS_INT_STS2		(1 << 1)
-#define PM800_VCHG_INT_STS2		(1 << 2)
-#define PM800_TINT_INT_STS2		(1 << 3)
-#define PM800_GPADC0_INT_STS2	(1 << 4)
-#define PM800_TBAT_INT_STS2		(1 << 5)
-#define PM800_GPADC2_INT_STS2	(1 << 6)
-#define PM800_GPADC3_INT_STS2	(1 << 7)
-
-#define PM800_INT_STATUS3		(0x07)
-
-#define PM800_INT_STATUS4		(0x08)
-#define PM800_GPIO0_INT_STS4		(1 << 0)
-#define PM800_GPIO1_INT_STS4		(1 << 1)
-#define PM800_GPIO2_INT_STS4		(1 << 2)
-#define PM800_GPIO3_INT_STS4		(1 << 3)
-#define PM800_GPIO4_INT_STS4		(1 << 4)
-
-#define PM800_INT_ENA_1		(0x09)
-#define PM800_ONKEY_INT_ENA1		(1 << 0)
-#define PM800_EXTON_INT_ENA1		(1 << 1)
-#define PM800_CHG_INT_ENA1			(1 << 2)
-#define PM800_BAT_INT_ENA1			(1 << 3)
-#define PM800_RTC_INT_ENA1			(1 << 4)
-#define PM800_CLASSD_OC_INT_ENA1	(1 << 5)
-
-#define PM800_INT_ENA_2		(0x0A)
-#define PM800_VBAT_INT_ENA2		(1 << 0)
-#define PM800_VSYS_INT_ENA2		(1 << 1)
-#define PM800_VCHG_INT_ENA2		(1 << 2)
-#define PM800_TINT_INT_ENA2		(1 << 3)
-
-#define PM800_INT_ENA_3		(0x0B)
-#define PM800_GPADC0_INT_ENA3		(1 << 0)
-#define PM800_GPADC1_INT_ENA3		(1 << 1)
-#define PM800_GPADC2_INT_ENA3		(1 << 2)
-#define PM800_GPADC3_INT_ENA3		(1 << 3)
-#define PM800_GPADC4_INT_ENA3		(1 << 4)
-
-#define PM800_INT_ENA_4		(0x0C)
-#define PM800_GPIO0_INT_ENA4		(1 << 0)
-#define PM800_GPIO1_INT_ENA4		(1 << 1)
-#define PM800_GPIO2_INT_ENA4		(1 << 2)
-#define PM800_GPIO3_INT_ENA4		(1 << 3)
-#define PM800_GPIO4_INT_ENA4		(1 << 4)
-
-/* number of INT_ENA & INT_STATUS regs */
-#define PM800_INT_REG_NUM			(4)
-
-/* Interrupt Number in 88PM800 */
-enum {
-	PM800_IRQ_ONKEY,	/*EN1b0 *//*0 */
-	PM800_IRQ_EXTON,	/*EN1b1 */
-	PM800_IRQ_CHG,		/*EN1b2 */
-	PM800_IRQ_BAT,		/*EN1b3 */
-	PM800_IRQ_RTC,		/*EN1b4 */
-	PM800_IRQ_CLASSD,	/*EN1b5 *//*5 */
-	PM800_IRQ_VBAT,		/*EN2b0 */
-	PM800_IRQ_VSYS,		/*EN2b1 */
-	PM800_IRQ_VCHG,		/*EN2b2 */
-	PM800_IRQ_TINT,		/*EN2b3 */
-	PM800_IRQ_GPADC0,	/*EN3b0 *//*10 */
-	PM800_IRQ_GPADC1,	/*EN3b1 */
-	PM800_IRQ_GPADC2,	/*EN3b2 */
-	PM800_IRQ_GPADC3,	/*EN3b3 */
-	PM800_IRQ_GPADC4,	/*EN3b4 */
-	PM800_IRQ_GPIO0,	/*EN4b0 *//*15 */
-	PM800_IRQ_GPIO1,	/*EN4b1 */
-	PM800_IRQ_GPIO2,	/*EN4b2 */
-	PM800_IRQ_GPIO3,	/*EN4b3 */
-	PM800_IRQ_GPIO4,	/*EN4b4 *//*19 */
-	PM800_MAX_IRQ,
-};
-
-/* PM800: generation identification number */
-#define PM800_CHIP_GEN_ID_NUM	0x3
-
-static const struct i2c_device_id pm80x_id_table[] = {
-	{ "88PM800" },
-	{} /* NULL terminated */
-};
-MODULE_DEVICE_TABLE(i2c, pm80x_id_table);
-
-static const struct resource rtc_resources[] = {
-	DEFINE_RES_IRQ_NAMED(PM800_IRQ_RTC, "88pm80x-rtc"),
-};
-
-static struct mfd_cell rtc_devs[] = {
-	{
-	 .name = "88pm80x-rtc",
-	 .num_resources = ARRAY_SIZE(rtc_resources),
-	 .resources = &rtc_resources[0],
-	 .id = -1,
-	 },
-};
-
-static struct resource onkey_resources[] = {
-	DEFINE_RES_IRQ_NAMED(PM800_IRQ_ONKEY, "88pm80x-onkey"),
-};
-
-static const struct mfd_cell onkey_devs[] = {
-	{
-	 .name = "88pm80x-onkey",
-	 .num_resources = 1,
-	 .resources = &onkey_resources[0],
-	 .id = -1,
-	 },
-};
-
-static const struct mfd_cell regulator_devs[] = {
-	{
-	 .name = "88pm80x-regulator",
-	 .id = -1,
-	},
-};
-
-static const struct regmap_irq pm800_irqs[] = {
-	/* INT0 */
-	[PM800_IRQ_ONKEY] = {
-		.mask = PM800_ONKEY_INT_ENA1,
-	},
-	[PM800_IRQ_EXTON] = {
-		.mask = PM800_EXTON_INT_ENA1,
-	},
-	[PM800_IRQ_CHG] = {
-		.mask = PM800_CHG_INT_ENA1,
-	},
-	[PM800_IRQ_BAT] = {
-		.mask = PM800_BAT_INT_ENA1,
-	},
-	[PM800_IRQ_RTC] = {
-		.mask = PM800_RTC_INT_ENA1,
-	},
-	[PM800_IRQ_CLASSD] = {
-		.mask = PM800_CLASSD_OC_INT_ENA1,
-	},
-	/* INT1 */
-	[PM800_IRQ_VBAT] = {
-		.reg_offset = 1,
-		.mask = PM800_VBAT_INT_ENA2,
-	},
-	[PM800_IRQ_VSYS] = {
-		.reg_offset = 1,
-		.mask = PM800_VSYS_INT_ENA2,
-	},
-	[PM800_IRQ_VCHG] = {
-		.reg_offset = 1,
-		.mask = PM800_VCHG_INT_ENA2,
-	},
-	[PM800_IRQ_TINT] = {
-		.reg_offset = 1,
-		.mask = PM800_TINT_INT_ENA2,
-	},
-	/* INT2 */
-	[PM800_IRQ_GPADC0] = {
-		.reg_offset = 2,
-		.mask = PM800_GPADC0_INT_ENA3,
-	},
-	[PM800_IRQ_GPADC1] = {
-		.reg_offset = 2,
-		.mask = PM800_GPADC1_INT_ENA3,
-	},
-	[PM800_IRQ_GPADC2] = {
-		.reg_offset = 2,
-		.mask = PM800_GPADC2_INT_ENA3,
-	},
-	[PM800_IRQ_GPADC3] = {
-		.reg_offset = 2,
-		.mask = PM800_GPADC3_INT_ENA3,
-	},
-	[PM800_IRQ_GPADC4] = {
-		.reg_offset = 2,
-		.mask = PM800_GPADC4_INT_ENA3,
-	},
-	/* INT3 */
-	[PM800_IRQ_GPIO0] = {
-		.reg_offset = 3,
-		.mask = PM800_GPIO0_INT_ENA4,
-	},
-	[PM800_IRQ_GPIO1] = {
-		.reg_offset = 3,
-		.mask = PM800_GPIO1_INT_ENA4,
-	},
-	[PM800_IRQ_GPIO2] = {
-		.reg_offset = 3,
-		.mask = PM800_GPIO2_INT_ENA4,
-	},
-	[PM800_IRQ_GPIO3] = {
-		.reg_offset = 3,
-		.mask = PM800_GPIO3_INT_ENA4,
-	},
-	[PM800_IRQ_GPIO4] = {
-		.reg_offset = 3,
-		.mask = PM800_GPIO4_INT_ENA4,
-	},
-};
-
-static int device_gpadc_init(struct pm80x_chip *chip,
-				       struct pm80x_platform_data *pdata)
-{
-	struct pm80x_subchip *subchip = chip->subchip;
-	struct regmap *map = subchip->regmap_gpadc;
-	int data = 0, mask = 0, ret = 0;
-
-	if (!map) {
-		dev_warn(chip->dev,
-			 "Warning: gpadc regmap is not available!\n");
-		return -EINVAL;
-	}
-	/*
-	 * initialize GPADC without activating it turn on GPADC
-	 * measurments
-	 */
-	ret = regmap_update_bits(map,
-				 PM800_GPADC_MISC_CONFIG2,
-				 PM800_GPADC_MISC_GPFSM_EN,
-				 PM800_GPADC_MISC_GPFSM_EN);
-	if (ret < 0)
-		goto out;
-	/*
-	 * This function configures the ADC as requires for
-	 * CP implementation.CP does not "own" the ADC configuration
-	 * registers and relies on AP.
-	 * Reason: enable automatic ADC measurements needed
-	 * for CP to get VBAT and RF temperature readings.
-	 */
-	ret = regmap_update_bits(map, PM800_GPADC_MEAS_EN1,
-				 PM800_MEAS_EN1_VBAT, PM800_MEAS_EN1_VBAT);
-	if (ret < 0)
-		goto out;
-	ret = regmap_update_bits(map, PM800_GPADC_MEAS_EN2,
-				 (PM800_MEAS_EN2_RFTMP | PM800_MEAS_GP0_EN),
-				 (PM800_MEAS_EN2_RFTMP | PM800_MEAS_GP0_EN));
-	if (ret < 0)
-		goto out;
-
-	/*
-	 * the defult of PM800 is GPADC operates at 100Ks/s rate
-	 * and Number of GPADC slots with active current bias prior
-	 * to GPADC sampling = 1 slot for all GPADCs set for
-	 * Temprature mesurmants
-	 */
-	mask = (PM800_GPADC_GP_BIAS_EN0 | PM800_GPADC_GP_BIAS_EN1 |
-		PM800_GPADC_GP_BIAS_EN2 | PM800_GPADC_GP_BIAS_EN3);
-
-	if (pdata && (pdata->batt_det == 0))
-		data = (PM800_GPADC_GP_BIAS_EN0 | PM800_GPADC_GP_BIAS_EN1 |
-			PM800_GPADC_GP_BIAS_EN2 | PM800_GPADC_GP_BIAS_EN3);
-	else
-		data = (PM800_GPADC_GP_BIAS_EN0 | PM800_GPADC_GP_BIAS_EN2 |
-			PM800_GPADC_GP_BIAS_EN3);
-
-	ret = regmap_update_bits(map, PM800_GP_BIAS_ENA1, mask, data);
-	if (ret < 0)
-		goto out;
-
-	dev_info(chip->dev, "pm800 device_gpadc_init: Done\n");
-	return 0;
-
-out:
-	dev_info(chip->dev, "pm800 device_gpadc_init: Failed!\n");
-	return ret;
-}
-
-static int device_onkey_init(struct pm80x_chip *chip,
-				struct pm80x_platform_data *pdata)
-{
-	int ret;
-
-	ret = mfd_add_devices(chip->dev, 0, &onkey_devs[0],
-			      ARRAY_SIZE(onkey_devs), &onkey_resources[0], 0,
-			      NULL);
-	if (ret) {
-		dev_err(chip->dev, "Failed to add onkey subdev\n");
-		return ret;
-	}
-
-	return 0;
-}
-
-static int device_rtc_init(struct pm80x_chip *chip,
-				struct pm80x_platform_data *pdata)
-{
-	int ret;
-
-	if (pdata) {
-		rtc_devs[0].platform_data = pdata->rtc;
-		rtc_devs[0].pdata_size =
-				pdata->rtc ? sizeof(struct pm80x_rtc_pdata) : 0;
-	}
-	ret = mfd_add_devices(chip->dev, 0, &rtc_devs[0],
-			      ARRAY_SIZE(rtc_devs), NULL, 0, NULL);
-	if (ret) {
-		dev_err(chip->dev, "Failed to add rtc subdev\n");
-		return ret;
-	}
-
-	return 0;
-}
-
-static int device_regulator_init(struct pm80x_chip *chip,
-					   struct pm80x_platform_data *pdata)
-{
-	int ret;
-
-	ret = mfd_add_devices(chip->dev, 0, &regulator_devs[0],
-			      ARRAY_SIZE(regulator_devs), NULL, 0, NULL);
-	if (ret) {
-		dev_err(chip->dev, "Failed to add regulator subdev\n");
-		return ret;
-	}
-
-	return 0;
-}
-
-static int device_irq_init_800(struct pm80x_chip *chip)
-{
-	struct regmap *map = chip->regmap;
-	unsigned long flags = IRQF_ONESHOT;
-	int data, mask, ret = -EINVAL;
-
-	if (!map || !chip->irq) {
-		dev_err(chip->dev, "incorrect parameters\n");
-		return -EINVAL;
-	}
-
-	/*
-	 * irq_mode defines the way of clearing interrupt. it's read-clear by
-	 * default.
-	 */
-	mask =
-	    PM800_WAKEUP2_INV_INT | PM800_WAKEUP2_INT_CLEAR |
-	    PM800_WAKEUP2_INT_MASK;
-
-	data = PM800_WAKEUP2_INT_CLEAR;
-	ret = regmap_update_bits(map, PM800_WAKEUP2, mask, data);
-
-	if (ret < 0)
-		goto out;
-
-	ret =
-	    regmap_add_irq_chip(chip->regmap, chip->irq, flags, -1,
-				chip->regmap_irq_chip, &chip->irq_data);
-
-out:
-	return ret;
-}
-
-static void device_irq_exit_800(struct pm80x_chip *chip)
-{
-	regmap_del_irq_chip(chip->irq, chip->irq_data);
-}
-
-static const struct regmap_irq_chip pm800_irq_chip = {
-	.name = "88pm800",
-	.irqs = pm800_irqs,
-	.num_irqs = ARRAY_SIZE(pm800_irqs),
-
-	.num_regs = 4,
-	.status_base = PM800_INT_STATUS1,
-	.unmask_base = PM800_INT_ENA_1,
-	.ack_base = PM800_INT_STATUS1,
-};
-
-static int pm800_pages_init(struct pm80x_chip *chip)
-{
-	struct pm80x_subchip *subchip;
-	struct i2c_client *client = chip->client;
-
-	int ret = 0;
-
-	subchip = chip->subchip;
-	if (!subchip || !subchip->power_page_addr || !subchip->gpadc_page_addr)
-		return -ENODEV;
-
-	/* PM800 block power page */
-	subchip->power_page = i2c_new_dummy_device(client->adapter,
-					    subchip->power_page_addr);
-	if (IS_ERR(subchip->power_page)) {
-		ret = PTR_ERR(subchip->power_page);
-		goto out;
-	}
-
-	subchip->regmap_power = devm_regmap_init_i2c(subchip->power_page,
-						     &pm80x_regmap_config);
-	if (IS_ERR(subchip->regmap_power)) {
-		ret = PTR_ERR(subchip->regmap_power);
-		dev_err(chip->dev,
-			"Failed to allocate regmap_power: %d\n", ret);
-		goto out;
-	}
-
-	i2c_set_clientdata(subchip->power_page, chip);
-
-	/* PM800 block GPADC */
-	subchip->gpadc_page = i2c_new_dummy_device(client->adapter,
-					    subchip->gpadc_page_addr);
-	if (IS_ERR(subchip->gpadc_page)) {
-		ret = PTR_ERR(subchip->gpadc_page);
-		goto out;
-	}
-
-	subchip->regmap_gpadc = devm_regmap_init_i2c(subchip->gpadc_page,
-						     &pm80x_regmap_config);
-	if (IS_ERR(subchip->regmap_gpadc)) {
-		ret = PTR_ERR(subchip->regmap_gpadc);
-		dev_err(chip->dev,
-			"Failed to allocate regmap_gpadc: %d\n", ret);
-		goto out;
-	}
-	i2c_set_clientdata(subchip->gpadc_page, chip);
-
-out:
-	return ret;
-}
-
-static void pm800_pages_exit(struct pm80x_chip *chip)
-{
-	struct pm80x_subchip *subchip;
-
-	subchip = chip->subchip;
-
-	if (subchip && subchip->power_page)
-		i2c_unregister_device(subchip->power_page);
-
-	if (subchip && subchip->gpadc_page)
-		i2c_unregister_device(subchip->gpadc_page);
-}
-
-static int device_800_init(struct pm80x_chip *chip,
-				     struct pm80x_platform_data *pdata)
-{
-	int ret;
-	unsigned int val;
-
-	/*
-	 * alarm wake up bit will be clear in device_irq_init(),
-	 * read before that
-	 */
-	ret = regmap_read(chip->regmap, PM800_RTC_CONTROL, &val);
-	if (ret < 0) {
-		dev_err(chip->dev, "Failed to read RTC register: %d\n", ret);
-		goto out;
-	}
-	if (val & PM800_ALARM_WAKEUP) {
-		if (pdata && pdata->rtc)
-			pdata->rtc->rtc_wakeup = 1;
-	}
-
-	ret = device_gpadc_init(chip, pdata);
-	if (ret < 0) {
-		dev_err(chip->dev, "[%s]Failed to init gpadc\n", __func__);
-		goto out;
-	}
-
-	chip->regmap_irq_chip = &pm800_irq_chip;
-
-	ret = device_irq_init_800(chip);
-	if (ret < 0) {
-		dev_err(chip->dev, "[%s]Failed to init pm800 irq\n", __func__);
-		goto out;
-	}
-
-	ret = device_onkey_init(chip, pdata);
-	if (ret) {
-		dev_err(chip->dev, "Failed to add onkey subdev\n");
-		goto out_dev;
-	}
-
-	ret = device_rtc_init(chip, pdata);
-	if (ret) {
-		dev_err(chip->dev, "Failed to add rtc subdev\n");
-		goto out;
-	}
-
-	ret = device_regulator_init(chip, pdata);
-	if (ret) {
-		dev_err(chip->dev, "Failed to add regulators subdev\n");
-		goto out;
-	}
-
-	return 0;
-out_dev:
-	mfd_remove_devices(chip->dev);
-	device_irq_exit_800(chip);
-out:
-	return ret;
-}
-
-static int pm800_probe(struct i2c_client *client)
-{
-	int ret = 0;
-	struct pm80x_chip *chip;
-	struct pm80x_platform_data *pdata = dev_get_platdata(&client->dev);
-	struct pm80x_subchip *subchip;
-
-	ret = pm80x_init(client);
-	if (ret) {
-		dev_err(&client->dev, "pm800_init fail\n");
-		goto out_init;
-	}
-
-	chip = i2c_get_clientdata(client);
-
-	/* init subchip for PM800 */
-	subchip =
-	    devm_kzalloc(&client->dev, sizeof(struct pm80x_subchip),
-			 GFP_KERNEL);
-	if (!subchip) {
-		ret = -ENOMEM;
-		goto err_subchip_alloc;
-	}
-
-	/* pm800 has 2 addtional pages to support power and gpadc. */
-	subchip->power_page_addr = client->addr + 1;
-	subchip->gpadc_page_addr = client->addr + 2;
-	chip->subchip = subchip;
-
-	ret = pm800_pages_init(chip);
-	if (ret) {
-		dev_err(&client->dev, "pm800_pages_init failed!\n");
-		goto err_device_init;
-	}
-
-	ret = device_800_init(chip, pdata);
-	if (ret) {
-		dev_err(chip->dev, "Failed to initialize 88pm800 devices\n");
-		goto err_device_init;
-	}
-
-	if (pdata && pdata->plat_config)
-		pdata->plat_config(chip, pdata);
-
-	return 0;
-
-err_device_init:
-	pm800_pages_exit(chip);
-err_subchip_alloc:
-	pm80x_deinit();
-out_init:
-	return ret;
-}
-
-static void pm800_remove(struct i2c_client *client)
-{
-	struct pm80x_chip *chip = i2c_get_clientdata(client);
-
-	mfd_remove_devices(chip->dev);
-	device_irq_exit_800(chip);
-
-	pm800_pages_exit(chip);
-	pm80x_deinit();
-}
-
-static struct i2c_driver pm800_driver = {
-	.driver = {
-		.name = "88PM800",
-		.pm = pm_sleep_ptr(&pm80x_pm_ops),
-		},
-	.probe = pm800_probe,
-	.remove = pm800_remove,
-	.id_table = pm80x_id_table,
-};
-
-static int __init pm800_i2c_init(void)
-{
-	return i2c_add_driver(&pm800_driver);
-}
-subsys_initcall(pm800_i2c_init);
-
-static void __exit pm800_i2c_exit(void)
-{
-	i2c_del_driver(&pm800_driver);
-}
-module_exit(pm800_i2c_exit);
-
-MODULE_DESCRIPTION("PMIC Driver for Marvell 88PM800");
-MODULE_AUTHOR("Qiao Zhou <zhouqiao@marvell.com>");
-MODULE_LICENSE("GPL");

@@ -1,275 +0,0 @@
-/*
- * Base driver for Marvell 88PM805
- *
- * Copyright (C) 2012 Marvell International Ltd.
- * Haojian Zhuang <haojian.zhuang@marvell.com>
- * Joseph(Yossi) Hanin <yhanin@marvell.com>
- * Qiao Zhou <zhouqiao@marvell.com>
- *
- * This file is subject to the terms and conditions of the GNU General
- * Public License. See the file "COPYING" in the main directory of this
- * archive for more details.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- */
-
-#include <linux/kernel.h>
-#include <linux/module.h>
-#include <linux/i2c.h>
-#include <linux/irq.h>
-#include <linux/mfd/core.h>
-#include <linux/mfd/88pm80x.h>
-#include <linux/slab.h>
-#include <linux/delay.h>
-
-static const struct i2c_device_id pm80x_id_table[] = {
-	{ "88PM805" },
-	{} /* NULL terminated */
-};
-MODULE_DEVICE_TABLE(i2c, pm80x_id_table);
-
-/* Interrupt Number in 88PM805 */
-enum {
-	PM805_IRQ_LDO_OFF,	/*0 */
-	PM805_IRQ_SRC_DPLL_LOCK,	/*1 */
-	PM805_IRQ_CLIP_FAULT,
-	PM805_IRQ_MIC_CONFLICT,
-	PM805_IRQ_HP2_SHRT,
-	PM805_IRQ_HP1_SHRT,	/*5 */
-	PM805_IRQ_FINE_PLL_FAULT,
-	PM805_IRQ_RAW_PLL_FAULT,
-	PM805_IRQ_VOLP_BTN_DET,
-	PM805_IRQ_VOLM_BTN_DET,
-	PM805_IRQ_SHRT_BTN_DET,	/*10 */
-	PM805_IRQ_MIC_DET,	/*11 */
-
-	PM805_MAX_IRQ,
-};
-
-static struct resource codec_resources[] = {
-	/* Headset microphone insertion or removal */
-	DEFINE_RES_IRQ_NAMED(PM805_IRQ_MIC_DET, "micin"),
-
-	/* Audio short HP1 */
-	DEFINE_RES_IRQ_NAMED(PM805_IRQ_HP1_SHRT, "audio-short1"),
-
-	/* Audio short HP2 */
-	DEFINE_RES_IRQ_NAMED(PM805_IRQ_HP2_SHRT, "audio-short2"),
-};
-
-static const struct mfd_cell codec_devs[] = {
-	{
-	 .name = "88pm80x-codec",
-	 .num_resources = ARRAY_SIZE(codec_resources),
-	 .resources = &codec_resources[0],
-	 .id = -1,
-	 },
-};
-
-static const struct regmap_irq pm805_irqs[] = {
-	/* INT0 */
-	[PM805_IRQ_LDO_OFF] = {
-		.mask = PM805_INT1_HP1_SHRT,
-	},
-	[PM805_IRQ_SRC_DPLL_LOCK] = {
-		.mask = PM805_INT1_HP2_SHRT,
-	},
-	[PM805_IRQ_CLIP_FAULT] = {
-		.mask = PM805_INT1_MIC_CONFLICT,
-	},
-	[PM805_IRQ_MIC_CONFLICT] = {
-		.mask = PM805_INT1_CLIP_FAULT,
-	},
-	[PM805_IRQ_HP2_SHRT] = {
-		.mask = PM805_INT1_LDO_OFF,
-	},
-	[PM805_IRQ_HP1_SHRT] = {
-		.mask = PM805_INT1_SRC_DPLL_LOCK,
-	},
-	/* INT1 */
-	[PM805_IRQ_FINE_PLL_FAULT] = {
-		.reg_offset = 1,
-		.mask = PM805_INT2_MIC_DET,
-	},
-	[PM805_IRQ_RAW_PLL_FAULT] = {
-		.reg_offset = 1,
-		.mask = PM805_INT2_SHRT_BTN_DET,
-	},
-	[PM805_IRQ_VOLP_BTN_DET] = {
-		.reg_offset = 1,
-		.mask = PM805_INT2_VOLM_BTN_DET,
-	},
-	[PM805_IRQ_VOLM_BTN_DET] = {
-		.reg_offset = 1,
-		.mask = PM805_INT2_VOLP_BTN_DET,
-	},
-	[PM805_IRQ_SHRT_BTN_DET] = {
-		.reg_offset = 1,
-		.mask = PM805_INT2_RAW_PLL_FAULT,
-	},
-	[PM805_IRQ_MIC_DET] = {
-		.reg_offset = 1,
-		.mask = PM805_INT2_FINE_PLL_FAULT,
-	},
-};
-
-static int device_irq_init_805(struct pm80x_chip *chip)
-{
-	struct regmap *map = chip->regmap;
-	unsigned long flags = IRQF_ONESHOT;
-	int data, mask, ret = -EINVAL;
-
-	if (!map || !chip->irq) {
-		dev_err(chip->dev, "incorrect parameters\n");
-		return -EINVAL;
-	}
-
-	/*
-	 * irq_mode defines the way of clearing interrupt. it's read-clear by
-	 * default.
-	 */
-	mask =
-	    PM805_STATUS0_INT_CLEAR | PM805_STATUS0_INV_INT |
-	    PM800_STATUS0_INT_MASK;
-
-	data = PM805_STATUS0_INT_CLEAR;
-	ret = regmap_update_bits(map, PM805_INT_STATUS0, mask, data);
-	/*
-	 * PM805_INT_STATUS is under 32K clock domain, so need to
-	 * add proper delay before the next I2C register access.
-	 */
-	usleep_range(1000, 3000);
-
-	if (ret < 0)
-		goto out;
-
-	ret =
-	    regmap_add_irq_chip(chip->regmap, chip->irq, flags, -1,
-				chip->regmap_irq_chip, &chip->irq_data);
-
-out:
-	return ret;
-}
-
-static void device_irq_exit_805(struct pm80x_chip *chip)
-{
-	regmap_del_irq_chip(chip->irq, chip->irq_data);
-}
-
-static const struct regmap_irq_chip pm805_irq_chip = {
-	.name = "88pm805",
-	.irqs = pm805_irqs,
-	.num_irqs = ARRAY_SIZE(pm805_irqs),
-
-	.num_regs = 2,
-	.status_base = PM805_INT_STATUS1,
-	.mask_base = PM805_INT_MASK1,
-	.ack_base = PM805_INT_STATUS1,
-};
-
-static int device_805_init(struct pm80x_chip *chip)
-{
-	int ret = 0;
-	struct regmap *map = chip->regmap;
-
-	if (!map) {
-		dev_err(chip->dev, "regmap is invalid\n");
-		return -EINVAL;
-	}
-
-	chip->regmap_irq_chip = &pm805_irq_chip;
-
-	ret = device_irq_init_805(chip);
-	if (ret < 0) {
-		dev_err(chip->dev, "Failed to init pm805 irq!\n");
-		goto out_irq_init;
-	}
-
-	ret = mfd_add_devices(chip->dev, 0, &codec_devs[0],
-			      ARRAY_SIZE(codec_devs), &codec_resources[0], 0,
-			      NULL);
-	if (ret < 0) {
-		dev_err(chip->dev, "Failed to add codec subdev\n");
-		goto out_codec;
-	} else
-		dev_info(chip->dev, "[%s]:Added mfd codec_devs\n", __func__);
-
-	return 0;
-
-out_codec:
-	device_irq_exit_805(chip);
-out_irq_init:
-	return ret;
-}
-
-static int pm805_probe(struct i2c_client *client)
-{
-	int ret = 0;
-	struct pm80x_chip *chip;
-	struct pm80x_platform_data *pdata = dev_get_platdata(&client->dev);
-
-	ret = pm80x_init(client);
-	if (ret) {
-		dev_err(&client->dev, "pm805_init fail!\n");
-		goto out_init;
-	}
-
-	chip = i2c_get_clientdata(client);
-
-	ret = device_805_init(chip);
-	if (ret) {
-		dev_err(chip->dev, "Failed to initialize 88pm805 devices\n");
-		goto err_805_init;
-	}
-
-	if (pdata && pdata->plat_config)
-		pdata->plat_config(chip, pdata);
-
-err_805_init:
-	pm80x_deinit();
-out_init:
-	return ret;
-}
-
-static void pm805_remove(struct i2c_client *client)
-{
-	struct pm80x_chip *chip = i2c_get_clientdata(client);
-
-	mfd_remove_devices(chip->dev);
-	device_irq_exit_805(chip);
-
-	pm80x_deinit();
-}
-
-static struct i2c_driver pm805_driver = {
-	.driver = {
-		.name = "88PM805",
-		.pm = pm_sleep_ptr(&pm80x_pm_ops),
-		},
-	.probe = pm805_probe,
-	.remove = pm805_remove,
-	.id_table = pm80x_id_table,
-};
-
-static int __init pm805_i2c_init(void)
-{
-	return i2c_add_driver(&pm805_driver);
-}
-subsys_initcall(pm805_i2c_init);
-
-static void __exit pm805_i2c_exit(void)
-{
-	i2c_del_driver(&pm805_driver);
-}
-module_exit(pm805_i2c_exit);
-
-MODULE_DESCRIPTION("PMIC Driver for Marvell 88PM805");
-MODULE_AUTHOR("Qiao Zhou <zhouqiao@marvell.com>");
-MODULE_LICENSE("GPL");

@@ -1,159 +0,0 @@
-// SPDX-License-Identifier: GPL-2.0-only
-/*
- * I2C driver for Marvell 88PM80x
- *
- * Copyright (C) 2012 Marvell International Ltd.
- * Haojian Zhuang <haojian.zhuang@marvell.com>
- * Joseph(Yossi) Hanin <yhanin@marvell.com>
- * Qiao Zhou <zhouqiao@marvell.com>
- */
-#include <linux/kernel.h>
-#include <linux/module.h>
-#include <linux/i2c.h>
-#include <linux/mfd/88pm80x.h>
-#include <linux/slab.h>
-#include <linux/uaccess.h>
-#include <linux/err.h>
-
-/* 88pm80x chips have same definition for chip id register. */
-#define PM80X_CHIP_ID			(0x00)
-#define PM80X_CHIP_ID_NUM(x)		(((x) >> 5) & 0x7)
-#define PM80X_CHIP_ID_REVISION(x)	((x) & 0x1F)
-
-struct pm80x_chip_mapping {
-	unsigned int	id;
-	int		type;
-};
-
-static struct pm80x_chip_mapping chip_mapping[] = {
-	/* 88PM800 chip id number */
-	{0x3,	CHIP_PM800},
-	/* 88PM805 chip id number */
-	{0x0,	CHIP_PM805},
-	/* 88PM860 chip id number */
-	{0x4,	CHIP_PM860},
-};
-
-/*
- * workaround: some registers needed by pm805 are defined in pm800, so
- * need to use this global variable to maintain the relation between
- * pm800 and pm805. would remove it after HW chip fixes the issue.
- */
-static struct pm80x_chip *g_pm80x_chip;
-
-const struct regmap_config pm80x_regmap_config = {
-	.reg_bits = 8,
-	.val_bits = 8,
-};
-EXPORT_SYMBOL_GPL(pm80x_regmap_config);
-
-
-int pm80x_init(struct i2c_client *client)
-{
-	struct pm80x_chip *chip;
-	struct regmap *map;
-	unsigned int val;
-	int i, ret = 0;
-
-	chip =
-	    devm_kzalloc(&client->dev, sizeof(struct pm80x_chip), GFP_KERNEL);
-	if (!chip)
-		return -ENOMEM;
-
-	map = devm_regmap_init_i2c(client, &pm80x_regmap_config);
-	if (IS_ERR(map)) {
-		ret = PTR_ERR(map);
-		dev_err(&client->dev, "Failed to allocate register map: %d\n",
-			ret);
-		return ret;
-	}
-
-	chip->client = client;
-	chip->regmap = map;
-
-	chip->irq = client->irq;
-
-	chip->dev = &client->dev;
-	i2c_set_clientdata(chip->client, chip);
-
-	ret = regmap_read(chip->regmap, PM80X_CHIP_ID, &val);
-	if (ret < 0) {
-		dev_err(chip->dev, "Failed to read CHIP ID: %d\n", ret);
-		return ret;
-	}
-
-	for (i = 0; i < ARRAY_SIZE(chip_mapping); i++) {
-		if (chip_mapping[i].id == PM80X_CHIP_ID_NUM(val)) {
-			chip->type = chip_mapping[i].type;
-			break;
-		}
-	}
-
-	if (i == ARRAY_SIZE(chip_mapping)) {
-		dev_err(chip->dev,
-			"Failed to detect Marvell 88PM800:ChipID[0x%x]\n", val);
-		return -EINVAL;
-	}
-
-	device_init_wakeup(&client->dev, 1);
-
-	/*
-	 * workaround: set g_pm80x_chip to the first probed chip. if the
-	 * second chip is probed, just point to the companion to each
-	 * other so that pm805 can access those specific register. would
-	 * remove it after HW chip fixes the issue.
-	 */
-	if (!g_pm80x_chip)
-		g_pm80x_chip = chip;
-	else {
-		chip->companion = g_pm80x_chip->client;
-		g_pm80x_chip->companion = chip->client;
-	}
-
-	return 0;
-}
-EXPORT_SYMBOL_GPL(pm80x_init);
-
-int pm80x_deinit(void)
-{
-	/*
-	 * workaround: clear the dependency between pm800 and pm805.
-	 * would remove it after HW chip fixes the issue.
-	 */
-	if (g_pm80x_chip->companion)
-		g_pm80x_chip->companion = NULL;
-	else
-		g_pm80x_chip = NULL;
-	return 0;
-}
-EXPORT_SYMBOL_GPL(pm80x_deinit);
-
-static int pm80x_suspend(struct device *dev)
-{
-	struct i2c_client *client = to_i2c_client(dev);
-	struct pm80x_chip *chip = i2c_get_clientdata(client);
-
-	if (chip && chip->wu_flag)
-		if (device_may_wakeup(chip->dev))
-			enable_irq_wake(chip->irq);
-
-	return 0;
-}
-
-static int pm80x_resume(struct device *dev)
-{
-	struct i2c_client *client = to_i2c_client(dev);
-	struct pm80x_chip *chip = i2c_get_clientdata(client);
-
-	if (chip && chip->wu_flag)
-		if (device_may_wakeup(chip->dev))
-			disable_irq_wake(chip->irq);
-
-	return 0;
-}
-
-EXPORT_GPL_SIMPLE_DEV_PM_OPS(pm80x_pm_ops, pm80x_suspend, pm80x_resume);
-
-MODULE_DESCRIPTION("I2C Driver for Marvell 88PM80x");
-MODULE_AUTHOR("Qiao Zhou <zhouqiao@marvell.com>");
-MODULE_LICENSE("GPL");

@@ -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

@@ -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

@@ -1,287 +0,0 @@
-// SPDX-License-Identifier: GPL-2.0-only
-/*
- * Regulators driver for Marvell 88PM800
- *
- * Copyright (C) 2012 Marvell International Ltd.
- * Joseph(Yossi) Hanin <yhanin@marvell.com>
- * Yi Zhang <yizhang@marvell.com>
- */
-#include <linux/module.h>
-#include <linux/moduleparam.h>
-#include <linux/init.h>
-#include <linux/err.h>
-#include <linux/regmap.h>
-#include <linux/regulator/driver.h>
-#include <linux/regulator/machine.h>
-#include <linux/mfd/88pm80x.h>
-#include <linux/delay.h>
-#include <linux/io.h>
-#include <linux/of.h>
-#include <linux/regulator/of_regulator.h>
-
-/* LDO1 with DVC[0..3] */
-#define PM800_LDO1_VOUT		(0x08) /* VOUT1 */
-#define PM800_LDO1_VOUT_2	(0x09)
-#define PM800_LDO1_VOUT_3	(0x0A)
-#define PM800_LDO2_VOUT		(0x0B)
-#define PM800_LDO3_VOUT		(0x0C)
-#define PM800_LDO4_VOUT		(0x0D)
-#define PM800_LDO5_VOUT		(0x0E)
-#define PM800_LDO6_VOUT		(0x0F)
-#define PM800_LDO7_VOUT		(0x10)
-#define PM800_LDO8_VOUT		(0x11)
-#define PM800_LDO9_VOUT		(0x12)
-#define PM800_LDO10_VOUT	(0x13)
-#define PM800_LDO11_VOUT	(0x14)
-#define PM800_LDO12_VOUT	(0x15)
-#define PM800_LDO13_VOUT	(0x16)
-#define PM800_LDO14_VOUT	(0x17)
-#define PM800_LDO15_VOUT	(0x18)
-#define PM800_LDO16_VOUT	(0x19)
-#define PM800_LDO17_VOUT	(0x1A)
-#define PM800_LDO18_VOUT	(0x1B)
-#define PM800_LDO19_VOUT	(0x1C)
-
-/* BUCK1 with DVC[0..3] */
-#define PM800_BUCK1		(0x3C)
-#define PM800_BUCK1_1		(0x3D)
-#define PM800_BUCK1_2		(0x3E)
-#define PM800_BUCK1_3		(0x3F)
-#define PM800_BUCK2		(0x40)
-#define PM800_BUCK3		(0x41)
-#define PM800_BUCK4		(0x42)
-#define PM800_BUCK4_1		(0x43)
-#define PM800_BUCK4_2		(0x44)
-#define PM800_BUCK4_3		(0x45)
-#define PM800_BUCK5		(0x46)
-
-#define PM800_BUCK_ENA		(0x50)
-#define PM800_LDO_ENA1_1	(0x51)
-#define PM800_LDO_ENA1_2	(0x52)
-#define PM800_LDO_ENA1_3	(0x53)
-
-#define PM800_LDO_ENA2_1	(0x56)
-#define PM800_LDO_ENA2_2	(0x57)
-#define PM800_LDO_ENA2_3	(0x58)
-
-#define PM800_BUCK1_MISC1	(0x78)
-#define PM800_BUCK3_MISC1	(0x7E)
-#define PM800_BUCK4_MISC1	(0x81)
-#define PM800_BUCK5_MISC1	(0x84)
-
-struct pm800_regulator_info {
-	struct regulator_desc desc;
-	int max_ua;
-};
-
-/*
- * vreg - the buck regs string.
- * ereg - the string for the enable register.
- * ebit - the bit number in the enable register.
- * amax - the current
- * Buck has 2 kinds of voltage steps. It is easy to find voltage by ranges,
- * not the constant voltage table.
- * n_volt - Number of available selectors
- */
-#define PM800_BUCK(match, vreg, ereg, ebit, amax, volt_ranges, n_volt)	\
-{									\
-	.desc	= {							\
-		.name			= #vreg,			\
-		.of_match		= of_match_ptr(#match),		\
-		.regulators_node	= of_match_ptr("regulators"),	\
-		.ops			= &pm800_volt_range_ops,	\
-		.type			= REGULATOR_VOLTAGE,		\
-		.id			= PM800_ID_##vreg,		\
-		.owner			= THIS_MODULE,			\
-		.n_voltages		= n_volt,			\
-		.linear_ranges		= volt_ranges,			\
-		.n_linear_ranges	= ARRAY_SIZE(volt_ranges),	\
-		.vsel_reg		= PM800_##vreg,			\
-		.vsel_mask		= 0x7f,				\
-		.enable_reg		= PM800_##ereg,			\
-		.enable_mask		= 1 << (ebit),			\
-	},								\
-	.max_ua	= (amax),						\
-}
-
-/*
- * vreg - the LDO regs string
- * ereg -  the string for the enable register.
- * ebit - the bit number in the enable register.
- * amax - the current
- * volt_table - the LDO voltage table
- * For all the LDOes, there are too many ranges. Using volt_table will be
- * simpler and faster.
- */
-#define PM800_LDO(match, vreg, ereg, ebit, amax, ldo_volt_table)	\
-{									\
-	.desc	= {							\
-		.name			= #vreg,			\
-		.of_match		= of_match_ptr(#match),		\
-		.regulators_node	= of_match_ptr("regulators"),	\
-		.ops			= &pm800_volt_table_ops,	\
-		.type			= REGULATOR_VOLTAGE,		\
-		.id			= PM800_ID_##vreg,		\
-		.owner			= THIS_MODULE,			\
-		.n_voltages		= ARRAY_SIZE(ldo_volt_table),	\
-		.vsel_reg		= PM800_##vreg##_VOUT,		\
-		.vsel_mask		= 0xf,				\
-		.enable_reg		= PM800_##ereg,			\
-		.enable_mask		= 1 << (ebit),			\
-		.volt_table		= ldo_volt_table,		\
-	},								\
-	.max_ua	= (amax),						\
-}
-
-/* Ranges are sorted in ascending order. */
-static const struct linear_range buck1_volt_range[] = {
-	REGULATOR_LINEAR_RANGE(600000, 0, 0x4f, 12500),
-	REGULATOR_LINEAR_RANGE(1600000, 0x50, 0x54, 50000),
-};
-
-/* BUCK 2~5 have same ranges. */
-static const struct linear_range buck2_5_volt_range[] = {
-	REGULATOR_LINEAR_RANGE(600000, 0, 0x4f, 12500),
-	REGULATOR_LINEAR_RANGE(1600000, 0x50, 0x72, 50000),
-};
-
-static const unsigned int ldo1_volt_table[] = {
-	600000,  650000,  700000,  750000,  800000,  850000,  900000,  950000,
-	1000000, 1050000, 1100000, 1150000, 1200000, 1300000, 1400000, 1500000,
-};
-
-static const unsigned int ldo2_volt_table[] = {
-	1700000, 1800000, 1900000, 2000000, 2100000, 2500000, 2700000, 2800000,
-};
-
-/* LDO 3~17 have same voltage table. */
-static const unsigned int ldo3_17_volt_table[] = {
-	1200000, 1250000, 1700000, 1800000, 1850000, 1900000, 2500000, 2600000,
-	2700000, 2750000, 2800000, 2850000, 2900000, 3000000, 3100000, 3300000,
-};
-
-/* LDO 18~19 have same voltage table. */
-static const unsigned int ldo18_19_volt_table[] = {
-	1700000, 1800000, 1900000, 2500000, 2800000, 2900000, 3100000, 3300000,
-};
-
-static int pm800_get_current_limit(struct regulator_dev *rdev)
-{
-	struct pm800_regulator_info *info = rdev_get_drvdata(rdev);
-
-	return info->max_ua;
-}
-
-static const struct regulator_ops pm800_volt_range_ops = {
-	.list_voltage		= regulator_list_voltage_linear_range,
-	.map_voltage		= regulator_map_voltage_linear_range,
-	.set_voltage_sel	= regulator_set_voltage_sel_regmap,
-	.get_voltage_sel	= regulator_get_voltage_sel_regmap,
-	.enable			= regulator_enable_regmap,
-	.disable		= regulator_disable_regmap,
-	.is_enabled		= regulator_is_enabled_regmap,
-	.get_current_limit	= pm800_get_current_limit,
-};
-
-static const struct regulator_ops pm800_volt_table_ops = {
-	.list_voltage		= regulator_list_voltage_table,
-	.map_voltage		= regulator_map_voltage_iterate,
-	.set_voltage_sel	= regulator_set_voltage_sel_regmap,
-	.get_voltage_sel	= regulator_get_voltage_sel_regmap,
-	.enable			= regulator_enable_regmap,
-	.disable		= regulator_disable_regmap,
-	.is_enabled		= regulator_is_enabled_regmap,
-	.get_current_limit	= pm800_get_current_limit,
-};
-
-/* The array is indexed by id(PM800_ID_XXX) */
-static struct pm800_regulator_info pm800_regulator_info[] = {
-	PM800_BUCK(buck1, BUCK1, BUCK_ENA, 0, 3000000, buck1_volt_range, 0x55),
-	PM800_BUCK(buck2, BUCK2, BUCK_ENA, 1, 1200000, buck2_5_volt_range, 0x73),
-	PM800_BUCK(buck3, BUCK3, BUCK_ENA, 2, 1200000, buck2_5_volt_range, 0x73),
-	PM800_BUCK(buck4, BUCK4, BUCK_ENA, 3, 1200000, buck2_5_volt_range, 0x73),
-	PM800_BUCK(buck5, BUCK5, BUCK_ENA, 4, 1200000, buck2_5_volt_range, 0x73),
-
-	PM800_LDO(ldo1, LDO1, LDO_ENA1_1, 0, 200000, ldo1_volt_table),
-	PM800_LDO(ldo2, LDO2, LDO_ENA1_1, 1, 10000, ldo2_volt_table),
-	PM800_LDO(ldo3, LDO3, LDO_ENA1_1, 2, 300000, ldo3_17_volt_table),
-	PM800_LDO(ldo4, LDO4, LDO_ENA1_1, 3, 300000, ldo3_17_volt_table),
-	PM800_LDO(ldo5, LDO5, LDO_ENA1_1, 4, 300000, ldo3_17_volt_table),
-	PM800_LDO(ldo6, LDO6, LDO_ENA1_1, 5, 300000, ldo3_17_volt_table),
-	PM800_LDO(ldo7, LDO7, LDO_ENA1_1, 6, 300000, ldo3_17_volt_table),
-	PM800_LDO(ldo8, LDO8, LDO_ENA1_1, 7, 300000, ldo3_17_volt_table),
-	PM800_LDO(ldo9, LDO9, LDO_ENA1_2, 0, 300000, ldo3_17_volt_table),
-	PM800_LDO(ldo10, LDO10, LDO_ENA1_2, 1, 300000, ldo3_17_volt_table),
-	PM800_LDO(ldo11, LDO11, LDO_ENA1_2, 2, 300000, ldo3_17_volt_table),
-	PM800_LDO(ldo12, LDO12, LDO_ENA1_2, 3, 300000, ldo3_17_volt_table),
-	PM800_LDO(ldo13, LDO13, LDO_ENA1_2, 4, 300000, ldo3_17_volt_table),
-	PM800_LDO(ldo14, LDO14, LDO_ENA1_2, 5, 300000, ldo3_17_volt_table),
-	PM800_LDO(ldo15, LDO15, LDO_ENA1_2, 6, 300000, ldo3_17_volt_table),
-	PM800_LDO(ldo16, LDO16, LDO_ENA1_2, 7, 300000, ldo3_17_volt_table),
-	PM800_LDO(ldo17, LDO17, LDO_ENA1_3, 0, 300000, ldo3_17_volt_table),
-	PM800_LDO(ldo18, LDO18, LDO_ENA1_3, 1, 200000, ldo18_19_volt_table),
-	PM800_LDO(ldo19, LDO19, LDO_ENA1_3, 2, 200000, ldo18_19_volt_table),
-};
-
-static int pm800_regulator_probe(struct platform_device *pdev)
-{
-	struct pm80x_chip *chip = dev_get_drvdata(pdev->dev.parent);
-	struct pm80x_platform_data *pdata = dev_get_platdata(pdev->dev.parent);
-	struct regulator_config config = { };
-	struct regulator_init_data *init_data;
-	int i, ret;
-
-	if (pdata && pdata->num_regulators) {
-		unsigned int count = 0;
-
-		/* Check whether num_regulator is valid. */
-		for (i = 0; i < ARRAY_SIZE(pdata->regulators); i++) {
-			if (pdata->regulators[i])
-				count++;
-		}
-		if (count != pdata->num_regulators)
-			return -EINVAL;
-	}
-
-	config.dev = chip->dev;
-	config.regmap = chip->subchip->regmap_power;
-	for (i = 0; i < PM800_ID_RG_MAX; i++) {
-		struct regulator_dev *regulator;
-
-		if (pdata && pdata->num_regulators) {
-			init_data = pdata->regulators[i];
-			if (!init_data)
-				continue;
-
-			config.init_data = init_data;
-		}
-
-		config.driver_data = &pm800_regulator_info[i];
-
-		regulator = devm_regulator_register(&pdev->dev,
-				&pm800_regulator_info[i].desc, &config);
-		if (IS_ERR(regulator)) {
-			ret = PTR_ERR(regulator);
-			dev_err(&pdev->dev, "Failed to register %s\n",
-					pm800_regulator_info[i].desc.name);
-			return ret;
-		}
-	}
-
-	return 0;
-}
-
-static struct platform_driver pm800_regulator_driver = {
-	.driver		= {
-		.name	= "88pm80x-regulator",
-		.probe_type = PROBE_PREFER_ASYNCHRONOUS,
-	},
-	.probe		= pm800_regulator_probe,
-};
-
-module_platform_driver(pm800_regulator_driver);
-
-MODULE_LICENSE("GPL");
-MODULE_AUTHOR("Joseph(Yossi) Hanin <yhanin@marvell.com>");
-MODULE_DESCRIPTION("Regulator Driver for Marvell 88PM800 PMIC");
-MODULE_ALIAS("platform:88pm800-regulator");

@@ -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

@@ -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

@@ -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

@@ -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

@@ -1,340 +0,0 @@
-// SPDX-License-Identifier: GPL-2.0
-/*
- * Real Time Clock driver for Marvell 88PM80x PMIC
- *
- * Copyright (c) 2012 Marvell International Ltd.
- *  Wenzeng Chen<wzch@marvell.com>
- *  Qiao Zhou <zhouqiao@marvell.com>
- */
-
-#include <linux/kernel.h>
-#include <linux/module.h>
-#include <linux/slab.h>
-#include <linux/regmap.h>
-#include <linux/mfd/core.h>
-#include <linux/mfd/88pm80x.h>
-#include <linux/rtc.h>
-
-#define PM800_RTC_COUNTER1		(0xD1)
-#define PM800_RTC_COUNTER2		(0xD2)
-#define PM800_RTC_COUNTER3		(0xD3)
-#define PM800_RTC_COUNTER4		(0xD4)
-#define PM800_RTC_EXPIRE1_1		(0xD5)
-#define PM800_RTC_EXPIRE1_2		(0xD6)
-#define PM800_RTC_EXPIRE1_3		(0xD7)
-#define PM800_RTC_EXPIRE1_4		(0xD8)
-#define PM800_RTC_TRIM1			(0xD9)
-#define PM800_RTC_TRIM2			(0xDA)
-#define PM800_RTC_TRIM3			(0xDB)
-#define PM800_RTC_TRIM4			(0xDC)
-#define PM800_RTC_EXPIRE2_1		(0xDD)
-#define PM800_RTC_EXPIRE2_2		(0xDE)
-#define PM800_RTC_EXPIRE2_3		(0xDF)
-#define PM800_RTC_EXPIRE2_4		(0xE0)
-
-#define PM800_POWER_DOWN_LOG1	(0xE5)
-#define PM800_POWER_DOWN_LOG2	(0xE6)
-
-struct pm80x_rtc_info {
-	struct pm80x_chip *chip;
-	struct regmap *map;
-	struct rtc_device *rtc_dev;
-	struct device *dev;
-
-	int irq;
-};
-
-static irqreturn_t rtc_update_handler(int irq, void *data)
-{
-	struct pm80x_rtc_info *info = (struct pm80x_rtc_info *)data;
-	int mask;
-
-	mask = PM800_ALARM | PM800_ALARM_WAKEUP;
-	regmap_update_bits(info->map, PM800_RTC_CONTROL, mask | PM800_ALARM1_EN,
-			   mask);
-	rtc_update_irq(info->rtc_dev, 1, RTC_AF);
-	return IRQ_HANDLED;
-}
-
-static int pm80x_rtc_alarm_irq_enable(struct device *dev, unsigned int enabled)
-{
-	struct pm80x_rtc_info *info = dev_get_drvdata(dev);
-
-	if (enabled)
-		regmap_update_bits(info->map, PM800_RTC_CONTROL,
-				   PM800_ALARM1_EN, PM800_ALARM1_EN);
-	else
-		regmap_update_bits(info->map, PM800_RTC_CONTROL,
-				   PM800_ALARM1_EN, 0);
-	return 0;
-}
-
-/*
- * Calculate the next alarm time given the requested alarm time mask
- * and the current time.
- */
-static void rtc_next_alarm_time(struct rtc_time *next, struct rtc_time *now,
-				struct rtc_time *alrm)
-{
-	unsigned long next_time;
-	unsigned long now_time;
-
-	next->tm_year = now->tm_year;
-	next->tm_mon = now->tm_mon;
-	next->tm_mday = now->tm_mday;
-	next->tm_hour = alrm->tm_hour;
-	next->tm_min = alrm->tm_min;
-	next->tm_sec = alrm->tm_sec;
-
-	now_time = rtc_tm_to_time64(now);
-	next_time = rtc_tm_to_time64(next);
-
-	if (next_time < now_time) {
-		/* Advance one day */
-		next_time += 60 * 60 * 24;
-		rtc_time64_to_tm(next_time, next);
-	}
-}
-
-static int pm80x_rtc_read_time(struct device *dev, struct rtc_time *tm)
-{
-	struct pm80x_rtc_info *info = dev_get_drvdata(dev);
-	unsigned char buf[4];
-	unsigned long ticks, base, data;
-	regmap_raw_read(info->map, PM800_RTC_EXPIRE2_1, buf, 4);
-	base = ((unsigned long)buf[3] << 24) | (buf[2] << 16) |
-		(buf[1] << 8) | buf[0];
-	dev_dbg(info->dev, "%x-%x-%x-%x\n", buf[0], buf[1], buf[2], buf[3]);
-
-	/* load 32-bit read-only counter */
-	regmap_raw_read(info->map, PM800_RTC_COUNTER1, buf, 4);
-	data = ((unsigned long)buf[3] << 24) | (buf[2] << 16) |
-		(buf[1] << 8) | buf[0];
-	ticks = base + data;
-	dev_dbg(info->dev, "get base:0x%lx, RO count:0x%lx, ticks:0x%lx\n",
-		base, data, ticks);
-	rtc_time64_to_tm(ticks, tm);
-	return 0;
-}
-
-static int pm80x_rtc_set_time(struct device *dev, struct rtc_time *tm)
-{
-	struct pm80x_rtc_info *info = dev_get_drvdata(dev);
-	unsigned char buf[4];
-	unsigned long ticks, base, data;
-
-	ticks = rtc_tm_to_time64(tm);
-
-	/* load 32-bit read-only counter */
-	regmap_raw_read(info->map, PM800_RTC_COUNTER1, buf, 4);
-	data = ((unsigned long)buf[3] << 24) | (buf[2] << 16) |
-		(buf[1] << 8) | buf[0];
-	base = ticks - data;
-	dev_dbg(info->dev, "set base:0x%lx, RO count:0x%lx, ticks:0x%lx\n",
-		base, data, ticks);
-	buf[0] = base & 0xFF;
-	buf[1] = (base >> 8) & 0xFF;
-	buf[2] = (base >> 16) & 0xFF;
-	buf[3] = (base >> 24) & 0xFF;
-	regmap_raw_write(info->map, PM800_RTC_EXPIRE2_1, buf, 4);
-
-	return 0;
-}
-
-static int pm80x_rtc_read_alarm(struct device *dev, struct rtc_wkalrm *alrm)
-{
-	struct pm80x_rtc_info *info = dev_get_drvdata(dev);
-	unsigned char buf[4];
-	unsigned long ticks, base, data;
-	int ret;
-
-	regmap_raw_read(info->map, PM800_RTC_EXPIRE2_1, buf, 4);
-	base = ((unsigned long)buf[3] << 24) | (buf[2] << 16) |
-		(buf[1] << 8) | buf[0];
-	dev_dbg(info->dev, "%x-%x-%x-%x\n", buf[0], buf[1], buf[2], buf[3]);
-
-	regmap_raw_read(info->map, PM800_RTC_EXPIRE1_1, buf, 4);
-	data = ((unsigned long)buf[3] << 24) | (buf[2] << 16) |
-		(buf[1] << 8) | buf[0];
-	ticks = base + data;
-	dev_dbg(info->dev, "get base:0x%lx, RO count:0x%lx, ticks:0x%lx\n",
-		base, data, ticks);
-
-	rtc_time64_to_tm(ticks, &alrm->time);
-	regmap_read(info->map, PM800_RTC_CONTROL, &ret);
-	alrm->enabled = (ret & PM800_ALARM1_EN) ? 1 : 0;
-	alrm->pending = (ret & (PM800_ALARM | PM800_ALARM_WAKEUP)) ? 1 : 0;
-	return 0;
-}
-
-static int pm80x_rtc_set_alarm(struct device *dev, struct rtc_wkalrm *alrm)
-{
-	struct pm80x_rtc_info *info = dev_get_drvdata(dev);
-	struct rtc_time now_tm, alarm_tm;
-	unsigned long ticks, base, data;
-	unsigned char buf[4];
-	int mask;
-
-	regmap_update_bits(info->map, PM800_RTC_CONTROL, PM800_ALARM1_EN, 0);
-
-	regmap_raw_read(info->map, PM800_RTC_EXPIRE2_1, buf, 4);
-	base = ((unsigned long)buf[3] << 24) | (buf[2] << 16) |
-		(buf[1] << 8) | buf[0];
-	dev_dbg(info->dev, "%x-%x-%x-%x\n", buf[0], buf[1], buf[2], buf[3]);
-
-	/* load 32-bit read-only counter */
-	regmap_raw_read(info->map, PM800_RTC_COUNTER1, buf, 4);
-	data = ((unsigned long)buf[3] << 24) | (buf[2] << 16) |
-		(buf[1] << 8) | buf[0];
-	ticks = base + data;
-	dev_dbg(info->dev, "get base:0x%lx, RO count:0x%lx, ticks:0x%lx\n",
-		base, data, ticks);
-
-	rtc_time64_to_tm(ticks, &now_tm);
-	dev_dbg(info->dev, "%s, now time : %lu\n", __func__, ticks);
-	rtc_next_alarm_time(&alarm_tm, &now_tm, &alrm->time);
-	/* get new ticks for alarm in 24 hours */
-	ticks = rtc_tm_to_time64(&alarm_tm);
-	dev_dbg(info->dev, "%s, alarm time: %lu\n", __func__, ticks);
-	data = ticks - base;
-
-	buf[0] = data & 0xff;
-	buf[1] = (data >> 8) & 0xff;
-	buf[2] = (data >> 16) & 0xff;
-	buf[3] = (data >> 24) & 0xff;
-	regmap_raw_write(info->map, PM800_RTC_EXPIRE1_1, buf, 4);
-	if (alrm->enabled) {
-		mask = PM800_ALARM | PM800_ALARM_WAKEUP | PM800_ALARM1_EN;
-		regmap_update_bits(info->map, PM800_RTC_CONTROL, mask, mask);
-	} else {
-		mask = PM800_ALARM | PM800_ALARM_WAKEUP | PM800_ALARM1_EN;
-		regmap_update_bits(info->map, PM800_RTC_CONTROL, mask,
-				   PM800_ALARM | PM800_ALARM_WAKEUP);
-	}
-	return 0;
-}
-
-static const struct rtc_class_ops pm80x_rtc_ops = {
-	.read_time = pm80x_rtc_read_time,
-	.set_time = pm80x_rtc_set_time,
-	.read_alarm = pm80x_rtc_read_alarm,
-	.set_alarm = pm80x_rtc_set_alarm,
-	.alarm_irq_enable = pm80x_rtc_alarm_irq_enable,
-};
-
-#ifdef CONFIG_PM_SLEEP
-static int pm80x_rtc_suspend(struct device *dev)
-{
-	return pm80x_dev_suspend(dev);
-}
-
-static int pm80x_rtc_resume(struct device *dev)
-{
-	return pm80x_dev_resume(dev);
-}
-#endif
-
-static SIMPLE_DEV_PM_OPS(pm80x_rtc_pm_ops, pm80x_rtc_suspend, pm80x_rtc_resume);
-
-static int pm80x_rtc_probe(struct platform_device *pdev)
-{
-	struct pm80x_chip *chip = dev_get_drvdata(pdev->dev.parent);
-	struct pm80x_rtc_pdata *pdata = dev_get_platdata(&pdev->dev);
-	struct pm80x_rtc_info *info;
-	struct device_node *node = pdev->dev.of_node;
-	int ret;
-
-	if (!pdata && !node) {
-		dev_err(&pdev->dev,
-			"pm80x-rtc requires platform data or of_node\n");
-		return -EINVAL;
-	}
-
-	if (!pdata) {
-		pdata = devm_kzalloc(&pdev->dev, sizeof(*pdata), GFP_KERNEL);
-		if (!pdata) {
-			dev_err(&pdev->dev, "failed to allocate memory\n");
-			return -ENOMEM;
-		}
-	}
-
-	info =
-	    devm_kzalloc(&pdev->dev, sizeof(struct pm80x_rtc_info), GFP_KERNEL);
-	if (!info)
-		return -ENOMEM;
-	info->irq = platform_get_irq(pdev, 0);
-	if (info->irq < 0) {
-		ret = -EINVAL;
-		goto out;
-	}
-
-	info->chip = chip;
-	info->map = chip->regmap;
-	if (!info->map) {
-		dev_err(&pdev->dev, "no regmap!\n");
-		ret = -EINVAL;
-		goto out;
-	}
-
-	info->dev = &pdev->dev;
-	dev_set_drvdata(&pdev->dev, info);
-
-	info->rtc_dev = devm_rtc_allocate_device(&pdev->dev);
-	if (IS_ERR(info->rtc_dev))
-		return PTR_ERR(info->rtc_dev);
-
-	ret = pm80x_request_irq(chip, info->irq, rtc_update_handler,
-				IRQF_ONESHOT, "rtc", info);
-	if (ret < 0) {
-		dev_err(chip->dev, "Failed to request IRQ: #%d: %d\n",
-			info->irq, ret);
-		goto out;
-	}
-
-	info->rtc_dev->ops = &pm80x_rtc_ops;
-	info->rtc_dev->range_max = U32_MAX;
-
-	ret = devm_rtc_register_device(info->rtc_dev);
-	if (ret)
-		goto out_rtc;
-
-	/*
-	 * enable internal XO instead of internal 3.25MHz clock since it can
-	 * free running in PMIC power-down state.
-	 */
-	regmap_update_bits(info->map, PM800_RTC_CONTROL, PM800_RTC1_USE_XO,
-			   PM800_RTC1_USE_XO);
-
-	/* remember whether this power up is caused by PMIC RTC or not */
-	info->rtc_dev->dev.platform_data = &pdata->rtc_wakeup;
-
-	device_init_wakeup(&pdev->dev, true);
-
-	return 0;
-out_rtc:
-	pm80x_free_irq(chip, info->irq, info);
-out:
-	return ret;
-}
-
-static void pm80x_rtc_remove(struct platform_device *pdev)
-{
-	struct pm80x_rtc_info *info = platform_get_drvdata(pdev);
-	pm80x_free_irq(info->chip, info->irq, info);
-}
-
-static struct platform_driver pm80x_rtc_driver = {
-	.driver = {
-		   .name = "88pm80x-rtc",
-		   .pm = &pm80x_rtc_pm_ops,
-		   },
-	.probe = pm80x_rtc_probe,
-	.remove = pm80x_rtc_remove,
-};
-
-module_platform_driver(pm80x_rtc_driver);
-
-MODULE_LICENSE("GPL");
-MODULE_DESCRIPTION("Marvell 88PM80x RTC driver");
-MODULE_AUTHOR("Qiao Zhou <zhouqiao@marvell.com>");
-MODULE_ALIAS("platform:88pm80x-rtc");

@@ -1,370 +0,0 @@
-/* SPDX-License-Identifier: GPL-2.0-only */
-/*
- * Marvell 88PM80x Interface
- *
- * Copyright (C) 2012 Marvell International Ltd.
- * Qiao Zhou <zhouqiao@marvell.com>
- */
-
-#ifndef __LINUX_MFD_88PM80X_H
-#define __LINUX_MFD_88PM80X_H
-
-#include <linux/platform_device.h>
-#include <linux/interrupt.h>
-#include <linux/regmap.h>
-#include <linux/atomic.h>
-
-enum {
-	CHIP_INVALID = 0,
-	CHIP_PM800,
-	CHIP_PM805,
-	CHIP_PM860,
-	CHIP_MAX,
-};
-
-enum {
-	PM800_ID_BUCK1 = 0,
-	PM800_ID_BUCK2,
-	PM800_ID_BUCK3,
-	PM800_ID_BUCK4,
-	PM800_ID_BUCK5,
-
-	PM800_ID_LDO1,
-	PM800_ID_LDO2,
-	PM800_ID_LDO3,
-	PM800_ID_LDO4,
-	PM800_ID_LDO5,
-	PM800_ID_LDO6,
-	PM800_ID_LDO7,
-	PM800_ID_LDO8,
-	PM800_ID_LDO9,
-	PM800_ID_LDO10,
-	PM800_ID_LDO11,
-	PM800_ID_LDO12,
-	PM800_ID_LDO13,
-	PM800_ID_LDO14,
-	PM800_ID_LDO15,
-	PM800_ID_LDO16,
-	PM800_ID_LDO17,
-	PM800_ID_LDO18,
-	PM800_ID_LDO19,
-
-	PM800_ID_RG_MAX,
-};
-#define PM800_MAX_REGULATOR	PM800_ID_RG_MAX	/* 5 Bucks, 19 LDOs */
-#define PM800_NUM_BUCK (5)	/*5 Bucks */
-#define PM800_NUM_LDO (19)	/*19 Bucks */
-
-/* page 0 basic: slave adder 0x60 */
-
-#define PM800_STATUS_1			(0x01)
-#define PM800_ONKEY_STS1		BIT(0)
-#define PM800_EXTON_STS1		BIT(1)
-#define PM800_CHG_STS1			BIT(2)
-#define PM800_BAT_STS1			BIT(3)
-#define PM800_VBUS_STS1			BIT(4)
-#define PM800_LDO_PGOOD_STS1		BIT(5)
-#define PM800_BUCK_PGOOD_STS1		BIT(6)
-
-#define PM800_STATUS_2			(0x02)
-#define PM800_RTC_ALARM_STS2		BIT(0)
-
-/* Wakeup Registers */
-#define PM800_WAKEUP1			(0x0D)
-
-#define PM800_WAKEUP2			(0x0E)
-#define PM800_WAKEUP2_INV_INT		BIT(0)
-#define PM800_WAKEUP2_INT_CLEAR		BIT(1)
-#define PM800_WAKEUP2_INT_MASK		BIT(2)
-
-#define PM800_POWER_UP_LOG		(0x10)
-
-/* Referance and low power registers */
-#define PM800_LOW_POWER1		(0x20)
-#define PM800_LOW_POWER2		(0x21)
-#define PM800_LOW_POWER_CONFIG3		(0x22)
-#define PM800_LOW_POWER_CONFIG4		(0x23)
-
-/* GPIO register */
-#define PM800_GPIO_0_1_CNTRL		(0x30)
-#define PM800_GPIO0_VAL			BIT(0)
-#define PM800_GPIO0_GPIO_MODE(x)	(x << 1)
-#define PM800_GPIO1_VAL			BIT(4)
-#define PM800_GPIO1_GPIO_MODE(x)	(x << 5)
-
-#define PM800_GPIO_2_3_CNTRL		(0x31)
-#define PM800_GPIO2_VAL			BIT(0)
-#define PM800_GPIO2_GPIO_MODE(x)	(x << 1)
-#define PM800_GPIO3_VAL			BIT(4)
-#define PM800_GPIO3_GPIO_MODE(x)	(x << 5)
-#define PM800_GPIO3_MODE_MASK		0x1F
-#define PM800_GPIO3_HEADSET_MODE	PM800_GPIO3_GPIO_MODE(6)
-
-#define PM800_GPIO_4_CNTRL		(0x32)
-#define PM800_GPIO4_VAL			BIT(0)
-#define PM800_GPIO4_GPIO_MODE(x)	(x << 1)
-
-#define PM800_HEADSET_CNTRL		(0x38)
-#define PM800_HEADSET_DET_EN		BIT(7)
-#define PM800_HSDET_SLP			BIT(1)
-/* PWM register */
-#define PM800_PWM1			(0x40)
-#define PM800_PWM2			(0x41)
-#define PM800_PWM3			(0x42)
-#define PM800_PWM4			(0x43)
-
-/* RTC Registers */
-#define PM800_RTC_CONTROL		(0xD0)
-#define PM800_RTC_MISC1			(0xE1)
-#define PM800_RTC_MISC2			(0xE2)
-#define PM800_RTC_MISC3			(0xE3)
-#define PM800_RTC_MISC4			(0xE4)
-#define PM800_RTC_MISC5			(0xE7)
-/* bit definitions of RTC Register 1 (0xD0) */
-#define PM800_ALARM1_EN			BIT(0)
-#define PM800_ALARM_WAKEUP		BIT(4)
-#define PM800_ALARM			BIT(5)
-#define PM800_RTC1_USE_XO		BIT(7)
-
-/* Regulator Control Registers: BUCK1,BUCK5,LDO1 have DVC */
-
-/* buck registers */
-#define PM800_SLEEP_BUCK1		(0x30)
-
-/* BUCK Sleep Mode Register 1: BUCK[1..4] */
-#define PM800_BUCK_SLP1			(0x5A)
-#define PM800_BUCK1_SLP1_SHIFT		0
-#define PM800_BUCK1_SLP1_MASK		(0x3 << PM800_BUCK1_SLP1_SHIFT)
-
-/* page 2 GPADC: slave adder 0x02 */
-#define PM800_GPADC_MEAS_EN1		(0x01)
-#define PM800_MEAS_EN1_VBAT		BIT(2)
-#define PM800_GPADC_MEAS_EN2		(0x02)
-#define PM800_MEAS_EN2_RFTMP		BIT(0)
-#define PM800_MEAS_GP0_EN		BIT(2)
-#define PM800_MEAS_GP1_EN		BIT(3)
-#define PM800_MEAS_GP2_EN		BIT(4)
-#define PM800_MEAS_GP3_EN		BIT(5)
-#define PM800_MEAS_GP4_EN		BIT(6)
-
-#define PM800_GPADC_MISC_CONFIG1	(0x05)
-#define PM800_GPADC_MISC_CONFIG2	(0x06)
-#define PM800_GPADC_MISC_GPFSM_EN	BIT(0)
-#define PM800_GPADC_SLOW_MODE(x)	(x << 3)
-
-#define PM800_GPADC_MISC_CONFIG3	(0x09)
-#define PM800_GPADC_MISC_CONFIG4	(0x0A)
-
-#define PM800_GPADC_PREBIAS1		(0x0F)
-#define PM800_GPADC0_GP_PREBIAS_TIME(x)	(x << 0)
-#define PM800_GPADC_PREBIAS2		(0x10)
-
-#define PM800_GP_BIAS_ENA1		(0x14)
-#define PM800_GPADC_GP_BIAS_EN0		BIT(0)
-#define PM800_GPADC_GP_BIAS_EN1		BIT(1)
-#define PM800_GPADC_GP_BIAS_EN2		BIT(2)
-#define PM800_GPADC_GP_BIAS_EN3		BIT(3)
-
-#define PM800_GP_BIAS_OUT1		(0x15)
-#define PM800_BIAS_OUT_GP0		BIT(0)
-#define PM800_BIAS_OUT_GP1		BIT(1)
-#define PM800_BIAS_OUT_GP2		BIT(2)
-#define PM800_BIAS_OUT_GP3		BIT(3)
-
-#define PM800_GPADC0_LOW_TH		0x20
-#define PM800_GPADC1_LOW_TH		0x21
-#define PM800_GPADC2_LOW_TH		0x22
-#define PM800_GPADC3_LOW_TH		0x23
-#define PM800_GPADC4_LOW_TH		0x24
-
-#define PM800_GPADC0_UPP_TH		0x30
-#define PM800_GPADC1_UPP_TH		0x31
-#define PM800_GPADC2_UPP_TH		0x32
-#define PM800_GPADC3_UPP_TH		0x33
-#define PM800_GPADC4_UPP_TH		0x34
-
-#define PM800_VBBAT_MEAS1		0x40
-#define PM800_VBBAT_MEAS2		0x41
-#define PM800_VBAT_MEAS1		0x42
-#define PM800_VBAT_MEAS2		0x43
-#define PM800_VSYS_MEAS1		0x44
-#define PM800_VSYS_MEAS2		0x45
-#define PM800_VCHG_MEAS1		0x46
-#define PM800_VCHG_MEAS2		0x47
-#define PM800_TINT_MEAS1		0x50
-#define PM800_TINT_MEAS2		0x51
-#define PM800_PMOD_MEAS1		0x52
-#define PM800_PMOD_MEAS2		0x53
-
-#define PM800_GPADC0_MEAS1		0x54
-#define PM800_GPADC0_MEAS2		0x55
-#define PM800_GPADC1_MEAS1		0x56
-#define PM800_GPADC1_MEAS2		0x57
-#define PM800_GPADC2_MEAS1		0x58
-#define PM800_GPADC2_MEAS2		0x59
-#define PM800_GPADC3_MEAS1		0x5A
-#define PM800_GPADC3_MEAS2		0x5B
-#define PM800_GPADC4_MEAS1		0x5C
-#define PM800_GPADC4_MEAS2		0x5D
-
-#define PM800_GPADC4_AVG1		0xA8
-#define PM800_GPADC4_AVG2		0xA9
-
-/* 88PM805 Registers */
-#define PM805_MAIN_POWERUP		(0x01)
-#define PM805_INT_STATUS0		(0x02)	/* for ena/dis all interrupts */
-
-#define PM805_STATUS0_INT_CLEAR		(1 << 0)
-#define PM805_STATUS0_INV_INT		(1 << 1)
-#define PM800_STATUS0_INT_MASK		(1 << 2)
-
-#define PM805_INT_STATUS1		(0x03)
-
-#define PM805_INT1_HP1_SHRT		BIT(0)
-#define PM805_INT1_HP2_SHRT		BIT(1)
-#define PM805_INT1_MIC_CONFLICT		BIT(2)
-#define PM805_INT1_CLIP_FAULT		BIT(3)
-#define PM805_INT1_LDO_OFF		BIT(4)
-#define PM805_INT1_SRC_DPLL_LOCK	BIT(5)
-
-#define PM805_INT_STATUS2		(0x04)
-
-#define PM805_INT2_MIC_DET		BIT(0)
-#define PM805_INT2_SHRT_BTN_DET		BIT(1)
-#define PM805_INT2_VOLM_BTN_DET		BIT(2)
-#define PM805_INT2_VOLP_BTN_DET		BIT(3)
-#define PM805_INT2_RAW_PLL_FAULT	BIT(4)
-#define PM805_INT2_FINE_PLL_FAULT	BIT(5)
-
-#define PM805_INT_MASK1			(0x05)
-#define PM805_INT_MASK2			(0x06)
-#define PM805_SHRT_BTN_DET		BIT(1)
-
-/* number of status and int reg in a row */
-#define PM805_INT_REG_NUM		(2)
-
-#define PM805_MIC_DET1			(0x07)
-#define PM805_MIC_DET_EN_MIC_DET	BIT(0)
-#define PM805_MIC_DET2			(0x08)
-#define PM805_MIC_DET_STATUS1		(0x09)
-
-#define PM805_MIC_DET_STATUS3		(0x0A)
-#define PM805_AUTO_SEQ_STATUS1		(0x0B)
-#define PM805_AUTO_SEQ_STATUS2		(0x0C)
-
-#define PM805_ADC_SETTING1		(0x10)
-#define PM805_ADC_SETTING2		(0x11)
-#define PM805_ADC_SETTING3		(0x11)
-#define PM805_ADC_GAIN1			(0x12)
-#define PM805_ADC_GAIN2			(0x13)
-#define PM805_DMIC_SETTING		(0x15)
-#define PM805_DWS_SETTING		(0x16)
-#define PM805_MIC_CONFLICT_STS		(0x17)
-
-#define PM805_PDM_SETTING1		(0x20)
-#define PM805_PDM_SETTING2		(0x21)
-#define PM805_PDM_SETTING3		(0x22)
-#define PM805_PDM_CONTROL1		(0x23)
-#define PM805_PDM_CONTROL2		(0x24)
-#define PM805_PDM_CONTROL3		(0x25)
-
-#define PM805_HEADPHONE_SETTING		(0x26)
-#define PM805_HEADPHONE_GAIN_A2A	(0x27)
-#define PM805_HEADPHONE_SHORT_STATE	(0x28)
-#define PM805_EARPHONE_SETTING		(0x29)
-#define PM805_AUTO_SEQ_SETTING		(0x2A)
-
-struct pm80x_rtc_pdata {
-	int		vrtc;
-	int		rtc_wakeup;
-};
-
-struct pm80x_subchip {
-	struct i2c_client *power_page;	/* chip client for power page */
-	struct i2c_client *gpadc_page;	/* chip client for gpadc page */
-	struct regmap *regmap_power;
-	struct regmap *regmap_gpadc;
-	unsigned short power_page_addr;	/* power page I2C address */
-	unsigned short gpadc_page_addr;	/* gpadc page I2C address */
-};
-
-struct pm80x_chip {
-	struct pm80x_subchip *subchip;
-	struct device *dev;
-	struct i2c_client *client;
-	struct i2c_client *companion;
-	struct regmap *regmap;
-	const struct regmap_irq_chip *regmap_irq_chip;
-	struct regmap_irq_chip_data *irq_data;
-	int type;
-	int irq;
-	int irq_mode;
-	unsigned long wu_flag;
-	spinlock_t lock;
-};
-
-struct pm80x_platform_data {
-	struct pm80x_rtc_pdata *rtc;
-	/*
-	 * For the regulator not defined, set regulators[not_defined] to be
-	 * NULL. num_regulators are the number of regulators supposed to be
-	 * initialized. If all regulators are not defined, set num_regulators
-	 * to be 0.
-	 */
-	struct regulator_init_data *regulators[PM800_ID_RG_MAX];
-	unsigned int num_regulators;
-	int irq_mode;		/* Clear interrupt by read/write(0/1) */
-	int batt_det;		/* enable/disable */
-	int (*plat_config)(struct pm80x_chip *chip,
-				struct pm80x_platform_data *pdata);
-};
-
-extern const struct dev_pm_ops pm80x_pm_ops;
-extern const struct regmap_config pm80x_regmap_config;
-
-static inline int pm80x_request_irq(struct pm80x_chip *pm80x, int irq,
-				     irq_handler_t handler, unsigned long flags,
-				     const char *name, void *data)
-{
-	if (!pm80x->irq_data)
-		return -EINVAL;
-	return request_threaded_irq(regmap_irq_get_virq(pm80x->irq_data, irq),
-				    NULL, handler, flags, name, data);
-}
-
-static inline void pm80x_free_irq(struct pm80x_chip *pm80x, int irq, void *data)
-{
-	if (!pm80x->irq_data)
-		return;
-	free_irq(regmap_irq_get_virq(pm80x->irq_data, irq), data);
-}
-
-#ifdef CONFIG_PM
-static inline int pm80x_dev_suspend(struct device *dev)
-{
-	struct platform_device *pdev = to_platform_device(dev);
-	struct pm80x_chip *chip = dev_get_drvdata(pdev->dev.parent);
-	int irq = platform_get_irq(pdev, 0);
-
-	if (device_may_wakeup(dev))
-		set_bit(irq, &chip->wu_flag);
-
-	return 0;
-}
-
-static inline int pm80x_dev_resume(struct device *dev)
-{
-	struct platform_device *pdev = to_platform_device(dev);
-	struct pm80x_chip *chip = dev_get_drvdata(pdev->dev.parent);
-	int irq = platform_get_irq(pdev, 0);
-
-	if (device_may_wakeup(dev))
-		clear_bit(irq, &chip->wu_flag);
-
-	return 0;
-}
-#endif
-
-extern int pm80x_init(struct i2c_client *client);
-extern int pm80x_deinit(void);
-#endif /* __LINUX_MFD_88PM80X_H */

@@ -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

@@ -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

@@ -1,199 +0,0 @@
-// SPDX-License-Identifier: GPL-2.0-or-later
-/*
- * RDC321x GPIO driver
- *
- * Copyright (C) 2008, Volker Weiss <dev@tintuc.de>
- * Copyright (C) 2007-2010 Florian Fainelli <florian@openwrt.org>
- */
-#include <linux/module.h>
-#include <linux/kernel.h>
-#include <linux/init.h>
-#include <linux/spinlock.h>
-#include <linux/platform_device.h>
-#include <linux/pci.h>
-#include <linux/gpio/driver.h>
-#include <linux/mfd/rdc321x.h>
-#include <linux/slab.h>
-
-struct rdc321x_gpio {
-	spinlock_t		lock;
-	struct pci_dev		*sb_pdev;
-	u32			data_reg[2];
-	int			reg1_ctrl_base;
-	int			reg1_data_base;
-	int			reg2_ctrl_base;
-	int			reg2_data_base;
-	struct gpio_chip	chip;
-};
-
-/* read GPIO pin */
-static int rdc_gpio_get_value(struct gpio_chip *chip, unsigned gpio)
-{
-	struct rdc321x_gpio *gpch;
-	u32 value = 0;
-	int reg;
-
-	gpch = gpiochip_get_data(chip);
-	reg = gpio < 32 ? gpch->reg1_data_base : gpch->reg2_data_base;
-
-	spin_lock(&gpch->lock);
-	pci_write_config_dword(gpch->sb_pdev, reg,
-					gpch->data_reg[gpio < 32 ? 0 : 1]);
-	pci_read_config_dword(gpch->sb_pdev, reg, &value);
-	spin_unlock(&gpch->lock);
-
-	return (1 << (gpio & 0x1f)) & value ? 1 : 0;
-}
-
-static void rdc_gpio_set_value_impl(struct gpio_chip *chip,
-				unsigned gpio, int value)
-{
-	struct rdc321x_gpio *gpch;
-	int reg = (gpio < 32) ? 0 : 1;
-
-	gpch = gpiochip_get_data(chip);
-
-	if (value)
-		gpch->data_reg[reg] |= 1 << (gpio & 0x1f);
-	else
-		gpch->data_reg[reg] &= ~(1 << (gpio & 0x1f));
-
-	pci_write_config_dword(gpch->sb_pdev,
-			reg ? gpch->reg2_data_base : gpch->reg1_data_base,
-			gpch->data_reg[reg]);
-}
-
-/* set GPIO pin to value */
-static int rdc_gpio_set_value(struct gpio_chip *chip, unsigned int gpio,
-			      int value)
-{
-	struct rdc321x_gpio *gpch;
-
-	gpch = gpiochip_get_data(chip);
-	spin_lock(&gpch->lock);
-	rdc_gpio_set_value_impl(chip, gpio, value);
-	spin_unlock(&gpch->lock);
-
-	return 0;
-}
-
-static int rdc_gpio_config(struct gpio_chip *chip,
-				unsigned gpio, int value)
-{
-	struct rdc321x_gpio *gpch;
-	int err;
-	u32 reg;
-
-	gpch = gpiochip_get_data(chip);
-
-	spin_lock(&gpch->lock);
-	err = pci_read_config_dword(gpch->sb_pdev, gpio < 32 ?
-			gpch->reg1_ctrl_base : gpch->reg2_ctrl_base, &reg);
-	if (err)
-		goto unlock;
-
-	reg |= 1 << (gpio & 0x1f);
-
-	err = pci_write_config_dword(gpch->sb_pdev, gpio < 32 ?
-			gpch->reg1_ctrl_base : gpch->reg2_ctrl_base, reg);
-	if (err)
-		goto unlock;
-
-	rdc_gpio_set_value_impl(chip, gpio, value);
-
-unlock:
-	spin_unlock(&gpch->lock);
-
-	return pcibios_err_to_errno(err);
-}
-
-/* configure GPIO pin as input */
-static int rdc_gpio_direction_input(struct gpio_chip *chip, unsigned gpio)
-{
-	return rdc_gpio_config(chip, gpio, 1);
-}
-
-/*
- * Cache the initial value of both GPIO data registers
- */
-static int rdc321x_gpio_probe(struct platform_device *pdev)
-{
-	int err;
-	struct resource *r;
-	struct rdc321x_gpio *rdc321x_gpio_dev;
-	struct rdc321x_gpio_pdata *pdata;
-
-	pdata = dev_get_platdata(&pdev->dev);
-	if (!pdata) {
-		dev_err(&pdev->dev, "no platform data supplied\n");
-		return -ENODEV;
-	}
-
-	rdc321x_gpio_dev = devm_kzalloc(&pdev->dev, sizeof(struct rdc321x_gpio),
-					GFP_KERNEL);
-	if (!rdc321x_gpio_dev)
-		return -ENOMEM;
-
-	r = platform_get_resource_byname(pdev, IORESOURCE_IO, "gpio-reg1");
-	if (!r) {
-		dev_err(&pdev->dev, "failed to get gpio-reg1 resource\n");
-		return -ENODEV;
-	}
-
-	spin_lock_init(&rdc321x_gpio_dev->lock);
-	rdc321x_gpio_dev->sb_pdev = pdata->sb_pdev;
-	rdc321x_gpio_dev->reg1_ctrl_base = r->start;
-	rdc321x_gpio_dev->reg1_data_base = r->start + 0x4;
-
-	r = platform_get_resource_byname(pdev, IORESOURCE_IO, "gpio-reg2");
-	if (!r) {
-		dev_err(&pdev->dev, "failed to get gpio-reg2 resource\n");
-		return -ENODEV;
-	}
-
-	rdc321x_gpio_dev->reg2_ctrl_base = r->start;
-	rdc321x_gpio_dev->reg2_data_base = r->start + 0x4;
-
-	rdc321x_gpio_dev->chip.label = "rdc321x-gpio";
-	rdc321x_gpio_dev->chip.owner = THIS_MODULE;
-	rdc321x_gpio_dev->chip.direction_input = rdc_gpio_direction_input;
-	rdc321x_gpio_dev->chip.direction_output = rdc_gpio_config;
-	rdc321x_gpio_dev->chip.get = rdc_gpio_get_value;
-	rdc321x_gpio_dev->chip.set = rdc_gpio_set_value;
-	rdc321x_gpio_dev->chip.base = 0;
-	rdc321x_gpio_dev->chip.ngpio = pdata->max_gpios;
-
-	platform_set_drvdata(pdev, rdc321x_gpio_dev);
-
-	/* This might not be, what others (BIOS, bootloader, etc.)
-	   wrote to these registers before, but it's a good guess. Still
-	   better than just using 0xffffffff. */
-	err = pci_read_config_dword(rdc321x_gpio_dev->sb_pdev,
-					rdc321x_gpio_dev->reg1_data_base,
-					&rdc321x_gpio_dev->data_reg[0]);
-	if (err)
-		return pcibios_err_to_errno(err);
-
-	err = pci_read_config_dword(rdc321x_gpio_dev->sb_pdev,
-					rdc321x_gpio_dev->reg2_data_base,
-					&rdc321x_gpio_dev->data_reg[1]);
-	if (err)
-		return pcibios_err_to_errno(err);
-
-	dev_info(&pdev->dev, "registering %d GPIOs\n",
-					rdc321x_gpio_dev->chip.ngpio);
-	return devm_gpiochip_add_data(&pdev->dev, &rdc321x_gpio_dev->chip,
-				      rdc321x_gpio_dev);
-}
-
-static struct platform_driver rdc321x_gpio_driver = {
-	.driver.name	= "rdc321x-gpio",
-	.probe		= rdc321x_gpio_probe,
-};
-
-module_platform_driver(rdc321x_gpio_driver);
-
-MODULE_AUTHOR("Florian Fainelli <florian@openwrt.org>");
-MODULE_DESCRIPTION("RDC321x GPIO driver");
-MODULE_LICENSE("GPL");
-MODULE_ALIAS("platform:rdc321x-gpio");

@@ -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

@@ -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

@@ -1,96 +0,0 @@
-// SPDX-License-Identifier: GPL-2.0-or-later
-/*
- * RDC321x MFD southbridge driver
- *
- * Copyright (C) 2007-2010 Florian Fainelli <florian@openwrt.org>
- * Copyright (C) 2010 Bernhard Loos <bernhardloos@googlemail.com>
- */
-#include <linux/module.h>
-#include <linux/kernel.h>
-#include <linux/platform_device.h>
-#include <linux/pci.h>
-#include <linux/mfd/core.h>
-#include <linux/mfd/rdc321x.h>
-
-static struct rdc321x_wdt_pdata rdc321x_wdt_pdata;
-
-static const struct resource rdc321x_wdt_resource[] = {
-	{
-		.name	= "wdt-reg",
-		.start	= RDC321X_WDT_CTRL,
-		.end	= RDC321X_WDT_CTRL + 0x3,
-		.flags	= IORESOURCE_IO,
-	}
-};
-
-static struct rdc321x_gpio_pdata rdc321x_gpio_pdata = {
-	.max_gpios	= RDC321X_NUM_GPIO,
-};
-
-static const struct resource rdc321x_gpio_resources[] = {
-	{
-		.name	= "gpio-reg1",
-		.start	= RDC321X_GPIO_CTRL_REG1,
-		.end	= RDC321X_GPIO_CTRL_REG1 + 0x7,
-		.flags	= IORESOURCE_IO,
-	}, {
-		.name	= "gpio-reg2",
-		.start	= RDC321X_GPIO_CTRL_REG2,
-		.end	= RDC321X_GPIO_CTRL_REG2 + 0x7,
-		.flags	= IORESOURCE_IO,
-	}
-};
-
-static const struct mfd_cell rdc321x_sb_cells[] = {
-	{
-		.name		= "rdc321x-wdt",
-		.resources	= rdc321x_wdt_resource,
-		.num_resources	= ARRAY_SIZE(rdc321x_wdt_resource),
-		.platform_data	= &rdc321x_wdt_pdata,
-		.pdata_size	= sizeof(rdc321x_wdt_pdata),
-	}, {
-		.name		= "rdc321x-gpio",
-		.resources	= rdc321x_gpio_resources,
-		.num_resources	= ARRAY_SIZE(rdc321x_gpio_resources),
-		.platform_data	= &rdc321x_gpio_pdata,
-		.pdata_size	= sizeof(rdc321x_gpio_pdata),
-	},
-};
-
-static int rdc321x_sb_probe(struct pci_dev *pdev,
-					const struct pci_device_id *ent)
-{
-	int err;
-
-	err = pci_enable_device(pdev);
-	if (err) {
-		dev_err(&pdev->dev, "failed to enable device\n");
-		return err;
-	}
-
-	rdc321x_gpio_pdata.sb_pdev = pdev;
-	rdc321x_wdt_pdata.sb_pdev = pdev;
-
-	return devm_mfd_add_devices(&pdev->dev, -1,
-				    rdc321x_sb_cells,
-				    ARRAY_SIZE(rdc321x_sb_cells),
-				    NULL, 0, NULL);
-}
-
-static const struct pci_device_id rdc321x_sb_table[] = {
-	{ PCI_DEVICE(PCI_VENDOR_ID_RDC, PCI_DEVICE_ID_RDC_R6030) },
-	{}
-};
-MODULE_DEVICE_TABLE(pci, rdc321x_sb_table);
-
-static struct pci_driver rdc321x_sb_driver = {
-	.name		= "RDC321x Southbridge",
-	.id_table	= rdc321x_sb_table,
-	.probe		= rdc321x_sb_probe,
-};
-
-module_pci_driver(rdc321x_sb_driver);
-
-MODULE_AUTHOR("Florian Fainelli <florian@openwrt.org>");
-MODULE_LICENSE("GPL");
-MODULE_DESCRIPTION("RDC R-321x MFD southbridge driver");

@@ -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

@@ -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

@@ -1,281 +0,0 @@
-// SPDX-License-Identifier: GPL-2.0-or-later
-/*
- * RDC321x watchdog driver
- *
- * Copyright (C) 2007-2010 Florian Fainelli <florian@openwrt.org>
- *
- * This driver is highly inspired from the cpu5_wdt driver
- */
-
-#include <linux/module.h>
-#include <linux/moduleparam.h>
-#include <linux/types.h>
-#include <linux/errno.h>
-#include <linux/miscdevice.h>
-#include <linux/fs.h>
-#include <linux/ioport.h>
-#include <linux/timer.h>
-#include <linux/completion.h>
-#include <linux/jiffies.h>
-#include <linux/platform_device.h>
-#include <linux/watchdog.h>
-#include <linux/io.h>
-#include <linux/uaccess.h>
-#include <linux/mfd/rdc321x.h>
-
-#define RDC_WDT_MASK	0x80000000 /* Mask */
-#define RDC_WDT_EN	0x00800000 /* Enable bit */
-#define RDC_WDT_WTI	0x00200000 /* Generate CPU reset/NMI/WDT on timeout */
-#define RDC_WDT_RST	0x00100000 /* Reset bit */
-#define RDC_WDT_WIF	0x00040000 /* WDT IRQ Flag */
-#define RDC_WDT_IRT	0x00000100 /* IRQ Routing table */
-#define RDC_WDT_CNT	0x00000001 /* WDT count */
-
-#define RDC_CLS_TMR	0x80003844 /* Clear timer */
-
-#define RDC_WDT_INTERVAL	(HZ/10+1)
-
-static int ticks = 1000;
-
-/* some device data */
-
-static struct {
-	struct completion stop;
-	int running;
-	struct timer_list timer;
-	int queue;
-	int default_ticks;
-	unsigned long inuse;
-	spinlock_t lock;
-	struct pci_dev *sb_pdev;
-	int base_reg;
-} rdc321x_wdt_device;
-
-/* generic helper functions */
-
-static void rdc321x_wdt_trigger(struct timer_list *unused)
-{
-	unsigned long flags;
-	u32 val;
-
-	if (rdc321x_wdt_device.running)
-		ticks--;
-
-	/* keep watchdog alive */
-	spin_lock_irqsave(&rdc321x_wdt_device.lock, flags);
-	pci_read_config_dword(rdc321x_wdt_device.sb_pdev,
-					rdc321x_wdt_device.base_reg, &val);
-	val |= RDC_WDT_EN;
-	pci_write_config_dword(rdc321x_wdt_device.sb_pdev,
-					rdc321x_wdt_device.base_reg, val);
-	spin_unlock_irqrestore(&rdc321x_wdt_device.lock, flags);
-
-	/* requeue?? */
-	if (rdc321x_wdt_device.queue && ticks)
-		mod_timer(&rdc321x_wdt_device.timer,
-				jiffies + RDC_WDT_INTERVAL);
-	else {
-		/* ticks doesn't matter anyway */
-		complete(&rdc321x_wdt_device.stop);
-	}
-
-}
-
-static void rdc321x_wdt_reset(void)
-{
-	ticks = rdc321x_wdt_device.default_ticks;
-}
-
-static void rdc321x_wdt_start(void)
-{
-	unsigned long flags;
-
-	if (!rdc321x_wdt_device.queue) {
-		rdc321x_wdt_device.queue = 1;
-
-		/* Clear the timer */
-		spin_lock_irqsave(&rdc321x_wdt_device.lock, flags);
-		pci_write_config_dword(rdc321x_wdt_device.sb_pdev,
-				rdc321x_wdt_device.base_reg, RDC_CLS_TMR);
-
-		/* Enable watchdog and set the timeout to 81.92 us */
-		pci_write_config_dword(rdc321x_wdt_device.sb_pdev,
-					rdc321x_wdt_device.base_reg,
-					RDC_WDT_EN | RDC_WDT_CNT);
-		spin_unlock_irqrestore(&rdc321x_wdt_device.lock, flags);
-
-		mod_timer(&rdc321x_wdt_device.timer,
-				jiffies + RDC_WDT_INTERVAL);
-	}
-
-	/* if process dies, counter is not decremented */
-	rdc321x_wdt_device.running++;
-}
-
-static int rdc321x_wdt_stop(void)
-{
-	if (rdc321x_wdt_device.running)
-		rdc321x_wdt_device.running = 0;
-
-	ticks = rdc321x_wdt_device.default_ticks;
-
-	return -EIO;
-}
-
-/* filesystem operations */
-static int rdc321x_wdt_open(struct inode *inode, struct file *file)
-{
-	if (test_and_set_bit(0, &rdc321x_wdt_device.inuse))
-		return -EBUSY;
-
-	return stream_open(inode, file);
-}
-
-static int rdc321x_wdt_release(struct inode *inode, struct file *file)
-{
-	clear_bit(0, &rdc321x_wdt_device.inuse);
-	return 0;
-}
-
-static long rdc321x_wdt_ioctl(struct file *file, unsigned int cmd,
-				unsigned long arg)
-{
-	void __user *argp = (void __user *)arg;
-	u32 value;
-	static const struct watchdog_info ident = {
-		.options = WDIOF_CARDRESET,
-		.identity = "RDC321x WDT",
-	};
-	unsigned long flags;
-
-	switch (cmd) {
-	case WDIOC_KEEPALIVE:
-		rdc321x_wdt_reset();
-		break;
-	case WDIOC_GETSTATUS:
-		/* Read the value from the DATA register */
-		spin_lock_irqsave(&rdc321x_wdt_device.lock, flags);
-		pci_read_config_dword(rdc321x_wdt_device.sb_pdev,
-					rdc321x_wdt_device.base_reg, &value);
-		spin_unlock_irqrestore(&rdc321x_wdt_device.lock, flags);
-		if (copy_to_user(argp, &value, sizeof(u32)))
-			return -EFAULT;
-		break;
-	case WDIOC_GETSUPPORT:
-		if (copy_to_user(argp, &ident, sizeof(ident)))
-			return -EFAULT;
-		break;
-	case WDIOC_SETOPTIONS:
-		if (copy_from_user(&value, argp, sizeof(int)))
-			return -EFAULT;
-		switch (value) {
-		case WDIOS_ENABLECARD:
-			rdc321x_wdt_start();
-			break;
-		case WDIOS_DISABLECARD:
-			return rdc321x_wdt_stop();
-		default:
-			return -EINVAL;
-		}
-		break;
-	default:
-		return -ENOTTY;
-	}
-	return 0;
-}
-
-static ssize_t rdc321x_wdt_write(struct file *file, const char __user *buf,
-				size_t count, loff_t *ppos)
-{
-	if (!count)
-		return -EIO;
-
-	rdc321x_wdt_reset();
-
-	return count;
-}
-
-static const struct file_operations rdc321x_wdt_fops = {
-	.owner		= THIS_MODULE,
-	.unlocked_ioctl	= rdc321x_wdt_ioctl,
-	.compat_ioctl	= compat_ptr_ioctl,
-	.open		= rdc321x_wdt_open,
-	.write		= rdc321x_wdt_write,
-	.release	= rdc321x_wdt_release,
-};
-
-static struct miscdevice rdc321x_wdt_misc = {
-	.minor	= WATCHDOG_MINOR,
-	.name	= "watchdog",
-	.fops	= &rdc321x_wdt_fops,
-};
-
-static int rdc321x_wdt_probe(struct platform_device *pdev)
-{
-	int err;
-	struct resource *r;
-	struct rdc321x_wdt_pdata *pdata;
-
-	pdata = dev_get_platdata(&pdev->dev);
-	if (!pdata) {
-		dev_err(&pdev->dev, "no platform data supplied\n");
-		return -ENODEV;
-	}
-
-	r = platform_get_resource_byname(pdev, IORESOURCE_IO, "wdt-reg");
-	if (!r) {
-		dev_err(&pdev->dev, "failed to get wdt-reg resource\n");
-		return -ENODEV;
-	}
-
-	rdc321x_wdt_device.sb_pdev = pdata->sb_pdev;
-	rdc321x_wdt_device.base_reg = r->start;
-	rdc321x_wdt_device.queue = 0;
-	rdc321x_wdt_device.default_ticks = ticks;
-
-	err = misc_register(&rdc321x_wdt_misc);
-	if (err < 0) {
-		dev_err(&pdev->dev, "misc_register failed\n");
-		return err;
-	}
-
-	spin_lock_init(&rdc321x_wdt_device.lock);
-
-	/* Reset the watchdog */
-	pci_write_config_dword(rdc321x_wdt_device.sb_pdev,
-				rdc321x_wdt_device.base_reg, RDC_WDT_RST);
-
-	init_completion(&rdc321x_wdt_device.stop);
-
-	clear_bit(0, &rdc321x_wdt_device.inuse);
-
-	timer_setup(&rdc321x_wdt_device.timer, rdc321x_wdt_trigger, 0);
-
-	dev_info(&pdev->dev, "watchdog init success\n");
-
-	return 0;
-}
-
-static void rdc321x_wdt_remove(struct platform_device *pdev)
-{
-	if (rdc321x_wdt_device.queue) {
-		rdc321x_wdt_device.queue = 0;
-		wait_for_completion(&rdc321x_wdt_device.stop);
-	}
-
-	misc_deregister(&rdc321x_wdt_misc);
-}
-
-static struct platform_driver rdc321x_wdt_driver = {
-	.probe = rdc321x_wdt_probe,
-	.remove = rdc321x_wdt_remove,
-	.driver = {
-		.name = "rdc321x-wdt",
-	},
-};
-
-module_platform_driver(rdc321x_wdt_driver);
-
-MODULE_AUTHOR("Florian Fainelli <florian@openwrt.org>");
-MODULE_DESCRIPTION("RDC321x watchdog driver");
-MODULE_LICENSE("GPL");

@@ -1,27 +0,0 @@
-/* SPDX-License-Identifier: GPL-2.0 */
-#ifndef __RDC321X_MFD_H
-#define __RDC321X_MFD_H
-
-#include <linux/types.h>
-#include <linux/pci.h>
-
-/* Offsets to be accessed in the southbridge PCI
- * device configuration register */
-#define RDC321X_WDT_CTRL	0x44
-#define RDC321X_GPIO_CTRL_REG1	0x48
-#define RDC321X_GPIO_DATA_REG1	0x4c
-#define RDC321X_GPIO_CTRL_REG2	0x84
-#define RDC321X_GPIO_DATA_REG2	0x88
-
-#define RDC321X_NUM_GPIO	59
-
-struct rdc321x_gpio_pdata {
-	struct pci_dev *sb_pdev;
-	unsigned max_gpios;
-};
-
-struct rdc321x_wdt_pdata {
-	struct pci_dev *sb_pdev;
-};
-
-#endif /* __RDC321X_MFD_H */

@@ -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

@@ -1,160 +0,0 @@
-.. SPDX-License-Identifier: GPL-2.0
-
-.. include:: <isonum.txt>
-
-
-The SI476x Driver
-=================
-
-Copyright |copy| 2013 Andrey Smirnov <andrew.smirnov@gmail.com>
-
-TODO for the driver
--------------------
-
-- According to the SiLabs' datasheet it is possible to update the
-  firmware of the radio chip in the run-time, thus bringing it to the
-  most recent version. Unfortunately I couldn't find any mentioning of
-  the said firmware update for the old chips that I tested the driver
-  against, so for chips like that the driver only exposes the old
-  functionality.
-
-
-Parameters exposed over debugfs
--------------------------------
-SI476x allow user to get multiple characteristics that can be very
-useful for EoL testing/RF performance estimation, parameters that have
-very little to do with V4L2 subsystem. Such parameters are exposed via
-debugfs and can be accessed via regular file I/O operations.
-
-The drivers exposes following files:
-
-* /sys/kernel/debug/<device-name>/acf
-  This file contains ACF(Automatically Controlled Features) status
-  information. The contents of the file is binary data of the
-  following layout:
-
-  .. tabularcolumns:: |p{7ex}|p{12ex}|L|
-
-  =============  ==============   ====================================
-  Offset	 Name		  Description
-  =============  ==============   ====================================
-  0x00		 blend_int	  Flag, set when stereo separation has
-				  crossed below the blend threshold
-  0x01		 hblend_int	  Flag, set when HiBlend cutoff
-				  frequency is lower than threshold
-  0x02		 hicut_int	  Flag, set when HiCut cutoff
-				  frequency is lower than threshold
-  0x03		 chbw_int	  Flag, set when channel filter
-				  bandwidth is less than threshold
-  0x04		 softmute_int	  Flag indicating that softmute
-				  attenuation has increased above
-				  softmute threshold
-  0x05		 smute		  0 - Audio is not soft muted
-				  1 - Audio is soft muted
-  0x06		 smattn		  Soft mute attenuation level in dB
-  0x07		 chbw		  Channel filter bandwidth in kHz
-  0x08		 hicut		  HiCut cutoff frequency in units of
-				  100Hz
-  0x09		 hiblend	  HiBlend cutoff frequency in units
-				  of 100 Hz
-  0x10		 pilot		  0 - Stereo pilot is not present
-				  1 - Stereo pilot is present
-  0x11		 stblend	  Stereo blend in %
-  =============  ==============   ====================================
-
-
-* /sys/kernel/debug/<device-name>/rds_blckcnt
-  This file contains statistics about RDS receptions. It's binary data
-  has the following layout:
-
-  .. tabularcolumns:: |p{7ex}|p{12ex}|L|
-
-  =============  ==============   ====================================
-  Offset	 Name		  Description
-  =============  ==============   ====================================
-  0x00		 expected	  Number of expected RDS blocks
-  0x02		 received	  Number of received RDS blocks
-  0x04		 uncorrectable	  Number of uncorrectable RDS blocks
-  =============  ==============   ====================================
-
-* /sys/kernel/debug/<device-name>/agc
-  This file contains information about parameters pertaining to
-  AGC(Automatic Gain Control)
-
-  The layout is:
-
-  .. tabularcolumns:: |p{7ex}|p{12ex}|L|
-
-  =============  ==============   ====================================
-  Offset	 Name		  Description
-  =============  ==============   ====================================
-  0x00		 mxhi		  0 - FM Mixer PD high threshold is
-				  not tripped
-				  1 - FM Mixer PD high threshold is
-				  tripped
-  0x01		 mxlo		  ditto for FM Mixer PD low
-  0x02		 lnahi		  ditto for FM LNA PD high
-  0x03		 lnalo		  ditto for FM LNA PD low
-  0x04		 fmagc1		  FMAGC1 attenuator resistance
-				  (see datasheet for more detail)
-  0x05		 fmagc2		  ditto for FMAGC2
-  0x06		 pgagain	  PGA gain in dB
-  0x07		 fmwblang	  FM/WB LNA Gain in dB
-  =============  ==============   ====================================
-
-* /sys/kernel/debug/<device-name>/rsq
-  This file contains information about parameters pertaining to
-  RSQ(Received Signal Quality)
-
-  The layout is:
-
-  .. tabularcolumns:: |p{7ex}|p{12ex}|p{60ex}|
-
-  =============  ==============   ====================================
-  Offset	 Name		  Description
-  =============  ==============   ====================================
-  0x00		 multhint	  0 - multipath value has not crossed
-				  the Multipath high threshold
-				  1 - multipath value has crossed
-				  the Multipath high threshold
-  0x01		 multlint	  ditto for Multipath low threshold
-  0x02		 snrhint	  0 - received signal's SNR has not
-				  crossed high threshold
-				  1 - received signal's SNR has
-				  crossed high threshold
-  0x03		 snrlint	  ditto for low threshold
-  0x04		 rssihint	  ditto for RSSI high threshold
-  0x05		 rssilint	  ditto for RSSI low threshold
-  0x06		 bltf		  Flag indicating if seek command
-				  reached/wrapped seek band limit
-  0x07		 snr_ready	  Indicates that SNR metrics is ready
-  0x08		 rssiready	  ditto for RSSI metrics
-  0x09		 injside	  0 - Low-side injection is being used
-				  1 - High-side injection is used
-  0x10		 afcrl		  Flag indicating if AFC rails
-  0x11		 valid		  Flag indicating if channel is valid
-  0x12		 readfreq	  Current tuned frequency
-  0x14		 freqoff	  Signed frequency offset in units of
-				  2ppm
-  0x15		 rssi		  Signed value of RSSI in dBuV
-  0x16		 snr		  Signed RF SNR in dB
-  0x17		 issi		  Signed Image Strength Signal
-				  indicator
-  0x18		 lassi		  Signed Low side adjacent Channel
-				  Strength indicator
-  0x19		 hassi		  ditto for High side
-  0x20		 mult		  Multipath indicator
-  0x21		 dev		  Frequency deviation
-  0x24		 assi		  Adjacent channel SSI
-  0x25		 usn		  Ultrasonic noise indicator
-  0x26		 pilotdev	  Pilot deviation in units of 100 Hz
-  0x27		 rdsdev		  ditto for RDS
-  0x28		 assidev	  ditto for ASSI
-  0x29		 strongdev	  Frequency deviation
-  0x30		 rdspi		  RDS PI code
-  =============  ==============   ====================================
-
-* /sys/kernel/debug/<device-name>/rsq_primary
-  This file contains information about parameters pertaining to
-  RSQ(Received Signal Quality) for primary tuner only. Layout is as
-  the one above.

@@ -33,7 +33,6 @@ Video4Linux (V4L) driver-specific documentation
 	saa7134
 	si470x
 	si4713
-	si476x
 	vimc
 	visl
 	vivid

@@ -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
 

@@ -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

@@ -1,1523 +0,0 @@
-// SPDX-License-Identifier: GPL-2.0-only
-/*
- * drivers/media/radio/radio-si476x.c -- V4L2 driver for SI476X chips
- *
- * Copyright (C) 2012 Innovative Converged Devices(ICD)
- * Copyright (C) 2013 Andrey Smirnov
- *
- * Author: Andrey Smirnov <andrew.smirnov@gmail.com>
- */
-
-#include <linux/module.h>
-#include <linux/delay.h>
-#include <linux/interrupt.h>
-#include <linux/slab.h>
-#include <linux/atomic.h>
-#include <linux/videodev2.h>
-#include <linux/mutex.h>
-#include <linux/debugfs.h>
-#include <media/v4l2-common.h>
-#include <media/v4l2-ioctl.h>
-#include <media/v4l2-ctrls.h>
-#include <media/v4l2-event.h>
-#include <media/v4l2-device.h>
-
-#include <media/drv-intf/si476x.h>
-#include <linux/mfd/si476x-core.h>
-
-#define FM_FREQ_RANGE_LOW   64000000
-#define FM_FREQ_RANGE_HIGH 108000000
-
-#define AM_FREQ_RANGE_LOW    520000
-#define AM_FREQ_RANGE_HIGH 30000000
-
-#define PWRLINEFLTR (1 << 8)
-
-#define FREQ_MUL (10000000 / 625)
-
-#define SI476X_PHDIV_STATUS_LINK_LOCKED(status) (0x80 & (status))
-
-#define DRIVER_NAME "si476x-radio"
-#define DRIVER_CARD "SI476x AM/FM Receiver"
-
-enum si476x_freq_bands {
-	SI476X_BAND_FM,
-	SI476X_BAND_AM,
-};
-
-static const struct v4l2_frequency_band si476x_bands[] = {
-	[SI476X_BAND_FM] = {
-		.type		= V4L2_TUNER_RADIO,
-		.index		= SI476X_BAND_FM,
-		.capability	= V4L2_TUNER_CAP_LOW
-		| V4L2_TUNER_CAP_STEREO
-		| V4L2_TUNER_CAP_RDS
-		| V4L2_TUNER_CAP_RDS_BLOCK_IO
-		| V4L2_TUNER_CAP_FREQ_BANDS,
-		.rangelow	=  64 * FREQ_MUL,
-		.rangehigh	= 108 * FREQ_MUL,
-		.modulation	= V4L2_BAND_MODULATION_FM,
-	},
-	[SI476X_BAND_AM] = {
-		.type		= V4L2_TUNER_RADIO,
-		.index		= SI476X_BAND_AM,
-		.capability	= V4L2_TUNER_CAP_LOW
-		| V4L2_TUNER_CAP_FREQ_BANDS,
-		.rangelow	= 0.52 * FREQ_MUL,
-		.rangehigh	= 30 * FREQ_MUL,
-		.modulation	= V4L2_BAND_MODULATION_AM,
-	},
-};
-
-static inline bool si476x_radio_freq_is_inside_of_the_band(u32 freq, int band)
-{
-	return freq >= si476x_bands[band].rangelow &&
-		freq <= si476x_bands[band].rangehigh;
-}
-
-static inline bool si476x_radio_range_is_inside_of_the_band(u32 low, u32 high,
-							    int band)
-{
-	return low  >= si476x_bands[band].rangelow &&
-		high <= si476x_bands[band].rangehigh;
-}
-
-static int si476x_radio_s_ctrl(struct v4l2_ctrl *ctrl);
-static int si476x_radio_g_volatile_ctrl(struct v4l2_ctrl *ctrl);
-
-enum phase_diversity_modes_idx {
-	SI476X_IDX_PHDIV_DISABLED,
-	SI476X_IDX_PHDIV_PRIMARY_COMBINING,
-	SI476X_IDX_PHDIV_PRIMARY_ANTENNA,
-	SI476X_IDX_PHDIV_SECONDARY_ANTENNA,
-	SI476X_IDX_PHDIV_SECONDARY_COMBINING,
-};
-
-static const char * const phase_diversity_modes[] = {
-	[SI476X_IDX_PHDIV_DISABLED]		= "Disabled",
-	[SI476X_IDX_PHDIV_PRIMARY_COMBINING]	= "Primary with Secondary",
-	[SI476X_IDX_PHDIV_PRIMARY_ANTENNA]	= "Primary Antenna",
-	[SI476X_IDX_PHDIV_SECONDARY_ANTENNA]	= "Secondary Antenna",
-	[SI476X_IDX_PHDIV_SECONDARY_COMBINING]	= "Secondary with Primary",
-};
-
-static inline enum phase_diversity_modes_idx
-si476x_phase_diversity_mode_to_idx(enum si476x_phase_diversity_mode mode)
-{
-	switch (mode) {
-	default:
-		fallthrough;
-	case SI476X_PHDIV_DISABLED:
-		return SI476X_IDX_PHDIV_DISABLED;
-	case SI476X_PHDIV_PRIMARY_COMBINING:
-		return SI476X_IDX_PHDIV_PRIMARY_COMBINING;
-	case SI476X_PHDIV_PRIMARY_ANTENNA:
-		return SI476X_IDX_PHDIV_PRIMARY_ANTENNA;
-	case SI476X_PHDIV_SECONDARY_ANTENNA:
-		return SI476X_IDX_PHDIV_SECONDARY_ANTENNA;
-	case SI476X_PHDIV_SECONDARY_COMBINING:
-		return SI476X_IDX_PHDIV_SECONDARY_COMBINING;
-	}
-}
-
-static inline enum si476x_phase_diversity_mode
-si476x_phase_diversity_idx_to_mode(enum phase_diversity_modes_idx idx)
-{
-	static const int idx_to_value[] = {
-		[SI476X_IDX_PHDIV_DISABLED]		= SI476X_PHDIV_DISABLED,
-		[SI476X_IDX_PHDIV_PRIMARY_COMBINING]	= SI476X_PHDIV_PRIMARY_COMBINING,
-		[SI476X_IDX_PHDIV_PRIMARY_ANTENNA]	= SI476X_PHDIV_PRIMARY_ANTENNA,
-		[SI476X_IDX_PHDIV_SECONDARY_ANTENNA]	= SI476X_PHDIV_SECONDARY_ANTENNA,
-		[SI476X_IDX_PHDIV_SECONDARY_COMBINING]	= SI476X_PHDIV_SECONDARY_COMBINING,
-	};
-
-	return idx_to_value[idx];
-}
-
-static const struct v4l2_ctrl_ops si476x_ctrl_ops = {
-	.g_volatile_ctrl	= si476x_radio_g_volatile_ctrl,
-	.s_ctrl			= si476x_radio_s_ctrl,
-};
-
-
-enum si476x_ctrl_idx {
-	SI476X_IDX_RSSI_THRESHOLD,
-	SI476X_IDX_SNR_THRESHOLD,
-	SI476X_IDX_MAX_TUNE_ERROR,
-	SI476X_IDX_HARMONICS_COUNT,
-	SI476X_IDX_DIVERSITY_MODE,
-	SI476X_IDX_INTERCHIP_LINK,
-};
-static struct v4l2_ctrl_config si476x_ctrls[] = {
-
-	/*
-	 * SI476X during its station seeking(or tuning) process uses several
-	 * parameters to determine if "the station" is valid:
-	 *
-	 *	- Signal's SNR(in dBuV) must be lower than
-	 *	#V4L2_CID_SI476X_SNR_THRESHOLD
-	 *	- Signal's RSSI(in dBuV) must be greater than
-	 *	#V4L2_CID_SI476X_RSSI_THRESHOLD
-	 *	- Signal's frequency deviation(in units of 2ppm) must not be
-	 *	more than #V4L2_CID_SI476X_MAX_TUNE_ERROR
-	 */
-	[SI476X_IDX_RSSI_THRESHOLD] = {
-		.ops	= &si476x_ctrl_ops,
-		.id	= V4L2_CID_SI476X_RSSI_THRESHOLD,
-		.name	= "Valid RSSI Threshold",
-		.type	= V4L2_CTRL_TYPE_INTEGER,
-		.min	= -128,
-		.max	= 127,
-		.step	= 1,
-	},
-	[SI476X_IDX_SNR_THRESHOLD] = {
-		.ops	= &si476x_ctrl_ops,
-		.id	= V4L2_CID_SI476X_SNR_THRESHOLD,
-		.type	= V4L2_CTRL_TYPE_INTEGER,
-		.name	= "Valid SNR Threshold",
-		.min	= -128,
-		.max	= 127,
-		.step	= 1,
-	},
-	[SI476X_IDX_MAX_TUNE_ERROR] = {
-		.ops	= &si476x_ctrl_ops,
-		.id	= V4L2_CID_SI476X_MAX_TUNE_ERROR,
-		.type	= V4L2_CTRL_TYPE_INTEGER,
-		.name	= "Max Tune Errors",
-		.min	= 0,
-		.max	= 126 * 2,
-		.step	= 2,
-	},
-
-	/*
-	 * #V4L2_CID_SI476X_HARMONICS_COUNT -- number of harmonics
-	 * built-in power-line noise supression filter is to reject
-	 * during AM-mode operation.
-	 */
-	[SI476X_IDX_HARMONICS_COUNT] = {
-		.ops	= &si476x_ctrl_ops,
-		.id	= V4L2_CID_SI476X_HARMONICS_COUNT,
-		.type	= V4L2_CTRL_TYPE_INTEGER,
-
-		.name	= "Count of Harmonics to Reject",
-		.min	= 0,
-		.max	= 20,
-		.step	= 1,
-	},
-
-	/*
-	 * #V4L2_CID_SI476X_DIVERSITY_MODE -- configuration which
-	 * two tuners working in diversity mode are to work in.
-	 *
-	 *  - #SI476X_IDX_PHDIV_DISABLED diversity mode disabled
-	 *  - #SI476X_IDX_PHDIV_PRIMARY_COMBINING diversity mode is
-	 *  on, primary tuner's antenna is the main one.
-	 *  - #SI476X_IDX_PHDIV_PRIMARY_ANTENNA diversity mode is
-	 *  off, primary tuner's antenna is the main one.
-	 *  - #SI476X_IDX_PHDIV_SECONDARY_ANTENNA diversity mode is
-	 *  off, secondary tuner's antenna is the main one.
-	 *  - #SI476X_IDX_PHDIV_SECONDARY_COMBINING diversity mode is
-	 *  on, secondary tuner's antenna is the main one.
-	 */
-	[SI476X_IDX_DIVERSITY_MODE] = {
-		.ops	= &si476x_ctrl_ops,
-		.id	= V4L2_CID_SI476X_DIVERSITY_MODE,
-		.type	= V4L2_CTRL_TYPE_MENU,
-		.name	= "Phase Diversity Mode",
-		.qmenu	= phase_diversity_modes,
-		.min	= 0,
-		.max	= ARRAY_SIZE(phase_diversity_modes) - 1,
-	},
-
-	/*
-	 * #V4L2_CID_SI476X_INTERCHIP_LINK -- inter-chip link in
-	 * diversity mode indicator. Allows user to determine if two
-	 * chips working in diversity mode have established a link
-	 * between each other and if the system as a whole uses
-	 * signals from both antennas to receive FM radio.
-	 */
-	[SI476X_IDX_INTERCHIP_LINK] = {
-		.ops	= &si476x_ctrl_ops,
-		.id	= V4L2_CID_SI476X_INTERCHIP_LINK,
-		.type	= V4L2_CTRL_TYPE_BOOLEAN,
-		.flags  = V4L2_CTRL_FLAG_READ_ONLY | V4L2_CTRL_FLAG_VOLATILE,
-		.name	= "Inter-Chip Link",
-		.min	= 0,
-		.max	= 1,
-		.step	= 1,
-	},
-};
-
-struct si476x_radio;
-
-/**
- * struct si476x_radio_ops - vtable of tuner functions
- *
- * This table holds pointers to functions implementing particular
- * operations depending on the mode in which the tuner chip was
- * configured to start. If the function is not supported
- * corresponding element is set to #NULL.
- *
- * @tune_freq: Tune chip to a specific frequency
- * @seek_start: Star station seeking
- * @rsq_status: Get Received Signal Quality(RSQ) status
- * @rds_blckcnt: Get received RDS blocks count
- * @phase_diversity: Change phase diversity mode of the tuner
- * @phase_div_status: Get phase diversity mode status
- * @acf_status: Get the status of Automatically Controlled
- * Features(ACF)
- * @agc_status: Get Automatic Gain Control(AGC) status
- */
-struct si476x_radio_ops {
-	int (*tune_freq)(struct si476x_core *, struct si476x_tune_freq_args *);
-	int (*seek_start)(struct si476x_core *, bool, bool);
-	int (*rsq_status)(struct si476x_core *, struct si476x_rsq_status_args *,
-			  struct si476x_rsq_status_report *);
-	int (*rds_blckcnt)(struct si476x_core *, bool,
-			   struct si476x_rds_blockcount_report *);
-
-	int (*phase_diversity)(struct si476x_core *,
-			       enum si476x_phase_diversity_mode);
-	int (*phase_div_status)(struct si476x_core *);
-	int (*acf_status)(struct si476x_core *,
-			  struct si476x_acf_status_report *);
-	int (*agc_status)(struct si476x_core *,
-			  struct si476x_agc_status_report *);
-};
-
-/**
- * struct si476x_radio - radio device
- *
- * @v4l2dev: Pointer to V4L2 device created by V4L2 subsystem
- * @videodev: Pointer to video device created by V4L2 subsystem
- * @ctrl_handler: V4L2 controls handler
- * @core: Pointer to underlying core device
- * @ops: Vtable of functions. See struct si476x_radio_ops for details
- * @debugfs: pointer to &strucd dentry for debugfs
- * @audmode: audio mode, as defined for the rxsubchans field
- *	     at videodev2.h
- *
- * core structure is the radio device is being used
- */
-struct si476x_radio {
-	struct v4l2_device v4l2dev;
-	struct video_device videodev;
-	struct v4l2_ctrl_handler ctrl_handler;
-
-	struct si476x_core  *core;
-	/* This field should not be accesses unless core lock is held */
-	const struct si476x_radio_ops *ops;
-
-	struct dentry	*debugfs;
-	u32 audmode;
-};
-
-static inline struct si476x_radio *
-v4l2_ctrl_handler_to_radio(struct v4l2_ctrl_handler *d)
-{
-	return container_of(d, struct si476x_radio, ctrl_handler);
-}
-
-/*
- * si476x_vidioc_querycap - query device capabilities
- */
-static int si476x_radio_querycap(struct file *file, void *priv,
-				 struct v4l2_capability *capability)
-{
-	struct si476x_radio *radio = video_drvdata(file);
-
-	strscpy(capability->driver, radio->v4l2dev.name,
-		sizeof(capability->driver));
-	strscpy(capability->card, DRIVER_CARD, sizeof(capability->card));
-	return 0;
-}
-
-static int si476x_radio_enum_freq_bands(struct file *file, void *priv,
-					struct v4l2_frequency_band *band)
-{
-	int err;
-	struct si476x_radio *radio = video_drvdata(file);
-
-	if (band->tuner != 0)
-		return -EINVAL;
-
-	switch (radio->core->chip_id) {
-		/* AM/FM tuners -- all bands are supported */
-	case SI476X_CHIP_SI4761:
-	case SI476X_CHIP_SI4764:
-		if (band->index < ARRAY_SIZE(si476x_bands)) {
-			*band = si476x_bands[band->index];
-			err = 0;
-		} else {
-			err = -EINVAL;
-		}
-		break;
-		/* FM companion tuner chips -- only FM bands are
-		 * supported */
-	case SI476X_CHIP_SI4768:
-		if (band->index == SI476X_BAND_FM) {
-			*band = si476x_bands[band->index];
-			err = 0;
-		} else {
-			err = -EINVAL;
-		}
-		break;
-	default:
-		err = -EINVAL;
-	}
-
-	return err;
-}
-
-static int si476x_radio_g_tuner(struct file *file, void *priv,
-				struct v4l2_tuner *tuner)
-{
-	int err;
-	struct si476x_rsq_status_report report;
-	struct si476x_radio *radio = video_drvdata(file);
-
-	struct si476x_rsq_status_args args = {
-		.primary	= false,
-		.rsqack		= false,
-		.attune		= false,
-		.cancel		= false,
-		.stcack		= false,
-	};
-
-	if (tuner->index != 0)
-		return -EINVAL;
-
-	tuner->type       = V4L2_TUNER_RADIO;
-	tuner->capability = V4L2_TUNER_CAP_LOW /* Measure frequencies
-						 * in multiples of
-						 * 62.5 Hz */
-		| V4L2_TUNER_CAP_STEREO
-		| V4L2_TUNER_CAP_HWSEEK_BOUNDED
-		| V4L2_TUNER_CAP_HWSEEK_WRAP
-		| V4L2_TUNER_CAP_HWSEEK_PROG_LIM;
-
-	si476x_core_lock(radio->core);
-
-	if (si476x_core_is_a_secondary_tuner(radio->core)) {
-		strscpy(tuner->name, "FM (secondary)", sizeof(tuner->name));
-		tuner->rxsubchans = 0;
-		tuner->rangelow = si476x_bands[SI476X_BAND_FM].rangelow;
-	} else if (si476x_core_has_am(radio->core)) {
-		if (si476x_core_is_a_primary_tuner(radio->core))
-			strscpy(tuner->name, "AM/FM (primary)",
-				sizeof(tuner->name));
-		else
-			strscpy(tuner->name, "AM/FM", sizeof(tuner->name));
-
-		tuner->rxsubchans = V4L2_TUNER_SUB_MONO | V4L2_TUNER_SUB_STEREO
-			| V4L2_TUNER_SUB_RDS;
-		tuner->capability |= V4L2_TUNER_CAP_RDS
-			| V4L2_TUNER_CAP_RDS_BLOCK_IO
-			| V4L2_TUNER_CAP_FREQ_BANDS;
-
-		tuner->rangelow = si476x_bands[SI476X_BAND_AM].rangelow;
-	} else {
-		strscpy(tuner->name, "FM", sizeof(tuner->name));
-		tuner->rxsubchans = V4L2_TUNER_SUB_RDS;
-		tuner->capability |= V4L2_TUNER_CAP_RDS
-			| V4L2_TUNER_CAP_RDS_BLOCK_IO
-			| V4L2_TUNER_CAP_FREQ_BANDS;
-		tuner->rangelow = si476x_bands[SI476X_BAND_FM].rangelow;
-	}
-
-	tuner->audmode = radio->audmode;
-
-	tuner->afc = 1;
-	tuner->rangehigh = si476x_bands[SI476X_BAND_FM].rangehigh;
-
-	err = radio->ops->rsq_status(radio->core,
-				     &args, &report);
-	if (err < 0) {
-		tuner->signal = 0;
-	} else {
-		/*
-		 * tuner->signal value range: 0x0000 .. 0xFFFF,
-		 * report.rssi: -128 .. 127
-		 */
-		tuner->signal = (report.rssi + 128) * 257;
-	}
-	si476x_core_unlock(radio->core);
-
-	return err;
-}
-
-static int si476x_radio_s_tuner(struct file *file, void *priv,
-				const struct v4l2_tuner *tuner)
-{
-	struct si476x_radio *radio = video_drvdata(file);
-
-	if (tuner->index != 0)
-		return -EINVAL;
-
-	if (tuner->audmode == V4L2_TUNER_MODE_MONO ||
-	    tuner->audmode == V4L2_TUNER_MODE_STEREO)
-		radio->audmode = tuner->audmode;
-	else
-		radio->audmode = V4L2_TUNER_MODE_STEREO;
-
-	return 0;
-}
-
-static int si476x_radio_init_vtable(struct si476x_radio *radio,
-				    enum si476x_func func)
-{
-	static const struct si476x_radio_ops fm_ops = {
-		.tune_freq		= si476x_core_cmd_fm_tune_freq,
-		.seek_start		= si476x_core_cmd_fm_seek_start,
-		.rsq_status		= si476x_core_cmd_fm_rsq_status,
-		.rds_blckcnt		= si476x_core_cmd_fm_rds_blockcount,
-		.phase_diversity	= si476x_core_cmd_fm_phase_diversity,
-		.phase_div_status	= si476x_core_cmd_fm_phase_div_status,
-		.acf_status		= si476x_core_cmd_fm_acf_status,
-		.agc_status		= si476x_core_cmd_agc_status,
-	};
-
-	static const struct si476x_radio_ops am_ops = {
-		.tune_freq		= si476x_core_cmd_am_tune_freq,
-		.seek_start		= si476x_core_cmd_am_seek_start,
-		.rsq_status		= si476x_core_cmd_am_rsq_status,
-		.rds_blckcnt		= NULL,
-		.phase_diversity	= NULL,
-		.phase_div_status	= NULL,
-		.acf_status		= si476x_core_cmd_am_acf_status,
-		.agc_status		= NULL,
-	};
-
-	switch (func) {
-	case SI476X_FUNC_FM_RECEIVER:
-		radio->ops = &fm_ops;
-		return 0;
-
-	case SI476X_FUNC_AM_RECEIVER:
-		radio->ops = &am_ops;
-		return 0;
-	default:
-		WARN(1, "Unexpected tuner function value\n");
-		return -EINVAL;
-	}
-}
-
-static int si476x_radio_pretune(struct si476x_radio *radio,
-				enum si476x_func func)
-{
-	int retval;
-
-	struct si476x_tune_freq_args args = {
-		.zifsr		= false,
-		.hd		= false,
-		.injside	= SI476X_INJSIDE_AUTO,
-		.tunemode	= SI476X_TM_VALIDATED_NORMAL_TUNE,
-		.smoothmetrics	= SI476X_SM_INITIALIZE_AUDIO,
-		.antcap		= 0,
-	};
-
-	switch (func) {
-	case SI476X_FUNC_FM_RECEIVER:
-		args.freq = v4l2_to_si476x(radio->core,
-					   92 * FREQ_MUL);
-		retval = radio->ops->tune_freq(radio->core, &args);
-		break;
-	case SI476X_FUNC_AM_RECEIVER:
-		args.freq = v4l2_to_si476x(radio->core,
-					   0.6 * FREQ_MUL);
-		retval = radio->ops->tune_freq(radio->core, &args);
-		break;
-	default:
-		WARN(1, "Unexpected tuner function value\n");
-		retval = -EINVAL;
-	}
-
-	return retval;
-}
-static int si476x_radio_do_post_powerup_init(struct si476x_radio *radio,
-					     enum si476x_func func)
-{
-	int err;
-
-	/* regcache_mark_dirty(radio->core->regmap); */
-	err = regcache_sync_region(radio->core->regmap,
-				   SI476X_PROP_DIGITAL_IO_INPUT_SAMPLE_RATE,
-				   SI476X_PROP_DIGITAL_IO_OUTPUT_FORMAT);
-	if (err < 0)
-		return err;
-
-	err = regcache_sync_region(radio->core->regmap,
-				   SI476X_PROP_AUDIO_DEEMPHASIS,
-				   SI476X_PROP_AUDIO_PWR_LINE_FILTER);
-	if (err < 0)
-		return err;
-
-	err = regcache_sync_region(radio->core->regmap,
-				   SI476X_PROP_INT_CTL_ENABLE,
-				   SI476X_PROP_INT_CTL_ENABLE);
-	if (err < 0)
-		return err;
-
-	/*
-	 * Is there any point in restoring SNR and the like
-	 * when switching between AM/FM?
-	 */
-	err = regcache_sync_region(radio->core->regmap,
-				   SI476X_PROP_VALID_MAX_TUNE_ERROR,
-				   SI476X_PROP_VALID_MAX_TUNE_ERROR);
-	if (err < 0)
-		return err;
-
-	err = regcache_sync_region(radio->core->regmap,
-				   SI476X_PROP_VALID_SNR_THRESHOLD,
-				   SI476X_PROP_VALID_RSSI_THRESHOLD);
-	if (err < 0)
-		return err;
-
-	if (func == SI476X_FUNC_FM_RECEIVER) {
-		if (si476x_core_has_diversity(radio->core)) {
-			err = si476x_core_cmd_fm_phase_diversity(radio->core,
-								 radio->core->diversity_mode);
-			if (err < 0)
-				return err;
-		}
-
-		err = regcache_sync_region(radio->core->regmap,
-					   SI476X_PROP_FM_RDS_INTERRUPT_SOURCE,
-					   SI476X_PROP_FM_RDS_CONFIG);
-		if (err < 0)
-			return err;
-	}
-
-	return si476x_radio_init_vtable(radio, func);
-
-}
-
-static int si476x_radio_change_func(struct si476x_radio *radio,
-				    enum si476x_func func)
-{
-	int err;
-	bool soft;
-	/*
-	 * Since power/up down is a very time consuming operation,
-	 * try to avoid doing it if the requested mode matches the one
-	 * the tuner is in
-	 */
-	if (func == radio->core->power_up_parameters.func)
-		return 0;
-
-	soft = true;
-	err = si476x_core_stop(radio->core, soft);
-	if (err < 0) {
-		/*
-		 * OK, if the chip does not want to play nice let's
-		 * try to reset it in more brutal way
-		 */
-		soft = false;
-		err = si476x_core_stop(radio->core, soft);
-		if (err < 0)
-			return err;
-	}
-	/*
-	  Set the desired radio tuner function
-	 */
-	radio->core->power_up_parameters.func = func;
-
-	err = si476x_core_start(radio->core, soft);
-	if (err < 0)
-		return err;
-
-	/*
-	 * No need to do the rest of manipulations for the bootlader
-	 * mode
-	 */
-	if (func != SI476X_FUNC_FM_RECEIVER &&
-	    func != SI476X_FUNC_AM_RECEIVER)
-		return err;
-
-	return si476x_radio_do_post_powerup_init(radio, func);
-}
-
-static int si476x_radio_g_frequency(struct file *file, void *priv,
-			      struct v4l2_frequency *f)
-{
-	int err;
-	struct si476x_radio *radio = video_drvdata(file);
-
-	if (f->tuner != 0 ||
-	    f->type  != V4L2_TUNER_RADIO)
-		return -EINVAL;
-
-	si476x_core_lock(radio->core);
-
-	if (radio->ops->rsq_status) {
-		struct si476x_rsq_status_report report;
-		struct si476x_rsq_status_args   args = {
-			.primary	= false,
-			.rsqack		= false,
-			.attune		= true,
-			.cancel		= false,
-			.stcack		= false,
-		};
-
-		err = radio->ops->rsq_status(radio->core, &args, &report);
-		if (!err)
-			f->frequency = si476x_to_v4l2(radio->core,
-						      report.readfreq);
-	} else {
-		err = -EINVAL;
-	}
-
-	si476x_core_unlock(radio->core);
-
-	return err;
-}
-
-static int si476x_radio_s_frequency(struct file *file, void *priv,
-				    const struct v4l2_frequency *f)
-{
-	int err;
-	u32 freq = f->frequency;
-	struct si476x_tune_freq_args args;
-	struct si476x_radio *radio = video_drvdata(file);
-
-	const u32 midrange = (si476x_bands[SI476X_BAND_AM].rangehigh +
-			      si476x_bands[SI476X_BAND_FM].rangelow) / 2;
-	const int band = (freq > midrange) ?
-		SI476X_BAND_FM : SI476X_BAND_AM;
-	const enum si476x_func func = (band == SI476X_BAND_AM) ?
-		SI476X_FUNC_AM_RECEIVER : SI476X_FUNC_FM_RECEIVER;
-
-	if (f->tuner != 0 ||
-	    f->type  != V4L2_TUNER_RADIO)
-		return -EINVAL;
-
-	si476x_core_lock(radio->core);
-
-	freq = clamp(freq,
-		     si476x_bands[band].rangelow,
-		     si476x_bands[band].rangehigh);
-
-	if (si476x_radio_freq_is_inside_of_the_band(freq,
-						    SI476X_BAND_AM) &&
-	    (!si476x_core_has_am(radio->core) ||
-	     si476x_core_is_a_secondary_tuner(radio->core))) {
-		err = -EINVAL;
-		goto unlock;
-	}
-
-	err = si476x_radio_change_func(radio, func);
-	if (err < 0)
-		goto unlock;
-
-	args.zifsr		= false;
-	args.hd			= false;
-	args.injside		= SI476X_INJSIDE_AUTO;
-	args.freq		= v4l2_to_si476x(radio->core, freq);
-	args.tunemode		= SI476X_TM_VALIDATED_NORMAL_TUNE;
-	args.smoothmetrics	= SI476X_SM_INITIALIZE_AUDIO;
-	args.antcap		= 0;
-
-	err = radio->ops->tune_freq(radio->core, &args);
-
-unlock:
-	si476x_core_unlock(radio->core);
-	return err;
-}
-
-static int si476x_radio_s_hw_freq_seek(struct file *file, void *priv,
-				       const struct v4l2_hw_freq_seek *seek)
-{
-	int err;
-	enum si476x_func func;
-	u32 rangelow = seek->rangelow, rangehigh = seek->rangehigh;
-	struct si476x_radio *radio = video_drvdata(file);
-
-	if (file->f_flags & O_NONBLOCK)
-		return -EAGAIN;
-
-	if (seek->tuner != 0 ||
-	    seek->type  != V4L2_TUNER_RADIO)
-		return -EINVAL;
-
-	si476x_core_lock(radio->core);
-
-	if (!rangelow) {
-		err = regmap_read(radio->core->regmap,
-				  SI476X_PROP_SEEK_BAND_BOTTOM,
-				  &rangelow);
-		if (err)
-			goto unlock;
-		rangelow = si476x_to_v4l2(radio->core, rangelow);
-	}
-	if (!rangehigh) {
-		err = regmap_read(radio->core->regmap,
-				  SI476X_PROP_SEEK_BAND_TOP,
-				  &rangehigh);
-		if (err)
-			goto unlock;
-		rangehigh = si476x_to_v4l2(radio->core, rangehigh);
-	}
-
-	if (rangelow > rangehigh) {
-		err = -EINVAL;
-		goto unlock;
-	}
-
-	if (si476x_radio_range_is_inside_of_the_band(rangelow, rangehigh,
-						     SI476X_BAND_FM)) {
-		func = SI476X_FUNC_FM_RECEIVER;
-
-	} else if (si476x_core_has_am(radio->core) &&
-		   si476x_radio_range_is_inside_of_the_band(rangelow, rangehigh,
-							    SI476X_BAND_AM)) {
-		func = SI476X_FUNC_AM_RECEIVER;
-	} else {
-		err = -EINVAL;
-		goto unlock;
-	}
-
-	err = si476x_radio_change_func(radio, func);
-	if (err < 0)
-		goto unlock;
-
-	if (seek->rangehigh) {
-		err = regmap_write(radio->core->regmap,
-				   SI476X_PROP_SEEK_BAND_TOP,
-				   v4l2_to_si476x(radio->core,
-						  seek->rangehigh));
-		if (err)
-			goto unlock;
-	}
-	if (seek->rangelow) {
-		err = regmap_write(radio->core->regmap,
-				   SI476X_PROP_SEEK_BAND_BOTTOM,
-				   v4l2_to_si476x(radio->core,
-						  seek->rangelow));
-		if (err)
-			goto unlock;
-	}
-	if (seek->spacing) {
-		err = regmap_write(radio->core->regmap,
-				     SI476X_PROP_SEEK_FREQUENCY_SPACING,
-				     v4l2_to_si476x(radio->core,
-						    seek->spacing));
-		if (err)
-			goto unlock;
-	}
-
-	err = radio->ops->seek_start(radio->core,
-				     seek->seek_upward,
-				     seek->wrap_around);
-unlock:
-	si476x_core_unlock(radio->core);
-
-
-
-	return err;
-}
-
-static int si476x_radio_g_volatile_ctrl(struct v4l2_ctrl *ctrl)
-{
-	int retval;
-	struct si476x_radio *radio = v4l2_ctrl_handler_to_radio(ctrl->handler);
-
-	si476x_core_lock(radio->core);
-
-	switch (ctrl->id) {
-	case V4L2_CID_SI476X_INTERCHIP_LINK:
-		if (si476x_core_has_diversity(radio->core)) {
-			if (radio->ops->phase_diversity) {
-				retval = radio->ops->phase_div_status(radio->core);
-				if (retval < 0)
-					break;
-
-				ctrl->val = !!SI476X_PHDIV_STATUS_LINK_LOCKED(retval);
-				retval = 0;
-				break;
-			} else {
-				retval = -ENOTTY;
-				break;
-			}
-		}
-		retval = -EINVAL;
-		break;
-	default:
-		retval = -EINVAL;
-		break;
-	}
-	si476x_core_unlock(radio->core);
-	return retval;
-
-}
-
-static int si476x_radio_s_ctrl(struct v4l2_ctrl *ctrl)
-{
-	int retval;
-	enum si476x_phase_diversity_mode mode;
-	struct si476x_radio *radio = v4l2_ctrl_handler_to_radio(ctrl->handler);
-
-	si476x_core_lock(radio->core);
-
-	switch (ctrl->id) {
-	case V4L2_CID_SI476X_HARMONICS_COUNT:
-		retval = regmap_update_bits(radio->core->regmap,
-					    SI476X_PROP_AUDIO_PWR_LINE_FILTER,
-					    SI476X_PROP_PWR_HARMONICS_MASK,
-					    ctrl->val);
-		break;
-	case V4L2_CID_POWER_LINE_FREQUENCY:
-		switch (ctrl->val) {
-		case V4L2_CID_POWER_LINE_FREQUENCY_DISABLED:
-			retval = regmap_update_bits(radio->core->regmap,
-						    SI476X_PROP_AUDIO_PWR_LINE_FILTER,
-						    SI476X_PROP_PWR_ENABLE_MASK,
-						    0);
-			break;
-		case V4L2_CID_POWER_LINE_FREQUENCY_50HZ:
-			retval = regmap_update_bits(radio->core->regmap,
-						    SI476X_PROP_AUDIO_PWR_LINE_FILTER,
-						    SI476X_PROP_PWR_GRID_MASK,
-						    SI476X_PROP_PWR_GRID_50HZ);
-			break;
-		case V4L2_CID_POWER_LINE_FREQUENCY_60HZ:
-			retval = regmap_update_bits(radio->core->regmap,
-						    SI476X_PROP_AUDIO_PWR_LINE_FILTER,
-						    SI476X_PROP_PWR_GRID_MASK,
-						    SI476X_PROP_PWR_GRID_60HZ);
-			break;
-		default:
-			retval = -EINVAL;
-			break;
-		}
-		break;
-	case V4L2_CID_SI476X_RSSI_THRESHOLD:
-		retval = regmap_write(radio->core->regmap,
-				      SI476X_PROP_VALID_RSSI_THRESHOLD,
-				      ctrl->val);
-		break;
-	case V4L2_CID_SI476X_SNR_THRESHOLD:
-		retval = regmap_write(radio->core->regmap,
-				      SI476X_PROP_VALID_SNR_THRESHOLD,
-				      ctrl->val);
-		break;
-	case V4L2_CID_SI476X_MAX_TUNE_ERROR:
-		retval = regmap_write(radio->core->regmap,
-				      SI476X_PROP_VALID_MAX_TUNE_ERROR,
-				      ctrl->val);
-		break;
-	case V4L2_CID_RDS_RECEPTION:
-		/*
-		 * It looks like RDS related properties are
-		 * inaccessible when tuner is in AM mode, so cache the
-		 * changes
-		 */
-		if (si476x_core_is_in_am_receiver_mode(radio->core))
-			regcache_cache_only(radio->core->regmap, true);
-
-		if (ctrl->val) {
-			retval = regmap_write(radio->core->regmap,
-					      SI476X_PROP_FM_RDS_INTERRUPT_FIFO_COUNT,
-					      radio->core->rds_fifo_depth);
-			if (retval < 0)
-				break;
-
-			if (radio->core->client->irq) {
-				retval = regmap_write(radio->core->regmap,
-						      SI476X_PROP_FM_RDS_INTERRUPT_SOURCE,
-						      SI476X_RDSRECV);
-				if (retval < 0)
-					break;
-			}
-
-			/* Drain RDS FIFO before enabling RDS processing */
-			retval = si476x_core_cmd_fm_rds_status(radio->core,
-							       false,
-							       true,
-							       true,
-							       NULL);
-			if (retval < 0)
-				break;
-
-			retval = regmap_update_bits(radio->core->regmap,
-						    SI476X_PROP_FM_RDS_CONFIG,
-						    SI476X_PROP_RDSEN_MASK,
-						    SI476X_PROP_RDSEN);
-		} else {
-			retval = regmap_update_bits(radio->core->regmap,
-						    SI476X_PROP_FM_RDS_CONFIG,
-						    SI476X_PROP_RDSEN_MASK,
-						    !SI476X_PROP_RDSEN);
-		}
-
-		if (si476x_core_is_in_am_receiver_mode(radio->core))
-			regcache_cache_only(radio->core->regmap, false);
-		break;
-	case V4L2_CID_TUNE_DEEMPHASIS:
-		retval = regmap_write(radio->core->regmap,
-				      SI476X_PROP_AUDIO_DEEMPHASIS,
-				      ctrl->val);
-		break;
-
-	case V4L2_CID_SI476X_DIVERSITY_MODE:
-		mode = si476x_phase_diversity_idx_to_mode(ctrl->val);
-
-		if (mode == radio->core->diversity_mode) {
-			retval = 0;
-			break;
-		}
-
-		if (si476x_core_is_in_am_receiver_mode(radio->core)) {
-			/*
-			 * Diversity cannot be configured while tuner
-			 * is in AM mode so save the changes and carry on.
-			 */
-			radio->core->diversity_mode = mode;
-			retval = 0;
-		} else {
-			retval = radio->ops->phase_diversity(radio->core, mode);
-			if (!retval)
-				radio->core->diversity_mode = mode;
-		}
-		break;
-
-	default:
-		retval = -EINVAL;
-		break;
-	}
-
-	si476x_core_unlock(radio->core);
-
-	return retval;
-}
-
-#ifdef CONFIG_VIDEO_ADV_DEBUG
-static int si476x_radio_g_register(struct file *file, void *fh,
-				   struct v4l2_dbg_register *reg)
-{
-	int err;
-	unsigned int value;
-	struct si476x_radio *radio = video_drvdata(file);
-
-	si476x_core_lock(radio->core);
-	reg->size = 2;
-	err = regmap_read(radio->core->regmap,
-			  (unsigned int)reg->reg, &value);
-	reg->val = value;
-	si476x_core_unlock(radio->core);
-
-	return err;
-}
-static int si476x_radio_s_register(struct file *file, void *fh,
-				   const struct v4l2_dbg_register *reg)
-{
-
-	int err;
-	struct si476x_radio *radio = video_drvdata(file);
-
-	si476x_core_lock(radio->core);
-	err = regmap_write(radio->core->regmap,
-			   (unsigned int)reg->reg,
-			   (unsigned int)reg->val);
-	si476x_core_unlock(radio->core);
-
-	return err;
-}
-#endif
-
-static int si476x_radio_fops_open(struct file *file)
-{
-	struct si476x_radio *radio = video_drvdata(file);
-	int err;
-
-	err = v4l2_fh_open(file);
-	if (err)
-		return err;
-
-	if (v4l2_fh_is_singular_file(file)) {
-		si476x_core_lock(radio->core);
-		err = si476x_core_set_power_state(radio->core,
-						  SI476X_POWER_UP_FULL);
-		if (err < 0)
-			goto done;
-
-		err = si476x_radio_do_post_powerup_init(radio,
-							radio->core->power_up_parameters.func);
-		if (err < 0)
-			goto power_down;
-
-		err = si476x_radio_pretune(radio,
-					   radio->core->power_up_parameters.func);
-		if (err < 0)
-			goto power_down;
-
-		si476x_core_unlock(radio->core);
-		/*Must be done after si476x_core_unlock to prevent a deadlock*/
-		v4l2_ctrl_handler_setup(&radio->ctrl_handler);
-	}
-
-	return err;
-
-power_down:
-	si476x_core_set_power_state(radio->core,
-				    SI476X_POWER_DOWN);
-done:
-	si476x_core_unlock(radio->core);
-	v4l2_fh_release(file);
-
-	return err;
-}
-
-static int si476x_radio_fops_release(struct file *file)
-{
-	struct si476x_radio *radio = video_drvdata(file);
-
-	if (v4l2_fh_is_singular_file(file) &&
-	    atomic_read(&radio->core->is_alive))
-		si476x_core_set_power_state(radio->core,
-					    SI476X_POWER_DOWN);
-
-	return v4l2_fh_release(file);
-}
-
-static ssize_t si476x_radio_fops_read(struct file *file, char __user *buf,
-				      size_t count, loff_t *ppos)
-{
-	ssize_t      rval;
-	size_t       fifo_len;
-	unsigned int copied;
-
-	struct si476x_radio *radio = video_drvdata(file);
-
-	/* block if no new data available */
-	if (kfifo_is_empty(&radio->core->rds_fifo)) {
-		if (file->f_flags & O_NONBLOCK)
-			return -EWOULDBLOCK;
-
-		rval = wait_event_interruptible(radio->core->rds_read_queue,
-						(!kfifo_is_empty(&radio->core->rds_fifo) ||
-						 !atomic_read(&radio->core->is_alive)));
-		if (rval < 0)
-			return -EINTR;
-
-		if (!atomic_read(&radio->core->is_alive))
-			return -ENODEV;
-	}
-
-	fifo_len = kfifo_len(&radio->core->rds_fifo);
-
-	if (kfifo_to_user(&radio->core->rds_fifo, buf,
-			  min(fifo_len, count),
-			  &copied) != 0) {
-		dev_warn(&radio->videodev.dev,
-			 "Error during FIFO to userspace copy\n");
-		rval = -EIO;
-	} else {
-		rval = (ssize_t)copied;
-	}
-
-	return rval;
-}
-
-static __poll_t si476x_radio_fops_poll(struct file *file,
-				struct poll_table_struct *pts)
-{
-	struct si476x_radio *radio = video_drvdata(file);
-	__poll_t req_events = poll_requested_events(pts);
-	__poll_t err = v4l2_ctrl_poll(file, pts);
-
-	if (req_events & (EPOLLIN | EPOLLRDNORM)) {
-		if (atomic_read(&radio->core->is_alive))
-			poll_wait(file, &radio->core->rds_read_queue, pts);
-
-		if (!atomic_read(&radio->core->is_alive))
-			err = EPOLLHUP;
-
-		if (!kfifo_is_empty(&radio->core->rds_fifo))
-			err = EPOLLIN | EPOLLRDNORM;
-	}
-
-	return err;
-}
-
-static const struct v4l2_file_operations si476x_fops = {
-	.owner			= THIS_MODULE,
-	.read			= si476x_radio_fops_read,
-	.poll			= si476x_radio_fops_poll,
-	.unlocked_ioctl		= video_ioctl2,
-	.open			= si476x_radio_fops_open,
-	.release		= si476x_radio_fops_release,
-};
-
-
-static const struct v4l2_ioctl_ops si4761_ioctl_ops = {
-	.vidioc_querycap		= si476x_radio_querycap,
-	.vidioc_g_tuner			= si476x_radio_g_tuner,
-	.vidioc_s_tuner			= si476x_radio_s_tuner,
-
-	.vidioc_g_frequency		= si476x_radio_g_frequency,
-	.vidioc_s_frequency		= si476x_radio_s_frequency,
-	.vidioc_s_hw_freq_seek		= si476x_radio_s_hw_freq_seek,
-	.vidioc_enum_freq_bands		= si476x_radio_enum_freq_bands,
-
-	.vidioc_subscribe_event		= v4l2_ctrl_subscribe_event,
-	.vidioc_unsubscribe_event	= v4l2_event_unsubscribe,
-
-#ifdef CONFIG_VIDEO_ADV_DEBUG
-	.vidioc_g_register		= si476x_radio_g_register,
-	.vidioc_s_register		= si476x_radio_s_register,
-#endif
-};
-
-
-static const struct video_device si476x_viddev_template = {
-	.fops			= &si476x_fops,
-	.name			= DRIVER_NAME,
-	.release		= video_device_release_empty,
-};
-
-
-
-static ssize_t si476x_radio_read_acf_blob(struct file *file,
-					  char __user *user_buf,
-					  size_t count, loff_t *ppos)
-{
-	int err;
-	struct si476x_radio *radio = file->private_data;
-	struct si476x_acf_status_report report;
-
-	si476x_core_lock(radio->core);
-	if (radio->ops->acf_status)
-		err = radio->ops->acf_status(radio->core, &report);
-	else
-		err = -ENOENT;
-	si476x_core_unlock(radio->core);
-
-	if (err < 0)
-		return err;
-
-	return simple_read_from_buffer(user_buf, count, ppos, &report,
-				       sizeof(report));
-}
-
-static const struct file_operations radio_acf_fops = {
-	.open	= simple_open,
-	.llseek = default_llseek,
-	.read	= si476x_radio_read_acf_blob,
-};
-
-static ssize_t si476x_radio_read_rds_blckcnt_blob(struct file *file,
-						  char __user *user_buf,
-						  size_t count, loff_t *ppos)
-{
-	int err;
-	struct si476x_radio *radio = file->private_data;
-	struct si476x_rds_blockcount_report report;
-
-	si476x_core_lock(radio->core);
-	if (radio->ops->rds_blckcnt)
-		err = radio->ops->rds_blckcnt(radio->core, true,
-					       &report);
-	else
-		err = -ENOENT;
-	si476x_core_unlock(radio->core);
-
-	if (err < 0)
-		return err;
-
-	return simple_read_from_buffer(user_buf, count, ppos, &report,
-				       sizeof(report));
-}
-
-static const struct file_operations radio_rds_blckcnt_fops = {
-	.open	= simple_open,
-	.llseek = default_llseek,
-	.read	= si476x_radio_read_rds_blckcnt_blob,
-};
-
-static ssize_t si476x_radio_read_agc_blob(struct file *file,
-					  char __user *user_buf,
-					  size_t count, loff_t *ppos)
-{
-	int err;
-	struct si476x_radio *radio = file->private_data;
-	struct si476x_agc_status_report report;
-
-	si476x_core_lock(radio->core);
-	if (radio->ops->rds_blckcnt)
-		err = radio->ops->agc_status(radio->core, &report);
-	else
-		err = -ENOENT;
-	si476x_core_unlock(radio->core);
-
-	if (err < 0)
-		return err;
-
-	return simple_read_from_buffer(user_buf, count, ppos, &report,
-				       sizeof(report));
-}
-
-static const struct file_operations radio_agc_fops = {
-	.open	= simple_open,
-	.llseek = default_llseek,
-	.read	= si476x_radio_read_agc_blob,
-};
-
-static ssize_t si476x_radio_read_rsq_blob(struct file *file,
-					  char __user *user_buf,
-					  size_t count, loff_t *ppos)
-{
-	int err;
-	struct si476x_radio *radio = file->private_data;
-	struct si476x_rsq_status_report report;
-	struct si476x_rsq_status_args args = {
-		.primary	= false,
-		.rsqack		= false,
-		.attune		= false,
-		.cancel		= false,
-		.stcack		= false,
-	};
-
-	si476x_core_lock(radio->core);
-	if (radio->ops->rds_blckcnt)
-		err = radio->ops->rsq_status(radio->core, &args, &report);
-	else
-		err = -ENOENT;
-	si476x_core_unlock(radio->core);
-
-	if (err < 0)
-		return err;
-
-	return simple_read_from_buffer(user_buf, count, ppos, &report,
-				       sizeof(report));
-}
-
-static const struct file_operations radio_rsq_fops = {
-	.open	= simple_open,
-	.llseek = default_llseek,
-	.read	= si476x_radio_read_rsq_blob,
-};
-
-static ssize_t si476x_radio_read_rsq_primary_blob(struct file *file,
-						  char __user *user_buf,
-						  size_t count, loff_t *ppos)
-{
-	int err;
-	struct si476x_radio *radio = file->private_data;
-	struct si476x_rsq_status_report report;
-	struct si476x_rsq_status_args args = {
-		.primary	= true,
-		.rsqack		= false,
-		.attune		= false,
-		.cancel		= false,
-		.stcack		= false,
-	};
-
-	si476x_core_lock(radio->core);
-	if (radio->ops->rds_blckcnt)
-		err = radio->ops->rsq_status(radio->core, &args, &report);
-	else
-		err = -ENOENT;
-	si476x_core_unlock(radio->core);
-
-	if (err < 0)
-		return err;
-
-	return simple_read_from_buffer(user_buf, count, ppos, &report,
-				       sizeof(report));
-}
-
-static const struct file_operations radio_rsq_primary_fops = {
-	.open	= simple_open,
-	.llseek = default_llseek,
-	.read	= si476x_radio_read_rsq_primary_blob,
-};
-
-
-static void si476x_radio_init_debugfs(struct si476x_radio *radio)
-{
-	radio->debugfs = debugfs_create_dir(dev_name(radio->v4l2dev.dev), NULL);
-
-	debugfs_create_file("acf", S_IRUGO, radio->debugfs, radio,
-			    &radio_acf_fops);
-
-	debugfs_create_file("rds_blckcnt", S_IRUGO, radio->debugfs, radio,
-			    &radio_rds_blckcnt_fops);
-
-	debugfs_create_file("agc", S_IRUGO, radio->debugfs, radio,
-			    &radio_agc_fops);
-
-	debugfs_create_file("rsq", S_IRUGO, radio->debugfs, radio,
-			    &radio_rsq_fops);
-
-	debugfs_create_file("rsq_primary", S_IRUGO, radio->debugfs, radio,
-			    &radio_rsq_primary_fops);
-}
-
-
-static int si476x_radio_add_new_custom(struct si476x_radio *radio,
-				       enum si476x_ctrl_idx idx)
-{
-	int rval;
-	struct v4l2_ctrl *ctrl;
-
-	ctrl = v4l2_ctrl_new_custom(&radio->ctrl_handler,
-				    &si476x_ctrls[idx],
-				    NULL);
-	rval = radio->ctrl_handler.error;
-	if (ctrl == NULL && rval)
-		dev_err(radio->v4l2dev.dev,
-			"Could not initialize '%s' control %d\n",
-			si476x_ctrls[idx].name, rval);
-
-	return rval;
-}
-
-static int si476x_radio_probe(struct platform_device *pdev)
-{
-	int rval;
-	struct si476x_radio *radio;
-	struct v4l2_ctrl *ctrl;
-
-	static atomic_t instance = ATOMIC_INIT(0);
-
-	radio = devm_kzalloc(&pdev->dev, sizeof(*radio), GFP_KERNEL);
-	if (!radio)
-		return -ENOMEM;
-
-	radio->core = i2c_mfd_cell_to_core(&pdev->dev);
-
-	v4l2_device_set_name(&radio->v4l2dev, DRIVER_NAME, &instance);
-
-	rval = v4l2_device_register(&pdev->dev, &radio->v4l2dev);
-	if (rval) {
-		dev_err(&pdev->dev, "Cannot register v4l2_device.\n");
-		return rval;
-	}
-
-	memcpy(&radio->videodev, &si476x_viddev_template,
-	       sizeof(struct video_device));
-
-	radio->videodev.v4l2_dev  = &radio->v4l2dev;
-	radio->videodev.ioctl_ops = &si4761_ioctl_ops;
-	radio->videodev.device_caps = V4L2_CAP_TUNER | V4L2_CAP_RADIO |
-				      V4L2_CAP_HW_FREQ_SEEK;
-
-	si476x_core_lock(radio->core);
-	if (!si476x_core_is_a_secondary_tuner(radio->core))
-		radio->videodev.device_caps |= V4L2_CAP_RDS_CAPTURE |
-					       V4L2_CAP_READWRITE;
-	si476x_core_unlock(radio->core);
-
-	video_set_drvdata(&radio->videodev, radio);
-	platform_set_drvdata(pdev, radio);
-
-
-	radio->v4l2dev.ctrl_handler = &radio->ctrl_handler;
-	v4l2_ctrl_handler_init(&radio->ctrl_handler,
-			       1 + ARRAY_SIZE(si476x_ctrls));
-
-	if (si476x_core_has_am(radio->core)) {
-		ctrl = v4l2_ctrl_new_std_menu(&radio->ctrl_handler,
-					      &si476x_ctrl_ops,
-					      V4L2_CID_POWER_LINE_FREQUENCY,
-					      V4L2_CID_POWER_LINE_FREQUENCY_60HZ,
-					      0, 0);
-		rval = radio->ctrl_handler.error;
-		if (ctrl == NULL && rval) {
-			dev_err(&pdev->dev, "Could not initialize V4L2_CID_POWER_LINE_FREQUENCY control %d\n",
-				rval);
-			goto exit;
-		}
-
-		rval = si476x_radio_add_new_custom(radio,
-						   SI476X_IDX_HARMONICS_COUNT);
-		if (rval < 0)
-			goto exit;
-	}
-
-	rval = si476x_radio_add_new_custom(radio, SI476X_IDX_RSSI_THRESHOLD);
-	if (rval < 0)
-		goto exit;
-
-	rval = si476x_radio_add_new_custom(radio, SI476X_IDX_SNR_THRESHOLD);
-	if (rval < 0)
-		goto exit;
-
-	rval = si476x_radio_add_new_custom(radio, SI476X_IDX_MAX_TUNE_ERROR);
-	if (rval < 0)
-		goto exit;
-
-	ctrl = v4l2_ctrl_new_std_menu(&radio->ctrl_handler,
-				      &si476x_ctrl_ops,
-				      V4L2_CID_TUNE_DEEMPHASIS,
-				      V4L2_DEEMPHASIS_75_uS, 0, 0);
-	rval = radio->ctrl_handler.error;
-	if (ctrl == NULL && rval) {
-		dev_err(&pdev->dev, "Could not initialize V4L2_CID_TUNE_DEEMPHASIS control %d\n",
-			rval);
-		goto exit;
-	}
-
-	ctrl = v4l2_ctrl_new_std(&radio->ctrl_handler, &si476x_ctrl_ops,
-				 V4L2_CID_RDS_RECEPTION,
-				 0, 1, 1, 1);
-	rval = radio->ctrl_handler.error;
-	if (ctrl == NULL && rval) {
-		dev_err(&pdev->dev, "Could not initialize V4L2_CID_RDS_RECEPTION control %d\n",
-			rval);
-		goto exit;
-	}
-
-	if (si476x_core_has_diversity(radio->core)) {
-		si476x_ctrls[SI476X_IDX_DIVERSITY_MODE].def =
-			si476x_phase_diversity_mode_to_idx(radio->core->diversity_mode);
-		rval = si476x_radio_add_new_custom(radio, SI476X_IDX_DIVERSITY_MODE);
-		if (rval < 0)
-			goto exit;
-
-		rval = si476x_radio_add_new_custom(radio, SI476X_IDX_INTERCHIP_LINK);
-		if (rval < 0)
-			goto exit;
-	}
-
-	/* register video device */
-	rval = video_register_device(&radio->videodev, VFL_TYPE_RADIO, -1);
-	if (rval < 0) {
-		dev_err(&pdev->dev, "Could not register video device\n");
-		goto exit;
-	}
-
-	si476x_radio_init_debugfs(radio);
-
-	return 0;
-exit:
-	v4l2_ctrl_handler_free(radio->videodev.ctrl_handler);
-	v4l2_device_unregister(&radio->v4l2dev);
-	return rval;
-}
-
-static void si476x_radio_remove(struct platform_device *pdev)
-{
-	struct si476x_radio *radio = platform_get_drvdata(pdev);
-
-	v4l2_ctrl_handler_free(radio->videodev.ctrl_handler);
-	video_unregister_device(&radio->videodev);
-	v4l2_device_unregister(&radio->v4l2dev);
-	debugfs_remove_recursive(radio->debugfs);
-}
-
-MODULE_ALIAS("platform:si476x-radio");
-
-static struct platform_driver si476x_radio_driver = {
-	.driver		= {
-		.name	= DRIVER_NAME,
-	},
-	.probe		= si476x_radio_probe,
-	.remove		= si476x_radio_remove,
-};
-module_platform_driver(si476x_radio_driver);
-
-MODULE_AUTHOR("Andrey Smirnov <andrew.smirnov@gmail.com>");
-MODULE_DESCRIPTION("Driver for Si4761/64/68 AM/FM Radio MFD Cell");
-MODULE_LICENSE("GPL");