Revert "iio: adc: add STMPE ADC driver using IIO framework"

This reverts commit 8a0cc368e527f1e977c2852aaa67b8d4c974a551.
In preparation to add the mainline version.

Signed-off-by: Philippe Schenker <philippe.schenker@toradex.com>

4 files changed, 1 insertions, 421 deletions

diff --git a/drivers/mfd/Kconfig b/drivers/mfd/Kconfig
index e5d22b6976a7..07ab86a3a318 100644
--- a/drivers/mfd/Kconfig
+++ b/drivers/mfd/Kconfig
@@ -1065,7 +1065,7 @@ config MFD_STMPE
 
 	  Currently supported devices are:
 
-		STMPE811: GPIO, Touchscreen, ADC
+		STMPE811: GPIO, Touchscreen
 		STMPE1601: GPIO, Keypad
 		STMPE1801: GPIO, Keypad
 		STMPE2401: GPIO, Keypad
@@ -1078,7 +1078,6 @@ config MFD_STMPE
 		GPIO: stmpe-gpio
 		Keypad: stmpe-keypad
 		Touchscreen: stmpe-ts
-		ADC: stmpe-adc
 
 menu "STMicroelectronics STMPE Interface Drivers"
 depends on MFD_STMPE
diff --git a/drivers/staging/iio/adc/Kconfig b/drivers/staging/iio/adc/Kconfig
index bd89fe530bb5..deff89973d53 100644
--- a/drivers/staging/iio/adc/Kconfig
+++ b/drivers/staging/iio/adc/Kconfig
@@ -102,11 +102,4 @@ config SPEAR_ADC
 
 	  To compile this driver as a module, choose M here: the
 	  module will be called spear_adc.
-
-config STMPE_ADC
-	bool "ST Microelectronics STMPE ADC driver"
-	depends on MFD_STMPE
-	help
-	  Say yes here to build support for ST Microelectronics STMPE
-	  built in ADC block (stmpe811).
 endmenu
diff --git a/drivers/staging/iio/adc/Makefile b/drivers/staging/iio/adc/Makefile
index 0102ee5bed7f..3cdd83ccec8e 100644
--- a/drivers/staging/iio/adc/Makefile
+++ b/drivers/staging/iio/adc/Makefile
@@ -13,4 +13,3 @@ obj-$(CONFIG_AD7192) += ad7192.o
 obj-$(CONFIG_AD7280) += ad7280a.o
 obj-$(CONFIG_LPC32XX_ADC) += lpc32xx_adc.o
 obj-$(CONFIG_SPEAR_ADC) += spear_adc.o
-obj-$(CONFIG_STMPE_ADC) += stmpe-adc.o
diff --git a/drivers/staging/iio/adc/stmpe-adc.c b/drivers/staging/iio/adc/stmpe-adc.c
deleted file mode 100644
index 2918b16d98e8..000000000000
--- a/drivers/staging/iio/adc/stmpe-adc.c
+++ /dev/null
@@ -1,411 +0,0 @@
-/*
- *  stmpe.c - STMicroelectronics STMPE811 IIO ADC Driver
- *
- *  4 channel, 10/12-bit ADC
- *
- *  Copyright (C) 2013 Toradex AG <stefan.agner@toradex.com>
- *
- *  This program is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 2 of the License, or
- *  (at your option) any later version.
- *
- *  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., 675 Mass Ave, Cambridge, MA 02139, USA.
- */
-
-#include <linux/clk.h>
-#include <linux/completion.h>
-#include <linux/delay.h>
-#include <linux/err.h>
-#include <linux/iio/events.h>
-#include <linux/iio/iio.h>
-#include <linux/iio/sysfs.h>
-#include <linux/interrupt.h>
-#include <linux/io.h>
-#include <linux/kernel.h>
-#include <linux/mfd/stmpe.h>
-#include <linux/module.h>
-#include <linux/of_platform.h>
-#include <linux/platform_device.h>
-#include <linux/regulator/consumer.h>
-#include <linux/slab.h>
-
-#define STMPE_REG_INT_STA	0x0B
-#define STMPE_REG_ADC_INT_EN	0x0E
-#define STMPE_REG_ADC_INT_STA	0x0F
-
-#define STMPE_REG_ADC_CTRL1	0x20
-#define STMPE_REG_ADC_CTRL2	0x21
-#define STMPE_REG_ADC_CAPT	0x22
-#define STMPE_REG_ADC_DATA_CH(channel)	(0x30 + 2*channel)
-
-#define STMPE_REG_TEMP_CTRL	0x60
-#define STMPE_START_ONE_TEMP_CONV (0x08 + 0x02 + 0x01)
-#define STMPE_REG_TEMP_DATA	0x61
-#define STMPE_REG_TEMP_TH	0x63
-
-#define	STMPE_ADC_CH(channel)	((1 << channel) & 0xff)
-
-#define STMPE_ADC_TIMEOUT	(msecs_to_jiffies(1000))
-
-struct stmpe_adc {
-	struct stmpe *stmpe;
-	struct clk		*clk;
-	struct device		*dev;
-	unsigned int		irq;
-
-	struct completion	completion;
-
-	u8			channel;
-	u32			value;
-	u8			sample_time;
-	u8			mod_12b;
-	u8			ref_sel;
-	u8			adc_freq;
-};
-
-static int stmpe_read_raw(struct iio_dev *indio_dev,
-				struct iio_chan_spec const *chan,
-				int *val,
-				int *val2,
-				long mask)
-{
-	struct stmpe_adc *info = iio_priv(indio_dev);
-	long ret;
-
-	switch (mask) {
-	case IIO_CHAN_INFO_RAW:
-	case IIO_CHAN_INFO_PROCESSED:
-
-		mutex_lock(&indio_dev->mlock);
-
-		info->channel = (u8)chan->channel;
-
-		switch (chan->type)
-		{
-		case IIO_VOLTAGE:
-			BUG_ON(info->channel > 7);
-			stmpe_reg_write(info->stmpe, STMPE_REG_ADC_INT_EN,
-					STMPE_ADC_CH(info->channel));
-
-			stmpe_reg_write(info->stmpe, STMPE_REG_ADC_CAPT,
-					STMPE_ADC_CH(info->channel));
-
-			*val = info->value;
-			break;
-
-		case IIO_TEMP:
-			BUG_ON(info->channel != 8);
-			stmpe_reg_write(info->stmpe, STMPE_REG_TEMP_CTRL,
-					STMPE_START_ONE_TEMP_CONV);
-			break;
-		default:
-			mutex_unlock(&indio_dev->mlock);
-			return -EINVAL;
-		}
-
-		ret = wait_for_completion_interruptible_timeout
-			(&info->completion, STMPE_ADC_TIMEOUT);
-
-		if (ret == 0) {
-			mutex_unlock(&indio_dev->mlock);
-			return -ETIMEDOUT;
-		}
-		if (ret < 0) {
-			mutex_unlock(&indio_dev->mlock);
-			return ret;
-		}
-
-		switch (chan->type)
-		{
-		case IIO_VOLTAGE:
-			*val = info->value;
-			break;
-
-		case IIO_TEMP:
-			/* absolute temp = +V3.3 * value /7.51 [K] */
-			/* scale to [milli °C] */
-			*val = ((449960l * info->value) / 1024l) - 273150;
-			break;
-		default:
-			break;
-		}
-
-		mutex_unlock(&indio_dev->mlock);
-		return IIO_VAL_INT;
-
-	case IIO_CHAN_INFO_SCALE:
-		*val = 3300;
-		*val2 = info->mod_12b ? 12 : 10;
-		return IIO_VAL_FRACTIONAL_LOG2;
-
-	default:
-		break;
-	}
-
-	return -EINVAL;
-}
-
-static irqreturn_t stmpe_adc_isr(int irq, void *dev_id)
-{
-	struct stmpe_adc *info = (struct stmpe_adc *)dev_id;
-	u8 data[2];
-	int int_sta;
-
-	if(info->channel < 8) {
-		int_sta = stmpe_reg_read(info->stmpe, STMPE_REG_ADC_INT_STA);
-
-		/* Is the interrupt relevant */
-		if (!(int_sta & STMPE_ADC_CH(info->channel)))
-			return IRQ_NONE;
-
-		/* Read value */
-		stmpe_block_read(info->stmpe,
-			STMPE_REG_ADC_DATA_CH(info->channel), 2, data);
-		info->value = ((u32)data[0] << 8) + data[1];
-
-		stmpe_reg_write(info->stmpe, STMPE_REG_ADC_INT_STA, int_sta);
-
-		complete(&info->completion);
-	} else if (info->channel == 8) {
-		/* Read value */
-		stmpe_block_read(info->stmpe, STMPE_REG_TEMP_DATA, 2, data);
-		info->value = ((u32)data[0] << 8) + data[1];
-
-		complete(&info->completion);
-	} else
-		return IRQ_NONE;
-
-	return IRQ_HANDLED;
-}
-
-static const struct iio_info stmpe_adc_iio_info = {
-	.read_raw = &stmpe_read_raw,
-	.driver_module = THIS_MODULE,
-};
-
-#define STMPE_VOLTAGE_CHAN(_chan)					\
-{									\
-	.type = IIO_VOLTAGE,						\
-	.info_mask_separate = BIT(IIO_CHAN_INFO_RAW),			\
-	.info_mask_shared_by_type = BIT(IIO_CHAN_INFO_SCALE),		\
-	.indexed = 1,							\
-	.channel = _chan,						\
-}
-
-#define STMPE_TEMP_CHAN(_chan)						\
-{									\
-	.type = IIO_TEMP,						\
-	.info_mask_separate = BIT(IIO_CHAN_INFO_PROCESSED),		\
-	.indexed = 1,							\
-	.channel = _chan,						\
-}
-
-static const struct iio_chan_spec stmpe_adc_all_iio_channels[] = {
-	STMPE_VOLTAGE_CHAN(0),
-	STMPE_VOLTAGE_CHAN(1),
-	STMPE_VOLTAGE_CHAN(2),
-	STMPE_VOLTAGE_CHAN(3),
-	STMPE_VOLTAGE_CHAN(4),
-	STMPE_VOLTAGE_CHAN(5),
-	STMPE_VOLTAGE_CHAN(6),
-	STMPE_VOLTAGE_CHAN(7),
-	STMPE_TEMP_CHAN(8),
-};
-
-static const struct iio_chan_spec stmpe_adc_iio_channels[] = {
-	STMPE_VOLTAGE_CHAN(4),
-	STMPE_VOLTAGE_CHAN(5),
-	STMPE_VOLTAGE_CHAN(6),
-	STMPE_VOLTAGE_CHAN(7),
-	STMPE_TEMP_CHAN(8),
-};
-
-static int stmpe_adc_init_hw(struct stmpe_adc *adc)
-{
-	int ret;
-	u8 adc_ctrl1, adc_ctrl1_mask;
-	struct stmpe *stmpe = adc->stmpe;
-	struct device *dev = adc->dev;
-
-	ret = stmpe_enable(stmpe, STMPE_BLOCK_ADC);
-	if (ret) {
-		dev_err(dev, "Could not enable clock for ADC\n");
-		return ret;
-	}
-
-	adc_ctrl1 = SAMPLE_TIME(adc->sample_time) | MOD_12B(adc->mod_12b) |
-		REF_SEL(adc->ref_sel);
-	adc_ctrl1_mask = SAMPLE_TIME(0xff) | MOD_12B(0xff) | REF_SEL(0xff);
-
-	ret = stmpe_set_bits(stmpe, STMPE_REG_ADC_CTRL1,
-			adc_ctrl1_mask, adc_ctrl1);
-	if (ret) {
-		dev_err(dev, "Could not setup ADC\n");
-		return ret;
-	}
-
-	ret = stmpe_set_bits(stmpe, STMPE_REG_ADC_CTRL2,
-			ADC_FREQ(0xff), ADC_FREQ(adc->adc_freq));
-	if (ret) {
-		dev_err(dev, "Could not setup ADC\n");
-		return ret;
-	}
-
-	/* use temp irq for each conversion completion */
-	stmpe_reg_write(stmpe, STMPE_REG_TEMP_TH, 0);
-	stmpe_reg_write(stmpe, STMPE_REG_TEMP_TH + 1, 0);
-
-	return 0;
-}
-
-static void stmpe_adc_get_platform_info(struct platform_device *pdev,
-					struct stmpe_adc *adc)
-{
-	struct stmpe *stmpe = dev_get_drvdata(pdev->dev.parent);
-	struct device_node *np = pdev->dev.of_node;
-	u32 val;
-
-	adc->stmpe = stmpe;
-
-	if (!np) {
-		dev_err(&pdev->dev, "no device tree node found\n");
-		return;
-	}
-
-	if (!of_property_read_u32(np, "st,sample-time", &val))
-		adc->sample_time = val;
-	if (!of_property_read_u32(np, "st,mod-12b", &val))
-		adc->mod_12b = val;
-	if (!of_property_read_u32(np, "st,ref-sel", &val))
-		adc->ref_sel = val;
-	if (!of_property_read_u32(np, "st,adc-freq", &val))
-		adc->adc_freq = val;
-}
-
-static int stmpe_adc_probe(struct platform_device *pdev)
-{
-	struct stmpe *stmpe = dev_get_drvdata(pdev->dev.parent);
-	struct stmpe_adc *info = NULL;
-	struct iio_dev *indio_dev = NULL;
-	int ret = -ENODEV;
-	int irq;
-
-	irq = platform_get_irq_byname(pdev, "STMPE_ADC");
-	if (irq < 0)
-		return irq;
-
-	indio_dev = iio_device_alloc(sizeof(struct stmpe_adc));
-	if (!indio_dev) {
-		dev_err(&pdev->dev, "failed allocating iio device\n");
-		return -ENOMEM;
-	}
-
-	info = iio_priv(indio_dev);
-	info->irq = irq;
-
-	init_completion(&info->completion);
-	ret = request_threaded_irq(info->irq, NULL, stmpe_adc_isr, IRQF_ONESHOT,
-					"stmpe-adc", info);
-	if (ret < 0) {
-		dev_err(&pdev->dev, "failed requesting irq, irq = %d\n",
-							info->irq);
-		goto err_free;
-	}
-
-	irq = platform_get_irq_byname(pdev, "STMPE_TEMP_SENS");
-	ret = -1;
-	if (irq >= 0)
-		ret = request_threaded_irq(irq, NULL, stmpe_adc_isr, IRQF_ONESHOT,
-	                                        "stmpe-adc", info);
-        if (ret < 0)
-		dev_warn(&pdev->dev, "failed requesting irq for temp sensor, irq = %d\n",
-			info->irq);
-
-	platform_set_drvdata(pdev, indio_dev);
-
-	indio_dev->name = dev_name(&pdev->dev);
-	indio_dev->dev.parent = &pdev->dev;
-	indio_dev->info = &stmpe_adc_iio_info;
-	indio_dev->modes = INDIO_DIRECT_MODE;
-
-	/* Register TS-Channels only if they are available */
-	if (stmpe->blocks & STMPE_BLOCK_TOUCHSCREEN) {
-		indio_dev->channels = stmpe_adc_iio_channels;
-		indio_dev->num_channels = ARRAY_SIZE(stmpe_adc_iio_channels);
-	} else {
-		indio_dev->channels = stmpe_adc_all_iio_channels;
-		indio_dev->num_channels = ARRAY_SIZE(stmpe_adc_all_iio_channels);
-	}
-
-	stmpe_adc_get_platform_info(pdev, info);
-
-	ret = stmpe_adc_init_hw(info);
-	if (ret)
-		goto err_irq;
-
-	ret = iio_device_register(indio_dev);
-	if (ret)
-		goto err_irq;
-
-
-	dev_info(&pdev->dev, "Initialized\n");
-
-	return 0;
-
-err_irq:
-	free_irq(info->irq, info);
-err_free:
-	kfree(indio_dev);
-	return ret;
-}
-
-static int stmpe_adc_remove(struct platform_device *pdev)
-{
-	struct iio_dev *indio_dev = platform_get_drvdata(pdev);
-	struct stmpe_adc *info = iio_priv(indio_dev);
-
-	iio_device_unregister(indio_dev);
-	free_irq(info->irq, info);
-	stmpe_disable(info->stmpe, STMPE_BLOCK_ADC);
-
-	return 0;
-}
-
-#ifdef CONFIG_PM_SLEEP
-static int stmpe_adc_resume(struct device *dev)
-{
-	struct iio_dev *indio_dev = dev_get_drvdata(dev);
-	struct stmpe_adc *info = iio_priv(indio_dev);
-
-	stmpe_adc_init_hw(info);
-
-	return 0;
-}
-#endif
-
-static SIMPLE_DEV_PM_OPS(stmpe_adc_pm_ops, NULL, stmpe_adc_resume);
-
-static struct platform_driver stmpe_adc_driver = {
-	.probe		= stmpe_adc_probe,
-	.remove		= stmpe_adc_remove,
-	.driver		= {
-		.name	= "stmpe-adc",
-		.owner	= THIS_MODULE,
-		.pm	= &stmpe_adc_pm_ops,
-	},
-};
-
-module_platform_driver(stmpe_adc_driver);
-
-MODULE_AUTHOR("Stefan Agner <stefan.agner@toradex.com>");
-MODULE_DESCRIPTION("STMPEXXX ADC driver");
-MODULE_LICENSE("GPL v2");
-MODULE_ALIAS("platform:stmpe-adc");