Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c83441e0 authored by Lars-Peter Clausen's avatar Lars-Peter Clausen Committed by Jonathan Cameron
Browse files

staging:iio: Remove ad5930/ad9850/ad9852/ad9910/ad9951 dummy drivers 



All what these 'drivers' do is expose a single (non standard ABI) sysfs
attribute that when written to does a direct pass-through to spi_write(). This
is rather ugly and does not justify the existence of a driver as the same can
easily done by using the spidev interface.

The drivers will eventually be rewritten as proper IIO ABI compliant drivers
which do have the proper abstraction layers between userspace and the device.
But in the meantime these driver do not add any extra value and just clutter up
the staging area. So just remove them.

Signed-off-by: default avatarLars-Peter Clausen <lars@metafoo.de>
Signed-off-by: default avatarJonathan Cameron <jic23@kernel.org>
parent 4ce72abc

drivers/staging/iio/frequency/Kconfig

+0 −35
Original line number Diff line number Diff line
@@ -3,13 +3,6 @@ 
#

menu "Direct Digital Synthesis"



config AD5930

	tristate "Analog Devices ad5930/5932 driver"

	depends on SPI

	help

	  Say yes here to build support for Analog Devices DDS chip

	  ad5930/ad5932, provides direct access via sysfs.



config AD9832

	tristate "Analog Devices ad9832/5 driver"

	depends on SPI
@@ -30,32 +23,4 @@ config AD9834 
	  To compile this driver as a module, choose M here: the

	  module will be called ad9834.



config AD9850

	tristate "Analog Devices ad9850/1 driver"

	depends on SPI

	help

	  Say yes here to build support for Analog Devices DDS chip

	  ad9850/1, provides direct access via sysfs.



config AD9852

	tristate "Analog Devices ad9852/4 driver"

	depends on SPI

	help

	  Say yes here to build support for Analog Devices DDS chip

	  ad9852/4, provides direct access via sysfs.



config AD9910

	tristate "Analog Devices ad9910 driver"

	depends on SPI

	help

	  Say yes here to build support for Analog Devices DDS chip

	  ad9910, provides direct access via sysfs.



config AD9951

	tristate "Analog Devices ad9951 driver"

	depends on SPI

	help

	  Say yes here to build support for Analog Devices DDS chip

	  ad9951, provides direct access via sysfs.



endmenu

drivers/staging/iio/frequency/Makefile

+0 −5
Original line number Diff line number Diff line
@@ -2,10 +2,5 @@ 
# Makefile for Direct Digital Synthesis drivers

#



obj-$(CONFIG_AD5930) += ad5930.o

obj-$(CONFIG_AD9832) += ad9832.o

obj-$(CONFIG_AD9834) += ad9834.o
 
obj-$(CONFIG_AD9850) += ad9850.o

obj-$(CONFIG_AD9852) += ad9852.o

obj-$(CONFIG_AD9910) += ad9910.o

obj-$(CONFIG_AD9951) += ad9951.o

drivers/staging/iio/frequency/ad5930.c

deleted100644 → 0
+0 −140
Original line number Diff line number Diff line 
/*

 * Driver for ADI Direct Digital Synthesis ad5930

 *

 * Copyright (c) 2010-2010 Analog Devices Inc.

 *

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of the GNU General Public License version 2 as

 * published by the Free Software Foundation.

 *

 */

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



#define DRV_NAME "ad5930"



#define value_mask (u16)0xf000

#define addr_shift 12



/* Register format: 4 bits addr + 12 bits value */

struct ad5903_config {

	u16 control;

	u16 incnum;

	u16 frqdelt[2];

	u16 incitvl;

	u16 buritvl;

	u16 strtfrq[2];

};



struct ad5930_state {

	struct mutex lock;

	struct spi_device *sdev;

};



static ssize_t ad5930_set_parameter(struct device *dev,

					struct device_attribute *attr,

					const char *buf,

					size_t len)

{

	struct spi_transfer xfer;

	int ret;

	struct ad5903_config *config = (struct ad5903_config *)buf;

	struct iio_dev *idev = dev_to_iio_dev(dev);

	struct ad5930_state *st = iio_priv(idev);



	config->control = (config->control & ~value_mask);

	config->incnum = (config->control & ~value_mask) | (1 << addr_shift);

	config->frqdelt[0] = (config->control & ~value_mask) | (2 << addr_shift);

	config->frqdelt[1] = (config->control & ~value_mask) | 3 << addr_shift;

	config->incitvl = (config->control & ~value_mask) | 4 << addr_shift;

	config->buritvl = (config->control & ~value_mask) | 8 << addr_shift;

	config->strtfrq[0] = (config->control & ~value_mask) | 0xc << addr_shift;

	config->strtfrq[1] = (config->control & ~value_mask) | 0xd << addr_shift;



	xfer.len = len;

	xfer.tx_buf = config;

	mutex_lock(&st->lock);



	ret = spi_sync_transfer(st->sdev, &xfer, 1);

	if (ret)

		goto error_ret;

error_ret:

	mutex_unlock(&st->lock);



	return ret ? ret : len;

}



static IIO_DEVICE_ATTR(dds, S_IWUSR, NULL, ad5930_set_parameter, 0);



static struct attribute *ad5930_attributes[] = {

	&iio_dev_attr_dds.dev_attr.attr,

	NULL,

};



static const struct attribute_group ad5930_attribute_group = {

	.attrs = ad5930_attributes,

};



static const struct iio_info ad5930_info = {

	.attrs = &ad5930_attribute_group,

	.driver_module = THIS_MODULE,

};



static int ad5930_probe(struct spi_device *spi)

{

	struct ad5930_state *st;

	struct iio_dev *idev;

	int ret = 0;



	idev = devm_iio_device_alloc(&spi->dev, sizeof(*st));

	if (!idev)

		return -ENOMEM;

	spi_set_drvdata(spi, idev);

	st = iio_priv(idev);



	mutex_init(&st->lock);

	st->sdev = spi;

	idev->dev.parent = &spi->dev;

	idev->info = &ad5930_info;

	idev->modes = INDIO_DIRECT_MODE;



	ret = iio_device_register(idev);

	if (ret)

		return ret;

	spi->max_speed_hz = 2000000;

	spi->mode = SPI_MODE_3;

	spi->bits_per_word = 16;

	spi_setup(spi);



	return 0;

}



static int ad5930_remove(struct spi_device *spi)

{

	iio_device_unregister(spi_get_drvdata(spi));



	return 0;

}



static struct spi_driver ad5930_driver = {

	.driver = {

		.name = DRV_NAME,

		.owner = THIS_MODULE,

	},

	.probe = ad5930_probe,

	.remove = ad5930_remove,

};

module_spi_driver(ad5930_driver);



MODULE_AUTHOR("Cliff Cai");

MODULE_DESCRIPTION("Analog Devices ad5930 driver");

MODULE_LICENSE("GPL v2");

MODULE_ALIAS("spi:" DRV_NAME);

drivers/staging/iio/frequency/ad9850.c

deleted100644 → 0
+0 −120
Original line number Diff line number Diff line 
/*

 * Driver for ADI Direct Digital Synthesis ad9850

 *

 * Copyright (c) 2010-2010 Analog Devices Inc.

 *

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of the GNU General Public License version 2 as

 * published by the Free Software Foundation.

 *

 */

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



#define DRV_NAME "ad9850"



/* Register format: 4 bits addr + 12 bits value */

struct ad9850_config {

	u8 control[5];

};



struct ad9850_state {

	struct mutex lock;

	struct spi_device *sdev;

};



static ssize_t ad9850_set_parameter(struct device *dev,

					struct device_attribute *attr,

					const char *buf,

					size_t len)

{

	struct spi_transfer xfer;

	int ret;

	struct ad9850_config *config = (struct ad9850_config *)buf;

	struct iio_dev *idev = dev_to_iio_dev(dev);

	struct ad9850_state *st = iio_priv(idev);



	xfer.len = len;

	xfer.tx_buf = config;

	mutex_lock(&st->lock);



	ret = spi_sync_transfer(st->sdev, &xfer, 1);

	mutex_unlock(&st->lock);



	return ret ? ret : len;

}



static IIO_DEVICE_ATTR(dds, S_IWUSR, NULL, ad9850_set_parameter, 0);



static struct attribute *ad9850_attributes[] = {

	&iio_dev_attr_dds.dev_attr.attr,

	NULL,

};



static const struct attribute_group ad9850_attribute_group = {

	.attrs = ad9850_attributes,

};



static const struct iio_info ad9850_info = {

	.attrs = &ad9850_attribute_group,

	.driver_module = THIS_MODULE,

};



static int ad9850_probe(struct spi_device *spi)

{

	struct ad9850_state *st;

	struct iio_dev *idev;

	int ret = 0;



	idev = devm_iio_device_alloc(&spi->dev, sizeof(*st));

	if (!idev)

		return -ENOMEM;

	spi_set_drvdata(spi, idev);

	st = iio_priv(idev);

	mutex_init(&st->lock);

	st->sdev = spi;



	idev->dev.parent = &spi->dev;

	idev->info = &ad9850_info;

	idev->modes = INDIO_DIRECT_MODE;



	ret = iio_device_register(idev);

	if (ret)

		return ret;

	spi->max_speed_hz = 2000000;

	spi->mode = SPI_MODE_3;

	spi->bits_per_word = 16;

	spi_setup(spi);



	return 0;

}



static int ad9850_remove(struct spi_device *spi)

{

	iio_device_unregister(spi_get_drvdata(spi));



	return 0;

}



static struct spi_driver ad9850_driver = {

	.driver = {

		.name = DRV_NAME,

		.owner = THIS_MODULE,

	},

	.probe = ad9850_probe,

	.remove = ad9850_remove,

};

module_spi_driver(ad9850_driver);



MODULE_AUTHOR("Cliff Cai");

MODULE_DESCRIPTION("Analog Devices ad9850 driver");

MODULE_LICENSE("GPL v2");

MODULE_ALIAS("spi:" DRV_NAME);

drivers/staging/iio/frequency/ad9852.c

deleted100644 → 0
+0 −245
Original line number Diff line number Diff line 
/*

 * Driver for ADI Direct Digital Synthesis ad9852

 *

 * Copyright (c) 2010 Analog Devices Inc.

 *

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of the GNU General Public License version 2 as

 * published by the Free Software Foundation.

 *

 */

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



#define DRV_NAME "ad9852"



#define addr_phaad1 0x0

#define addr_phaad2 0x1

#define addr_fretu1 0x2

#define addr_fretu2 0x3

#define addr_delfre 0x4

#define addr_updclk 0x5

#define addr_ramclk 0x6

#define addr_contrl 0x7

#define addr_optskm 0x8

#define addr_optskr 0xa

#define addr_dacctl 0xb



#define COMPPD		(1 << 4)

#define REFMULT2	(1 << 2)

#define BYPPLL		(1 << 5)

#define PLLRANG		(1 << 6)

#define IEUPCLK		(1)

#define OSKEN		(1 << 5)



#define read_bit	(1 << 7)



/* Register format: 1 byte addr + value */

struct ad9852_config {

	u8 phajst0[3];

	u8 phajst1[3];

	u8 fretun1[6];

	u8 fretun2[6];

	u8 dltafre[6];

	u8 updtclk[5];

	u8 ramprat[4];

	u8 control[5];

	u8 outpskm[3];

	u8 outpskr[2];

	u8 daccntl[3];

};



struct ad9852_state {

	struct mutex lock;

	struct spi_device *sdev;

};



static ssize_t ad9852_set_parameter(struct device *dev,

					struct device_attribute *attr,

					const char *buf,

					size_t len)

{

	struct spi_transfer xfer;

	int ret;

	struct ad9852_config *config = (struct ad9852_config *)buf;

	struct iio_dev *idev = dev_to_iio_dev(dev);

	struct ad9852_state *st = iio_priv(idev);



	xfer.len = 3;

	xfer.tx_buf = &config->phajst0[0];

	mutex_lock(&st->lock);



	ret = spi_sync_transfer(st->sdev, &xfer, 1);

	if (ret)

		goto error_ret;



	xfer.len = 3;

	xfer.tx_buf = &config->phajst1[0];



	ret = spi_sync_transfer(st->sdev, &xfer, 1);

	if (ret)

		goto error_ret;



	xfer.len = 6;

	xfer.tx_buf = &config->fretun1[0];



	ret = spi_sync_transfer(st->sdev, &xfer, 1);

	if (ret)

		goto error_ret;



	xfer.len = 6;

	xfer.tx_buf = &config->fretun2[0];



	ret = spi_sync_transfer(st->sdev, &xfer, 1);

	if (ret)

		goto error_ret;



	xfer.len = 6;

	xfer.tx_buf = &config->dltafre[0];



	ret = spi_sync_transfer(st->sdev, &xfer, 1);

	if (ret)

		goto error_ret;



	xfer.len = 5;

	xfer.tx_buf = &config->updtclk[0];



	ret = spi_sync_transfer(st->sdev, &xfer, 1);

	if (ret)

		goto error_ret;



	xfer.len = 4;

	xfer.tx_buf = &config->ramprat[0];



	ret = spi_sync_transfer(st->sdev, &xfer, 1);

	if (ret)

		goto error_ret;



	xfer.len = 5;

	xfer.tx_buf = &config->control[0];



	ret = spi_sync_transfer(st->sdev, &xfer, 1);

	if (ret)

		goto error_ret;



	xfer.len = 3;

	xfer.tx_buf = &config->outpskm[0];



	ret = spi_sync_transfer(st->sdev, &xfer, 1);

	if (ret)

		goto error_ret;



	xfer.len = 2;

	xfer.tx_buf = &config->outpskr[0];



	ret = spi_sync_transfer(st->sdev, &xfer, 1);

	if (ret)

		goto error_ret;



	xfer.len = 3;

	xfer.tx_buf = &config->daccntl[0];



	ret = spi_sync_transfer(st->sdev, &xfer, 1);

	if (ret)

		goto error_ret;

error_ret:

	mutex_unlock(&st->lock);



	return ret ? ret : len;

}



static IIO_DEVICE_ATTR(dds, S_IWUSR, NULL, ad9852_set_parameter, 0);



static void ad9852_init(struct ad9852_state *st)

{

	struct spi_transfer xfer;

	int ret;

	u8 config[5];



	config[0] = addr_contrl;

	config[1] = COMPPD;

	config[2] = REFMULT2 | BYPPLL | PLLRANG;

	config[3] = IEUPCLK;

	config[4] = OSKEN;



	mutex_lock(&st->lock);



	xfer.len = 5;

	xfer.tx_buf = &config;



	ret = spi_sync_transfer(st->sdev, &xfer, 1);

	if (ret)

		goto error_ret;



error_ret:

	mutex_unlock(&st->lock);







}



static struct attribute *ad9852_attributes[] = {

	&iio_dev_attr_dds.dev_attr.attr,

	NULL,

};



static const struct attribute_group ad9852_attribute_group = {

	.attrs = ad9852_attributes,

};



static const struct iio_info ad9852_info = {

	.attrs = &ad9852_attribute_group,

	.driver_module = THIS_MODULE,

};



static int ad9852_probe(struct spi_device *spi)

{

	struct ad9852_state *st;

	struct iio_dev *idev;

	int ret = 0;



	idev = devm_iio_device_alloc(&spi->dev, sizeof(*st));

	if (!idev)

		return -ENOMEM;

	st = iio_priv(idev);

	spi_set_drvdata(spi, idev);

	mutex_init(&st->lock);

	st->sdev = spi;



	idev->dev.parent = &spi->dev;

	idev->info = &ad9852_info;

	idev->modes = INDIO_DIRECT_MODE;



	ret = devm_iio_device_register(&spi->dev, idev);

	if (ret)

		return ret;

	spi->max_speed_hz = 2000000;

	spi->mode = SPI_MODE_3;

	spi->bits_per_word = 8;

	spi_setup(spi);

	ad9852_init(st);



	return 0;

}



static struct spi_driver ad9852_driver = {

	.driver = {

		.name = DRV_NAME,

		.owner = THIS_MODULE,

	},

	.probe = ad9852_probe,

};

module_spi_driver(ad9852_driver);



MODULE_AUTHOR("Cliff Cai");

MODULE_DESCRIPTION("Analog Devices ad9852 driver");

MODULE_LICENSE("GPL v2");

MODULE_ALIAS("spi:" DRV_NAME);