staging:iio:ad2s90: Move out of staging
authorMatheus Tavares <matheus.bernardino@usp.br>
Sat, 24 Nov 2018 00:23:12 +0000 (22:23 -0200)
committerJonathan Cameron <Jonathan.Cameron@huawei.com>
Sat, 1 Dec 2018 15:40:39 +0000 (15:40 +0000)
Move ad2s90 resolver driver out of staging to the main tree.

Signed-off-by: Matheus Tavares <matheus.bernardino@usp.br>
Signed-off-by: Victor Colombo <victorcolombo@gmail.com>
Acked-by: Alexandru Ardelean <alexandru.ardelean@analog.com>
Signed-off-by: Jonathan Cameron <Jonathan.Cameron@huawei.com>
drivers/iio/resolver/Kconfig
drivers/iio/resolver/Makefile
drivers/iio/resolver/ad2s90.c [new file with mode: 0644]
drivers/staging/iio/resolver/Kconfig
drivers/staging/iio/resolver/Makefile
drivers/staging/iio/resolver/ad2s90.c [deleted file]

index 2ced9f22aa707ecb9301e68d4ccedea827461004..786801be54f62816fb9fefb872b3edc81f7bbc2b 100644 (file)
@@ -3,6 +3,16 @@
 #
 menu "Resolver to digital converters"
 
+config AD2S90
+       tristate "Analog Devices ad2s90 driver"
+       depends on SPI
+       help
+         Say yes here to build support for Analog Devices spi resolver
+         to digital converters, ad2s90, provides direct access via sysfs.
+
+         To compile this driver as a module, choose M here: the
+         module will be called ad2s90.
+
 config AD2S1200
        tristate "Analog Devices ad2s1200/ad2s1205 driver"
        depends on SPI
index 4e1dccae07e7ed0bfcdb1fe5a048358a13313b84..398d82d50028d5697346103c3eb8dcd1700423a7 100644 (file)
@@ -2,4 +2,5 @@
 # Makefile for Resolver/Synchro drivers
 #
 
+obj-$(CONFIG_AD2S90) += ad2s90.o
 obj-$(CONFIG_AD2S1200) += ad2s1200.o
diff --git a/drivers/iio/resolver/ad2s90.c b/drivers/iio/resolver/ad2s90.c
new file mode 100644 (file)
index 0000000..a41f5cb
--- /dev/null
@@ -0,0 +1,131 @@
+// SPDX-License-Identifier: GPL-2.0
+/*
+ * ad2s90.c simple support for the ADI Resolver to Digital Converters: AD2S90
+ *
+ * Copyright (c) 2010-2010 Analog Devices Inc.
+ */
+#include <linux/types.h>
+#include <linux/mutex.h>
+#include <linux/device.h>
+#include <linux/spi/spi.h>
+#include <linux/slab.h>
+#include <linux/sysfs.h>
+#include <linux/module.h>
+
+#include <linux/iio/iio.h>
+#include <linux/iio/sysfs.h>
+
+/*
+ * Although chip's max frequency is 2Mhz, it needs 600ns between CS and the
+ * first falling edge of SCLK, so frequency should be at most 1 / (2 * 6e-7)
+ */
+#define AD2S90_MAX_SPI_FREQ_HZ  830000
+
+struct ad2s90_state {
+       struct mutex lock; /* lock to protect rx buffer */
+       struct spi_device *sdev;
+       u8 rx[2] ____cacheline_aligned;
+};
+
+static int ad2s90_read_raw(struct iio_dev *indio_dev,
+                          struct iio_chan_spec const *chan,
+                          int *val,
+                          int *val2,
+                          long m)
+{
+       int ret;
+       struct ad2s90_state *st = iio_priv(indio_dev);
+
+       if (chan->type != IIO_ANGL)
+               return -EINVAL;
+
+       switch (m) {
+       case IIO_CHAN_INFO_SCALE:
+               /* 2 * Pi / 2^12 */
+               *val = 6283; /* mV */
+               *val2 = 12;
+               return IIO_VAL_FRACTIONAL_LOG2;
+       case IIO_CHAN_INFO_RAW:
+               mutex_lock(&st->lock);
+               ret = spi_read(st->sdev, st->rx, 2);
+               if (ret < 0) {
+                       mutex_unlock(&st->lock);
+                       return ret;
+               }
+               *val = (((u16)(st->rx[0])) << 4) | ((st->rx[1] & 0xF0) >> 4);
+
+               mutex_unlock(&st->lock);
+
+               return IIO_VAL_INT;
+       default:
+               break;
+       }
+
+       return -EINVAL;
+}
+
+static const struct iio_info ad2s90_info = {
+       .read_raw = ad2s90_read_raw,
+};
+
+static const struct iio_chan_spec ad2s90_chan = {
+       .type = IIO_ANGL,
+       .indexed = 1,
+       .channel = 0,
+       .info_mask_separate = BIT(IIO_CHAN_INFO_RAW) | BIT(IIO_CHAN_INFO_SCALE),
+};
+
+static int ad2s90_probe(struct spi_device *spi)
+{
+       struct iio_dev *indio_dev;
+       struct ad2s90_state *st;
+
+       if (spi->max_speed_hz > AD2S90_MAX_SPI_FREQ_HZ) {
+               dev_err(&spi->dev, "SPI CLK, %d Hz exceeds %d Hz\n",
+                       spi->max_speed_hz, AD2S90_MAX_SPI_FREQ_HZ);
+               return -EINVAL;
+       }
+
+       indio_dev = devm_iio_device_alloc(&spi->dev, sizeof(*st));
+       if (!indio_dev)
+               return -ENOMEM;
+       st = iio_priv(indio_dev);
+       spi_set_drvdata(spi, indio_dev);
+
+       mutex_init(&st->lock);
+       st->sdev = spi;
+       indio_dev->dev.parent = &spi->dev;
+       indio_dev->info = &ad2s90_info;
+       indio_dev->modes = INDIO_DIRECT_MODE;
+       indio_dev->channels = &ad2s90_chan;
+       indio_dev->num_channels = 1;
+       indio_dev->name = spi_get_device_id(spi)->name;
+
+       return devm_iio_device_register(indio_dev->dev.parent, indio_dev);
+}
+
+static const struct of_device_id ad2s90_of_match[] = {
+       { .compatible = "adi,ad2s90", },
+       {}
+};
+MODULE_DEVICE_TABLE(of, ad2s90_of_match);
+
+static const struct spi_device_id ad2s90_id[] = {
+       { "ad2s90" },
+       {}
+};
+MODULE_DEVICE_TABLE(spi, ad2s90_id);
+
+static struct spi_driver ad2s90_driver = {
+       .driver = {
+               .name = "ad2s90",
+               .of_match_table = ad2s90_of_match,
+       },
+       .probe = ad2s90_probe,
+       .id_table = ad2s90_id,
+};
+module_spi_driver(ad2s90_driver);
+
+MODULE_AUTHOR("Graff Yang <graff.yang@gmail.com>");
+MODULE_DESCRIPTION("Analog Devices AD2S90 Resolver to Digital SPI driver");
+MODULE_LICENSE("GPL v2");
index 6a469ee6101f88e878b26768946f23f633850791..4a727c17bb8faa155f076a788d99ef48fae2a8fc 100644 (file)
@@ -3,16 +3,6 @@
 #
 menu "Resolver to digital converters"
 
-config AD2S90
-       tristate "Analog Devices ad2s90 driver"
-       depends on SPI
-       help
-         Say yes here to build support for Analog Devices spi resolver
-         to digital converters, ad2s90, provides direct access via sysfs.
-
-         To compile this driver as a module, choose M here: the
-         module will be called ad2s90.
-
 config AD2S1210
        tristate "Analog Devices ad2s1210 driver"
        depends on SPI
index 8d901dc7500bf47eec39ee416e1b45bf3f9611dd..b2049f2ce36e48f56ca2e430811319f5f134aa14 100644 (file)
@@ -2,5 +2,4 @@
 # Makefile for Resolver/Synchro drivers
 #
 
-obj-$(CONFIG_AD2S90) += ad2s90.o
 obj-$(CONFIG_AD2S1210) += ad2s1210.o
diff --git a/drivers/staging/iio/resolver/ad2s90.c b/drivers/staging/iio/resolver/ad2s90.c
deleted file mode 100644 (file)
index a41f5cb..0000000
+++ /dev/null
@@ -1,131 +0,0 @@
-// SPDX-License-Identifier: GPL-2.0
-/*
- * ad2s90.c simple support for the ADI Resolver to Digital Converters: AD2S90
- *
- * Copyright (c) 2010-2010 Analog Devices Inc.
- */
-#include <linux/types.h>
-#include <linux/mutex.h>
-#include <linux/device.h>
-#include <linux/spi/spi.h>
-#include <linux/slab.h>
-#include <linux/sysfs.h>
-#include <linux/module.h>
-
-#include <linux/iio/iio.h>
-#include <linux/iio/sysfs.h>
-
-/*
- * Although chip's max frequency is 2Mhz, it needs 600ns between CS and the
- * first falling edge of SCLK, so frequency should be at most 1 / (2 * 6e-7)
- */
-#define AD2S90_MAX_SPI_FREQ_HZ  830000
-
-struct ad2s90_state {
-       struct mutex lock; /* lock to protect rx buffer */
-       struct spi_device *sdev;
-       u8 rx[2] ____cacheline_aligned;
-};
-
-static int ad2s90_read_raw(struct iio_dev *indio_dev,
-                          struct iio_chan_spec const *chan,
-                          int *val,
-                          int *val2,
-                          long m)
-{
-       int ret;
-       struct ad2s90_state *st = iio_priv(indio_dev);
-
-       if (chan->type != IIO_ANGL)
-               return -EINVAL;
-
-       switch (m) {
-       case IIO_CHAN_INFO_SCALE:
-               /* 2 * Pi / 2^12 */
-               *val = 6283; /* mV */
-               *val2 = 12;
-               return IIO_VAL_FRACTIONAL_LOG2;
-       case IIO_CHAN_INFO_RAW:
-               mutex_lock(&st->lock);
-               ret = spi_read(st->sdev, st->rx, 2);
-               if (ret < 0) {
-                       mutex_unlock(&st->lock);
-                       return ret;
-               }
-               *val = (((u16)(st->rx[0])) << 4) | ((st->rx[1] & 0xF0) >> 4);
-
-               mutex_unlock(&st->lock);
-
-               return IIO_VAL_INT;
-       default:
-               break;
-       }
-
-       return -EINVAL;
-}
-
-static const struct iio_info ad2s90_info = {
-       .read_raw = ad2s90_read_raw,
-};
-
-static const struct iio_chan_spec ad2s90_chan = {
-       .type = IIO_ANGL,
-       .indexed = 1,
-       .channel = 0,
-       .info_mask_separate = BIT(IIO_CHAN_INFO_RAW) | BIT(IIO_CHAN_INFO_SCALE),
-};
-
-static int ad2s90_probe(struct spi_device *spi)
-{
-       struct iio_dev *indio_dev;
-       struct ad2s90_state *st;
-
-       if (spi->max_speed_hz > AD2S90_MAX_SPI_FREQ_HZ) {
-               dev_err(&spi->dev, "SPI CLK, %d Hz exceeds %d Hz\n",
-                       spi->max_speed_hz, AD2S90_MAX_SPI_FREQ_HZ);
-               return -EINVAL;
-       }
-
-       indio_dev = devm_iio_device_alloc(&spi->dev, sizeof(*st));
-       if (!indio_dev)
-               return -ENOMEM;
-       st = iio_priv(indio_dev);
-       spi_set_drvdata(spi, indio_dev);
-
-       mutex_init(&st->lock);
-       st->sdev = spi;
-       indio_dev->dev.parent = &spi->dev;
-       indio_dev->info = &ad2s90_info;
-       indio_dev->modes = INDIO_DIRECT_MODE;
-       indio_dev->channels = &ad2s90_chan;
-       indio_dev->num_channels = 1;
-       indio_dev->name = spi_get_device_id(spi)->name;
-
-       return devm_iio_device_register(indio_dev->dev.parent, indio_dev);
-}
-
-static const struct of_device_id ad2s90_of_match[] = {
-       { .compatible = "adi,ad2s90", },
-       {}
-};
-MODULE_DEVICE_TABLE(of, ad2s90_of_match);
-
-static const struct spi_device_id ad2s90_id[] = {
-       { "ad2s90" },
-       {}
-};
-MODULE_DEVICE_TABLE(spi, ad2s90_id);
-
-static struct spi_driver ad2s90_driver = {
-       .driver = {
-               .name = "ad2s90",
-               .of_match_table = ad2s90_of_match,
-       },
-       .probe = ad2s90_probe,
-       .id_table = ad2s90_id,
-};
-module_spi_driver(ad2s90_driver);
-
-MODULE_AUTHOR("Graff Yang <graff.yang@gmail.com>");
-MODULE_DESCRIPTION("Analog Devices AD2S90 Resolver to Digital SPI driver");
-MODULE_LICENSE("GPL v2");