Commit c984b9cb authored by Akinobu Mita's avatar Akinobu Mita Committed by Jonathan Cameron
Browse files

iio: pressure: mpl115: support MPL115A1 



mpl115 driver currently supports i2c interface (MPL115A2).
There is also SPI version (MPL115A1).  The difference between them
is only physical transport so we can easily support both while sharing
most of the code.

Split the driver into a core support module and one module each for I2C
and SPI support.

Signed-off-by: default avatarAkinobu Mita <akinobu.mita@gmail.com>
Cc: Jonathan Cameron <jic23@kernel.org>
Cc: Hartmut Knaack <knaack.h@gmx.de>
Cc: Lars-Peter Clausen <lars@metafoo.de>
Cc: Peter Meerwald <pmeerw@pmeerw.net>
Cc: linux-iio@vger.kernel.org
Signed-off-by: default avatarJonathan Cameron <jic23@kernel.org>
parent 0b767b31

drivers/iio/pressure/Kconfig

+16 −1
Original line number Diff line number Diff line
@@ -31,14 +31,29 @@ config HID_SENSOR_PRESS 
          will be called hid-sensor-press.



config MPL115

	tristate



config MPL115_I2C

	tristate "Freescale MPL115A2 pressure sensor driver"

	depends on I2C

	select MPL115

	help

	  Say yes here to build support for the Freescale MPL115A2

	  pressure sensor connected via I2C.



          To compile this driver as a module, choose M here: the module

          will be called mpl115.

          will be called mpl115_i2c.



config MPL115_SPI

	tristate "Freescale MPL115A1 pressure sensor driver"

	depends on SPI_MASTER

	select MPL115

	help

	  Say yes here to build support for the Freescale MPL115A1

	  pressure sensor connected via SPI.



          To compile this driver as a module, choose M here: the module

          will be called mpl115_spi.



config MPL3115

	tristate "Freescale MPL3115A2 pressure sensor driver"

drivers/iio/pressure/Makefile

+2 −0
Original line number Diff line number Diff line
@@ -6,6 +6,8 @@ 
obj-$(CONFIG_BMP280) += bmp280.o

obj-$(CONFIG_HID_SENSOR_PRESS)   += hid-sensor-press.o

obj-$(CONFIG_MPL115) += mpl115.o

obj-$(CONFIG_MPL115_I2C) += mpl115_i2c.o

obj-$(CONFIG_MPL115_SPI) += mpl115_spi.o

obj-$(CONFIG_MPL3115) += mpl3115.o

obj-$(CONFIG_MS5611) += ms5611_core.o

obj-$(CONFIG_MS5611_I2C) += ms5611_i2c.o

drivers/iio/pressure/mpl115.c

+27 −38
Original line number Diff line number Diff line 
/*

 * mpl115.c - Support for Freescale MPL115A2 pressure/temperature sensor

 * mpl115.c - Support for Freescale MPL115A pressure/temperature sensor

 *

 * Copyright (c) 2014 Peter Meerwald <pmeerw@pmeerw.net>

 *
@@ -7,17 +7,16 @@ 
 * the GNU General Public License.  See the file COPYING in the main

 * directory of this archive for more details.

 *

 * (7-bit I2C slave address 0x60)

 *

 * TODO: shutdown pin

 *

 */



#include <linux/module.h>

#include <linux/i2c.h>

#include <linux/iio/iio.h>

#include <linux/delay.h>



#include "mpl115.h"



#define MPL115_PADC 0x00 /* pressure ADC output value, MSB first, 10 bit */

#define MPL115_TADC 0x02 /* temperature ADC output value, MSB first, 10 bit */

#define MPL115_A0 0x04 /* 12 bit integer, 3 bit fraction */
@@ -27,16 +26,18 @@ 
#define MPL115_CONVERT 0x12 /* convert temperature and pressure */



struct mpl115_data {

	struct i2c_client *client;

	struct device *dev;

	struct mutex lock;

	s16 a0;

	s16 b1, b2;

	s16 c12;

	const struct mpl115_ops *ops;

};



static int mpl115_request(struct mpl115_data *data)

{

	int ret = i2c_smbus_write_byte_data(data->client, MPL115_CONVERT, 0);

	int ret = data->ops->write(data->dev, MPL115_CONVERT, 0);



	if (ret < 0)

		return ret;
@@ -57,12 +58,12 @@ static int mpl115_comp_pressure(struct mpl115_data *data, int *val, int *val2) 
	if (ret < 0)

		goto done;



	ret = i2c_smbus_read_word_swapped(data->client, MPL115_PADC);

	ret = data->ops->read(data->dev, MPL115_PADC);

	if (ret < 0)

		goto done;

	padc = ret >> 6;



	ret = i2c_smbus_read_word_swapped(data->client, MPL115_TADC);

	ret = data->ops->read(data->dev, MPL115_TADC);

	if (ret < 0)

		goto done;

	tadc = ret >> 6;
@@ -90,7 +91,7 @@ static int mpl115_read_temp(struct mpl115_data *data) 
	ret = mpl115_request(data);

	if (ret < 0)

		goto done;

	ret = i2c_smbus_read_word_swapped(data->client, MPL115_TADC);

	ret = data->ops->read(data->dev, MPL115_TADC);

done:

	mutex_unlock(&data->lock);

	return ret;
@@ -145,65 +146,53 @@ static const struct iio_info mpl115_info = { 
	.driver_module = THIS_MODULE,

};



static int mpl115_probe(struct i2c_client *client,

			 const struct i2c_device_id *id)

int mpl115_probe(struct device *dev, const char *name,

			const struct mpl115_ops *ops)

{

	struct mpl115_data *data;

	struct iio_dev *indio_dev;

	int ret;



	if (!i2c_check_functionality(client->adapter, I2C_FUNC_SMBUS_WORD_DATA))

		return -ENODEV;



	indio_dev = devm_iio_device_alloc(&client->dev, sizeof(*data));

	indio_dev = devm_iio_device_alloc(dev, sizeof(*data));

	if (!indio_dev)

		return -ENOMEM;



	data = iio_priv(indio_dev);

	data->client = client;

	data->dev = dev;

	data->ops = ops;

	mutex_init(&data->lock);



	indio_dev->info = &mpl115_info;

	indio_dev->name = id->name;

	indio_dev->dev.parent = &client->dev;

	indio_dev->name = name;

	indio_dev->dev.parent = dev;

	indio_dev->modes = INDIO_DIRECT_MODE;

	indio_dev->channels = mpl115_channels;

	indio_dev->num_channels = ARRAY_SIZE(mpl115_channels);



	ret = i2c_smbus_read_word_swapped(data->client, MPL115_A0);

	ret = data->ops->init(data->dev);

	if (ret)

		return ret;



	ret = data->ops->read(data->dev, MPL115_A0);

	if (ret < 0)

		return ret;

	data->a0 = ret;

	ret = i2c_smbus_read_word_swapped(data->client, MPL115_B1);

	ret = data->ops->read(data->dev, MPL115_B1);

	if (ret < 0)

		return ret;

	data->b1 = ret;

	ret = i2c_smbus_read_word_swapped(data->client, MPL115_B2);

	ret = data->ops->read(data->dev, MPL115_B2);

	if (ret < 0)

		return ret;

	data->b2 = ret;

	ret = i2c_smbus_read_word_swapped(data->client, MPL115_C12);

	ret = data->ops->read(data->dev, MPL115_C12);

	if (ret < 0)

		return ret;

	data->c12 = ret;



	return devm_iio_device_register(&client->dev, indio_dev);

	return devm_iio_device_register(dev, indio_dev);

}



static const struct i2c_device_id mpl115_id[] = {

	{ "mpl115", 0 },

	{ }

};

MODULE_DEVICE_TABLE(i2c, mpl115_id);



static struct i2c_driver mpl115_driver = {

	.driver = {

		.name	= "mpl115",

	},

	.probe = mpl115_probe,

	.id_table = mpl115_id,

};

module_i2c_driver(mpl115_driver);

EXPORT_SYMBOL_GPL(mpl115_probe);



MODULE_AUTHOR("Peter Meerwald <pmeerw@pmeerw.net>");

MODULE_DESCRIPTION("Freescale MPL115 pressure/temperature driver");

drivers/iio/pressure/mpl115.h

0 → 100644
+24 −0
Original line number Diff line number Diff line 
/*

 * Freescale MPL115A pressure/temperature sensor

 *

 * Copyright (c) 2014 Peter Meerwald <pmeerw@pmeerw.net>

 * Copyright (c) 2016 Akinobu Mita <akinobu.mita@gmail.com>

 *

 * This file is subject to the terms and conditions of version 2 of

 * the GNU General Public License.  See the file COPYING in the main

 * directory of this archive for more details.

 */



#ifndef _MPL115_H_

#define _MPL115_H_



struct mpl115_ops {

	int (*init)(struct device *);

	int (*read)(struct device *, u8);

	int (*write)(struct device *, u8, u8);

};



int mpl115_probe(struct device *dev, const char *name,

			const struct mpl115_ops *ops);



#endif

drivers/iio/pressure/mpl115_i2c.c

0 → 100644
+67 −0
Original line number Diff line number Diff line 
/*

 * Freescale MPL115A2 pressure/temperature sensor

 *

 * Copyright (c) 2014 Peter Meerwald <pmeerw@pmeerw.net>

 *

 * This file is subject to the terms and conditions of version 2 of

 * the GNU General Public License.  See the file COPYING in the main

 * directory of this archive for more details.

 *

 * (7-bit I2C slave address 0x60)

 *

 * Datasheet: http://www.nxp.com/files/sensors/doc/data_sheet/MPL115A2.pdf

 */



#include <linux/module.h>

#include <linux/i2c.h>



#include "mpl115.h"



static int mpl115_i2c_init(struct device *dev)

{

	return 0;

}



static int mpl115_i2c_read(struct device *dev, u8 address)

{

	return i2c_smbus_read_word_swapped(to_i2c_client(dev), address);

}



static int mpl115_i2c_write(struct device *dev, u8 address, u8 value)

{

	return i2c_smbus_write_byte_data(to_i2c_client(dev), address, value);

}



static const struct mpl115_ops mpl115_i2c_ops = {

	.init = mpl115_i2c_init,

	.read = mpl115_i2c_read,

	.write = mpl115_i2c_write,

};



static int mpl115_i2c_probe(struct i2c_client *client,

			 const struct i2c_device_id *id)

{

	if (!i2c_check_functionality(client->adapter, I2C_FUNC_SMBUS_WORD_DATA))

		return -ENODEV;



	return mpl115_probe(&client->dev, id->name, &mpl115_i2c_ops);

}



static const struct i2c_device_id mpl115_i2c_id[] = {

	{ "mpl115", 0 },

	{ }

};

MODULE_DEVICE_TABLE(i2c, mpl115_i2c_id);



static struct i2c_driver mpl115_i2c_driver = {

	.driver = {

		.name	= "mpl115",

	},

	.probe = mpl115_i2c_probe,

	.id_table = mpl115_i2c_id,

};

module_i2c_driver(mpl115_i2c_driver);



MODULE_AUTHOR("Peter Meerwald <pmeerw@pmeerw.net>");

MODULE_DESCRIPTION("Freescale MPL115A2 pressure/temperature driver");

MODULE_LICENSE("GPL");

CRA Git | Maintained and supported by SUSTech CRA and CCSE