Skip to contentSkip to conversation

iio - add barometer bmp085

PATCH In review Matthias Brugger 3 participants 5 messages Oct 15, 2010 – Oct 19, 2010

Subsystems (3)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 iio - add barometer bmp085

This patch adds:
- digital barometer support to the iio subsytem
- Bosch Sensortec bmp085 driver

I resend the patches I sent yesterday, because I merged them to one.
Also the comments and the define has been deleted and so, from my point of view is ready to merge.

---
 drivers/staging/iio/Kconfig            |    1 +
 drivers/staging/iio/Makefile           |    1 +
 drivers/staging/iio/barometer/Kconfig  |   12 +
 drivers/staging/iio/barometer/Makefile |    5 +
 drivers/staging/iio/barometer/baro.h   |    8 +
 drivers/staging/iio/barometer/bmp085.c |  418 ++++++++++++++++++++++++++++++++
 drivers/staging/iio/barometer/bmp085.h |   73 ++++++
 7 files changed, 518 insertions(+), 0 deletions(-)
 create mode 100644 drivers/staging/iio/barometer/Kconfig
 create mode 100644 drivers/staging/iio/barometer/Makefile
 create mode 100644 drivers/staging/iio/barometer/baro.h
 create mode 100644 drivers/staging/iio/barometer/bmp085.c
 create mode 100644 drivers/staging/iio/barometer/bmp085.h
drivers/staging/iio/Kconfig +1 -0
index ed48815..d5ca09a 100644
@@ -46,6 +46,7 @@ source "drivers/staging/iio/gyro/Kconfig"
 source "drivers/staging/iio/imu/Kconfig"
 source "drivers/staging/iio/light/Kconfig"
 source "drivers/staging/iio/magnetometer/Kconfig"
+source "drivers/staging/iio/barometer/Kconfig"
 
 source "drivers/staging/iio/trigger/Kconfig"
 
drivers/staging/iio/Makefile +1 -0
index e909674..73112b2 100644
@@ -16,3 +16,4 @@ obj-y += imu/
 obj-y += light/
 obj-y += trigger/
 obj-y += magnetometer/
+obj-y += barometer/
drivers/staging/iio/barometer/Kconfig new file +12 -0
new file mode 100644
index 0000000..d5942e9
@@ -0,0 +1,12 @@
+#
+# IIO Digital Barometer Sensor drivers configuration
+#
+comment "Digital barometer sensors"
+
+config BMP085
+
+	tristate "BMP085 Barometer Sensor I2C driver"
+	depends on I2C
+	help
+	  Say yes here to build support for Bosch Sensortec BMP085,
+	  digital barometer sensor.
drivers/staging/iio/barometer/Makefile new file +5 -0
new file mode 100644
index 0000000..3234d96
@@ -0,0 +1,5 @@
+#
+# Makefile for digital barometer sensor drivers
+#
+
+obj-$(CONFIG_BMP085) += bmp085.o
drivers/staging/iio/barometer/baro.h new file +8 -0
new file mode 100644
index 0000000..e3b73a1
@@ -0,0 +1,8 @@
+
+#include "../sysfs.h"
+
+/* Barometer types of attribute */
+
+#define IIO_DEV_ATTR_BARO_PRESSURE(_mode, _show, _store, _addr)	\
+	IIO_DEVICE_ATTR(baro_pressure, _mode, _show, NULL, _addr)
+
drivers/staging/iio/barometer/bmp085.c new file +418 -0

418 lines not on this page · raw message

drivers/staging/iio/barometer/bmp085.h new file +73 -0

73 lines not on this page · raw message

Signature · 1 line
1.5.6.5
#1 lore raw
Quoted 6 lines · Matthias Brugger

This patch adds:
- digital barometer support to the iio subsytem
- Bosch Sensortec bmp085 driver

I resend the patches I sent yesterday, because I merged them to one.
Also the comments and the define has been deleted and so, from my point of view is ready to merge.

One quick comment about patch submissions in general. When it's an updated version of a previously posted patch, the title should be something like [PATCH V2] iio - add barometer bmp085. Makes it easy down the line to make sure you have the right patch!.

To sumarise the important inline comments:

As a general rule, if you know the size of the storage of a give value (because it is comming from hardware) it is better to use fixed sized types. u16 and friends. It's way too unpredictable how large a long or a short might be.

Don't eat errors.

All channel naming must have either _raw or _input on the end of the direct read attributes so we know whether it is already in SI units.

Mostly fine, but various comments inline.

Thanks,

Jonathan

Quoted 73 lines
---
 drivers/staging/iio/Kconfig            |    1 +
 drivers/staging/iio/Makefile           |    1 +
 drivers/staging/iio/barometer/Kconfig  |   12 +
 drivers/staging/iio/barometer/Makefile |    5 +
 drivers/staging/iio/barometer/baro.h   |    8 +
 drivers/staging/iio/barometer/bmp085.c |  418 ++++++++++++++++++++++++++++++++
 drivers/staging/iio/barometer/bmp085.h |   73 ++++++
 7 files changed, 518 insertions(+), 0 deletions(-)
 create mode 100644 drivers/staging/iio/barometer/Kconfig
 create mode 100644 drivers/staging/iio/barometer/Makefile
 create mode 100644 drivers/staging/iio/barometer/baro.h
 create mode 100644 drivers/staging/iio/barometer/bmp085.c
 create mode 100644 drivers/staging/iio/barometer/bmp085.h
drivers/staging/iio/Kconfig +1 -0
index ed48815..d5ca09a 100644
@@ -46,6 +46,7 @@ source "drivers/staging/iio/gyro/Kconfig"
 source "drivers/staging/iio/imu/Kconfig"
 source "drivers/staging/iio/light/Kconfig"
 source "drivers/staging/iio/magnetometer/Kconfig"
+source "drivers/staging/iio/barometer/Kconfig"
 
 source "drivers/staging/iio/trigger/Kconfig"
 
drivers/staging/iio/Makefile +1 -0
index e909674..73112b2 100644
@@ -16,3 +16,4 @@ obj-y += imu/
 obj-y += light/
 obj-y += trigger/
 obj-y += magnetometer/
+obj-y += barometer/
drivers/staging/iio/barometer/Kconfig new file +12 -0
new file mode 100644
index 0000000..d5942e9
@@ -0,0 +1,12 @@
+#
+# IIO Digital Barometer Sensor drivers configuration
+#
+comment "Digital barometer sensors"
+
+config BMP085
+
+	tristate "BMP085 Barometer Sensor I2C driver"
+	depends on I2C
+	help
+	  Say yes here to build support for Bosch Sensortec BMP085,
+	  digital barometer sensor.
drivers/staging/iio/barometer/Makefile new file +5 -0
new file mode 100644
index 0000000..3234d96
@@ -0,0 +1,5 @@
+#
+# Makefile for digital barometer sensor drivers
+#
+
+obj-$(CONFIG_BMP085) += bmp085.o
drivers/staging/iio/barometer/baro.h new file +0 -0
new file mode 100644
index 0000000..e3b73a1

drivers/staging/iio/barometer/baro.h line 7

Quoted 7 lines
drivers/staging/iio/barometer/baro.h new file +7 -0
@@ -0,0 +1,8 @@
+
+#include "../sysfs.h"
+
+/* Barometer types of attribute */
+
+#define IIO_DEV_ATTR_BARO_PRESSURE(_mode, _show, _store, _addr)	\
+	IIO_DEVICE_ATTR(baro_pressure, _mode, _show, NULL, _addr)

If it's processed (i.e. si units) it needs to be baro_pressure_input. If raw it needs to be baro_pressure_raw and conversion factors etc provided.

Quoted 34 lines
drivers/staging/iio/barometer/baro.h new file +1 -0
+
drivers/staging/iio/barometer/bmp085.c new file +27 -0
new file mode 100644
index 0000000..67dac39
@@ -0,0 +1,418 @@
+/**
+ * Bosch Sensortec BMP085 Digital Pressure Sensor
+ *
+ * Written by: Matthias Brugger <[email protected]>
+ *
+ * Copyright (C) 2010 Fraunhofer Institute for Integrated Circuits
+ *
+ * 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.,
+ * 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+ */
+
+#include <linux/module.h>
+#include <linux/init.h>
+#include <linux/slab.h>
+#include <linux/i2c.h>

drivers/staging/iio/barometer/bmp085.c line 37

Quoted 10 lines
drivers/staging/iio/barometer/bmp085.c new file +10 -0
+#include <linux/mutex.h>
+#include <linux/delay.h>
+#include <linux/time.h>
+#include <linux/mutex.h>
+
+#include "bmp085.h"
+
+int oss = 3;
+module_param(oss, int , S_IRUSR);
+MODULE_PARM_DESC(oss, "Oversampling setting [0-3]");

Not convinced this should be a module parameter. Better to use a combination of board config (for default on a given board) and appropriate sysfs attribute to allow it to be changed. Still, fine for initial merge, we can change this later.

drivers/staging/iio/barometer/bmp085.c line 40

Quoted 3 lines
drivers/staging/iio/barometer/bmp085.c new file +3 -0
+
+/**************************************************************************
+ * Calcualtion of temperature and pressure

Typo Calcualtion -> Calculation.

Quoted 42 lines
drivers/staging/iio/barometer/bmp085.c new file +42 -0
+ **************************************************************************/
+static short bmp085_calc_temperature(struct i2c_client *client,
+	       unsigned long ut)
+{
+	struct bmp085_data *data = i2c_get_clientdata(client);
+	long x1, x2;
+	short temp;
+
+	x1 = ((long) ut - (long) data->ac6) * (long) data->ac5 >> 15;
+	x2 = ((long) data->mc << 11) / (x1 + data->md);
+	data->b5 = x1 + x2;
+	temp = ((data->b5 + 8) >> 4);
+
+	return temp;
+}
+
+static long bmp085_calc_pressure(struct i2c_client *client, unsigned long up)
+{
+	struct bmp085_data *data = i2c_get_clientdata(client);
+	long b6, x1, x2, x3, b3;
+	unsigned long b4, b7;
+	long pressure, p;
+	long tmp;
+
+	b6 = data->b5 - 4000;
+	x1 = (data->b2 * (b6 * b6 / (1<<12))) / (1<<11);
+	x2 = data->ac2 * b6 / (1<<11);
+	x3 = x1 + x2;
+	b3 = (((data->ac1 * 4 + x3) << data->oss) + 2) / 4;
+
+	x1 = data->ac3 * b6 / (1<<13);
+	x2 = (data->b1 * ((b6 * b6) / (1<<12))) / (1<<16);
+	x3 = ((x1 + x2) + 2) / (1<<2);
+	b4 = data->ac4 * (unsigned long) (x3 + 32768) / (1<<15);
+	b7 = ((unsigned long)up - b3) * (50000 >> data->oss);
+
+	if (b7 < 0x80000000)
+		p = (b7 * 2) / b4;
+	else
+		p = (b7 / b4) * 2;
+	tmp = (p / (1<<8)) * (p / (1<<8));
+	x1 = (tmp * 3038) / (1<<16);

drivers/staging/iio/barometer/bmp085.c line 92

Quoted 10 lines
drivers/staging/iio/barometer/bmp085.c new file +10 -0
+	x2 = (-7357 * p) / (1<<16);
+	pressure = p + ((x1 + x2 + 3791) / (1<<4));
+
+	return pressure;
+}
+
+/**************************************************************************
+ * Digital interface to sensor
+ **************************************************************************/
+

This is an extremely slim function. I think it would be easier to remove it and just ahve the i2c_block_data function inline in the code.

drivers/staging/iio/barometer/bmp085.c line 98

Quoted 6 lines
drivers/staging/iio/barometer/bmp085.c new file +6 -0
+static ssize_t bmp085_read(struct i2c_client *client, u8 reg, size_t count,
+	       unsigned char *buffer)
+{
+	int rc;
+	rc = i2c_smbus_read_i2c_block_data(client, reg, count, buffer);
+	if (rc < 0)

No. Pass the error that came out of the i2c command on. Never eat an error as you just reduce the information available.

Quoted 11 lines
drivers/staging/iio/barometer/bmp085.c new file +11 -0
+			return -EIO;
+
+	return count;
+}
+
+static short bmp085_read_temp(struct i2c_client *client)
+{
+	s32 ret;
+	short temp;
+	struct bmp085_data *data = i2c_get_clientdata(client);
+

drivers/staging/iio/barometer/bmp085.c line 119

Quoted 10 lines
drivers/staging/iio/barometer/bmp085.c new file +10 -0
+	mutex_lock(&data->bmp085_lock);
+	ret = i2c_smbus_write_byte_data(client, BMP085_START_CONV,
+		       BMP085_START_TEMP);
+	mutex_unlock(&data->bmp085_lock);
+	if (ret < 0) {
+		dev_warn(&client->dev, "starting temperature conversation "
+			       "failed\n");
+		return ret;
+	}
+

probably msleep.

Quoted 12 lines
drivers/staging/iio/barometer/bmp085.c new file +12 -0
+	mdelay(5);
+	ret = bmp085_read(client, BMP085_REG_CONV, 2, data->data);
+	if (ret < 0) {
+		dev_warn(&client->dev, "reading ut failed, value is %#x\n"
+				, ret);
+		return ret;
+	}
+
+	data->ut = (data->data[0] << 8) | data->data[1];
+
+	temp = bmp085_calc_temperature(client, data->ut);
+

drivers/staging/iio/barometer/bmp085.c line 141

Quoted 10 lines
drivers/staging/iio/barometer/bmp085.c new file +10 -0
+	return temp;
+}
+
+static long bmp085_read_pressure(struct i2c_client *client)
+{
+	unsigned long up = 0;
+	int ret;
+	u8 xlsb, ret1, ret2;
+	long pressure;
+	u8 reg;

Don't worry about the todo. Overshooting on this isn't going to greatly change your possible read rate.

Quoted 14 lines
drivers/staging/iio/barometer/bmp085.c new file +14 -0
+	/* TODO should be 4.5, 7.5, 13.5, 25.5 ms */
+	int time_delay[4] = {5, 8, 14, 26};
+	struct bmp085_data *data = i2c_get_clientdata(client);
+
+	if (data->oss == 0)
+		reg = BMP085_START_PRESS_OSRS0;
+	else if (data->oss == 1)
+		reg = BMP085_START_PRESS_OSRS1;
+	else if (data->oss == 2)
+		reg = BMP085_START_PRESS_OSRS2;
+	else if (data->oss == 3)
+		reg = BMP085_START_PRESS_OSRS3;
+	else {
+		dev_warn(&client->dev, "undefined oss value, use oss = 0\n");

drivers/staging/iio/barometer/bmp085.c line 165

Quoted 10 lines
drivers/staging/iio/barometer/bmp085.c new file +10 -0
+		data->oss = 0;
+		reg = BMP085_START_PRESS_OSRS0;
+	}
+
+	mutex_lock(&data->bmp085_lock);
+	ret = i2c_smbus_write_byte_data(client, BMP085_START_CONV, reg);
+	mutex_unlock(&data->bmp085_lock);
+	if (ret < 0)
+		return ret;
+

Does this need to be that precise? If not an msleep would be a better bet to allow the system to get on with something else.

drivers/staging/iio/barometer/bmp085.c line 178

Quoted 13 lines
drivers/staging/iio/barometer/bmp085.c new file +13 -0
+	mdelay(time_delay[data->oss]);
+
+	mutex_lock(&data->bmp085_lock);
+	ret1 = i2c_smbus_read_byte_data(client, 0xf6);
+	ret2 = i2c_smbus_read_byte_data(client, 0xf7);
+	xlsb = i2c_smbus_read_byte_data(client, 0xf8);
+	mutex_unlock(&data->bmp085_lock);
+
+	up = (((unsigned long) ret1 << 16) | ((unsigned long) ret2 << 8)
+				| (unsigned long) xlsb) >> (8 - data->oss);
+	data->up = up;
+
+	pressure = bmp085_calc_pressure(client, up);

Why cache the pressure?

Quoted 20 lines
drivers/staging/iio/barometer/bmp085.c new file +20 -0
+	data->pressure = pressure;
+
+	return pressure;
+}
+
+/**************************************************************************
+ * sysfs attributes
+ **************************************************************************/
+static ssize_t barometer_show_temp(struct device *dev,
+		struct device_attribute *da, char *buf)
+{
+	struct iio_dev *indio_dev = dev_get_drvdata(dev);
+	struct bmp085_data *data = indio_dev->dev_data;
+	struct i2c_client *client = data->client;
+	long status;
+
+	status = bmp085_read_temp(client);
+	if (status < 0)
+		dev_warn(&client->dev, "error reading temperature: %ld\n",
+				status);

drivers/staging/iio/barometer/bmp085.c line 208

Quoted 10 lines
drivers/staging/iio/barometer/bmp085.c new file +10 -0
+
+	data->temp = status;
+
+	return sprintf(buf, "%ld\n", data->temp);
+}
+static IIO_DEV_ATTR_TEMP_RAW(barometer_show_temp);
+
+/**
+ * In standard mode, the temperature has to be reat every second before the
+ * pressure can be reat. We leave this semantics to the userspace, if later

past tense of read is infact read not reat.

drivers/staging/iio/barometer/bmp085.c line 210

Quoted 2 lines
drivers/staging/iio/barometer/bmp085.c new file +2 -0
+ * on a trigger based reading will be implemented, this should be taken into
+ * account.

Ouch, that's an uggly requirement.

drivers/staging/iio/barometer/bmp085.c line 223

Quoted 13 lines
drivers/staging/iio/barometer/bmp085.c new file +13 -0
+ */
+static ssize_t barometer_show_pressure(struct device *dev,
+		struct device_attribute *da, char *buf)
+{
+	struct iio_dev *indio_dev = dev_get_drvdata(dev);
+	struct bmp085_data *data = indio_dev->dev_data;
+	struct i2c_client *client = data->client;
+	long status;
+
+	status = bmp085_read_pressure(client);
+	if (status < 0)
+		dev_warn(&client->dev, "error reading pressure: %ld\n", status);
+

Why cache the preesure?

drivers/staging/iio/barometer/bmp085.c line 234

Quoted 11 lines
drivers/staging/iio/barometer/bmp085.c new file +11 -0
+	data->pressure = status;
+
+	return sprintf(buf, "%ld\n", data->pressure);
+}
+static IIO_DEV_ATTR_BARO_PRESSURE(S_IRUGO, barometer_show_pressure, NULL, 0);
+
+static ssize_t barometer_show_id_version(struct device *dev,
+		struct device_attribute *da, char *buf)
+{
+	struct iio_dev *indio_dev = dev_get_drvdata(dev);
+	struct bmp085_data *data = indio_dev->dev_data;

Doesn't really matter, but we do have a helper function for this (and at somepoint I'll clean all the direct reads out of the tree) struct bmp085_data *data = iio_dev_get_devdata(indio_dev);

drivers/staging/iio/barometer/bmp085.c line 247

Quoted 13 lines
drivers/staging/iio/barometer/bmp085.c new file +13 -0
+
+	return sprintf(buf, "%x_%x\n", data->chip_id, data->chip_version);
+}
+static IIO_DEV_ATTR_REV(barometer_show_id_version);
+
+static ssize_t barometer_show_oss(struct device *dev,
+		struct device_attribute *da, char *buf)
+{
+	struct iio_dev *indio_dev = dev_get_drvdata(dev);
+	struct bmp085_data *data = indio_dev->dev_data;
+
+	return sprintf(buf, "%d\n", data->oss);
+}

So is oss (which is sampling frequency) either 1Hz or 2Hz?
(I haven't looked at datasheet but under the abi that's what this is giving us).

drivers/staging/iio/barometer/bmp085.c line 250

Quoted 3 lines
drivers/staging/iio/barometer/bmp085.c new file +3 -0
+static IIO_DEV_ATTR_SAMP_FREQ(S_IRUGO, barometer_show_oss, NULL);
+
+static IIO_CONST_ATTR_TEMP_SCALE("0.1");

No real problem with this. Personally I'd probably just do the trivial amount of fixed point arithmetic in the temperature output.

sprintf(buf, "%d.%d\n", temp/10, temp%10);

Quoted 43 lines
drivers/staging/iio/barometer/bmp085.c new file +43 -0
+
+static struct attribute *bmp085_attributes[] = {
+	&iio_dev_attr_temp_raw.dev_attr.attr,
+	&iio_dev_attr_baro_pressure.dev_attr.attr,
+	&iio_dev_attr_revision.dev_attr.attr,
+	&iio_dev_attr_sampling_frequency.dev_attr.attr,
+	&iio_const_attr_temp_scale.dev_attr.attr,
+	NULL
+};
+
+static const struct attribute_group bmp085_attr_group = {
+	.attrs = bmp085_attributes,
+};
+
+/**************************************************************************
+ * Calibration data processing
+ **************************************************************************/
+
+static int bmp085_init_client(struct i2c_client *client)
+{
+	struct bmp085_data *data = i2c_get_clientdata(client);
+	int i;
+
+	i = bmp085_read(client, BMP085_REG_CHIP_ID, 1, &data->chip_id);
+	if (i < 0)
+		dev_warn(&client->dev, "Chip ID not read\n");
+
+	i = bmp085_read(client, BMP085_REG_VERSION, 1, &data->chip_version);
+	if (i < 0)
+		dev_warn(&client->dev, "Version not read\n");
+
+	i = bmp085_read(client, BMP085_REG_PROM, BMP085_PROM_LENGTH,
+			data->data);
+	if (i < 0)
+		dev_warn(&client->dev, "Unable to read %d bytes from address "
+				"%#x\n", BMP085_PROM_LENGTH, BMP085_REG_PROM);
+
+	data->ac1 = (data->data[0] << 8) | data->data[1];
+	data->ac2 = (data->data[2] << 8) | data->data[3];
+	data->ac3 = (data->data[4] << 8) | data->data[5];
+	data->ac4 = (data->data[6] << 8) | data->data[7];
+	data->ac5 = (data->data[8] << 8) | data->data[9];
+	data->ac6 = (data->data[10] << 8) | data->data[11];

drivers/staging/iio/barometer/bmp085.c line 303

Quoted 10 lines
drivers/staging/iio/barometer/bmp085.c new file +10 -0
+	data->b1 = (data->data[12] << 8) | data->data[13];
+	data->b2 = (data->data[14] << 8) | data->data[15];
+	data->mb = (data->data[16] << 8) | data->data[17];
+	data->mc = (data->data[18] << 8) | data->data[19];
+	data->md = (data->data[20] << 8) | data->data[21];
+
+	return 0;
+}
+
+static struct i2c_driver bmp085_drv;

Why is this here?

Quoted 16 lines
drivers/staging/iio/barometer/bmp085.c new file +16 -0
+static int bmp085_probe(struct i2c_client *client,
+		const struct i2c_device_id *id)
+{
+	struct i2c_adapter *adapter = to_i2c_adapter(client->dev.parent);
+	struct bmp085_data *data;
+	struct bmp085_data *data2;
+	int status = 0;
+
+	if (!i2c_check_functionality(adapter, I2C_FUNC_SMBUS_BYTE_DATA |
+				I2C_FUNC_SMBUS_WORD_DATA))
+		return -EIO;
+
+	/* Allocate driver data */
+	data = kzalloc(sizeof(struct bmp085_data), GFP_KERNEL);
+	if (!data)
+		return -ENOMEM;

drivers/staging/iio/barometer/bmp085.c line 329

Quoted 10 lines
drivers/staging/iio/barometer/bmp085.c new file +10 -0
+
+	if ((oss < 0) || (oss > 3)) {
+		status = -EINVAL;
+		goto err;
+	}
+	data->oss = oss;
+
+	data->client = client;
+	i2c_set_clientdata(client, data);
+	data2 = i2c_get_clientdata(client);

Guessing the above is dead debug code?

drivers/staging/iio/barometer/bmp085.c line 334

Quoted 5 lines
drivers/staging/iio/barometer/bmp085.c new file +5 -0
+
+	/* Initialize the BMP085 chip */
+	bmp085_init_client(client);
+
+	__mutex_init(&data->bmp085_lock, "bmp085_lock", NULL);

Why the underscore form? I've not seen this before.

Quoted 8 lines
drivers/staging/iio/barometer/bmp085.c new file +8 -0
+
+	/* Register with IIO */
+	data->indio_dev = iio_allocate_device();
+	if (data->indio_dev == NULL) {
+		status = -ENOMEM;
+		goto err;
+	}
+

drivers/staging/iio/barometer/bmp085.c line 352

Quoted 10 lines
drivers/staging/iio/barometer/bmp085.c new file +10 -0
+	data->indio_dev->dev.parent = &client->dev;
+	data->indio_dev->attrs = &bmp085_attr_group;
+	data->indio_dev->dev_data = (void *)(data);
+	data->indio_dev->driver_module = THIS_MODULE;
+	data->indio_dev->modes = INDIO_DIRECT_MODE;
+
+	status = iio_device_register(data->indio_dev);
+	if (status < 0)
+		goto err_iio;
+

Remove this as it's not needed.

Quoted 7 lines
drivers/staging/iio/barometer/bmp085.c new file +7 -0
+	dev_info(&client->dev, "driver enabled\n");
+
+	return 0;
+
+err_iio:
+	kfree(data->indio_dev);
+err:

drivers/staging/iio/barometer/bmp085.c line 369

Quoted 10 lines
drivers/staging/iio/barometer/bmp085.c new file +10 -0
+	kfree(data);
+	return status;
+}
+
+static int __devexit bmp085_remove(struct i2c_client *client)
+{
+	struct bmp085_data *data = i2c_get_clientdata(client);
+
+	if (mutex_is_locked(&data->bmp085_lock))
+		mutex_unlock(&data->bmp085_lock);

Something weird is occuring if you can get here without the lock being unlocked.

Quoted 23 lines
drivers/staging/iio/barometer/bmp085.c new file +23 -0
+
+	iio_device_unregister(data->indio_dev);
+	iio_free_device(data->indio_dev);
+
+	kfree(data);
+
+	dev_info(&client->dev, "driver removed\n");
+
+	return 0;
+}
+
+static const struct i2c_device_id bmp085_id[] = {
+	{ "bmp085", 0 },
+	{}
+};
+MODULE_DEVICE_TABLE(i2c, bmp085_id);
+
+static struct i2c_driver bmp085_drv = {
+	.driver = {
+		.name =  "bmp085",
+		.owner = THIS_MODULE,
+	},
+	.suspend = NULL,

drivers/staging/iio/barometer/bmp085.c line 402

Quoted 10 lines
drivers/staging/iio/barometer/bmp085.c new file +10 -0
+	.resume = NULL,
+	.probe = bmp085_probe,
+	.remove = __devexit_p(bmp085_remove),
+	.id_table = bmp085_id,
+};
+
+/*-------------------------------------------------------------------------*/
+
+static int __init bmp085_init_module(void)
+{

Get rid of tis debug.

Quoted 49 lines
drivers/staging/iio/barometer/bmp085.c new file +16 -0
+	printk(KERN_INFO"bmp085 loading...\n");
+
+	return i2c_add_driver(&bmp085_drv);
+}
+
+static void __exit bmp085_exit_module(void)
+{
+	i2c_del_driver(&bmp085_drv);
+}
+
+MODULE_AUTHOR("Matthias Brugger <[email protected]>");
+MODULE_DESCRIPTION("I2c device driver for BMP085 barometererator sensor");
+MODULE_LICENSE("GPL");
+
+module_init(bmp085_init_module);
+module_exit(bmp085_exit_module);
drivers/staging/iio/barometer/bmp085.h new file +27 -0
new file mode 100644
index 0000000..5ed2fb1
@@ -0,0 +1,73 @@
+#ifndef BMP085_H
+#define BMP085_H
+
+#include "../iio.h"
+#include "baro.h"
+
+#define BMP085_REG_CONV		0xF6 /* Temperature/pressure value UT or UP */
+#define BMP085_REG_CONV_XLS	0xF8
+
+#define BMP085_REG_PROM		0xAA
+#define BMP085_PROM_LENGTH	22
+
+#define BMP085_REG_AC1		0xAA
+#define BMP085_REG_AC2		0xAC
+#define BMP085_REG_AC3		0xAE
+#define BMP085_REG_AC4		0xB0
+#define BMP085_REG_AC5		0xB2
+#define BMP085_REG_AC6		0xB4
+#define BMP085_REG_B1		0xB6
+#define BMP085_REG_B2		0xB8
+#define BMP085_REG_MB		0xBA
+#define BMP085_REG_MC		0xBC
+#define BMP085_REG_MD		0xBE
+
+#define BMP085_START_CONV	0xF4
+
+#define BMP085_START_TEMP	0x2E  /* wait 4.5 ms */

drivers/staging/iio/barometer/bmp085.h line 37

Quoted 10 lines
drivers/staging/iio/barometer/bmp085.h new file +10 -0
+
+#define BMP085_START_PRESS_OSRS0 0x34 /* wait 4.5 ms */
+#define BMP085_START_PRESS_OSRS1 0x74 /* wait 7.5 ms */
+#define BMP085_START_PRESS_OSRS2 0xB4 /* wait 13.5 ms */
+#define BMP085_START_PRESS_OSRS3 0xF4 /* wait 25.5 ms */
+
+#define BMP085_REG_CHIP_ID	0xD0
+#define BMP085_REG_VERSION	0xD1
+#define BMP085_CHIP_ID		0x55
+

Ideally this structure would have some documentation (kernel doc) to make reviewing the driver easier.

drivers/staging/iio/barometer/bmp085.h line 45

Quoted 8 lines
drivers/staging/iio/barometer/bmp085.h new file +8 -0
+struct bmp085_data {
+	struct i2c_client *client;
+	struct iio_dev *indio_dev;
+
+	struct mutex bmp085_lock;
+
+	int oss;
+	long temp;

Why long? Looking at the code this always looks to be 16 bit to me, so s16 would be more appropraite.

Quoted 28 lines
drivers/staging/iio/barometer/bmp085.h new file +28 -0
+	long pressure;
+
+	short ac1;
+	short ac2;
+	short ac3;
+	unsigned short ac4;
+	unsigned short ac5;
+	unsigned short ac6;
+
+	short b1;
+	short b2;
+	long b5;
+
+	short mb;
+	short mc;
+	short md;
+
+	unsigned long ut;
+	unsigned long up;
+
+	u8 chip_id;
+	u8 chip_version;
+
+	unsigned char data[22];
+};
+
+
+#endif
#2 lore raw
Quoted 11 lines

-----Original Message-----
From: [email protected] [mailto:linux-iio- [email protected]] On Behalf Of Jonathan Cameron
Sent: Friday, October 15, 2010 3:51 PM
To: Matthias Brugger
Cc: [email protected]; matthias
Subject: Re: [PATCH] iio - add barometer bmp085

On 10/15/10 10:16, Matthias Brugger wrote:

Quoted 8 lines
Quoted 6 lines

This patch adds:
- digital barometer support to the iio subsytem
- Bosch Sensortec bmp085 driver

I resend the patches I sent yesterday, because I merged them to one. Also the comments and the define has been deleted and so, from my point

of view is ready to merge.
One quick comment about patch submissions in general. When it's an update=

d

Quoted 12 lines

version of a previously posted patch, the title should be something like [PATCH V2] iio - add barometer bmp085. Makes it easy down the line to make
sure you have the right patch!.

To sumarise the important inline comments:

As a general rule, if you know the size of the storage of a give value (because it is comming from hardware) it is better to use fixed sized types. u16 and friends. It's way too unpredictable how large a long or a short might be.

Quoted 6 lines

Don't eat errors.

All channel naming must have either _raw or _input on the end of the direct read attributes so we know whether it is already in SI units.

Mostly fine, but various comments inline.

Some of the comments are fixed in the following you may want to see Drivers/misc/bmp085.c.

Some of the points
1. You may solve the dependency of the pressure needing the temperature by = triggering the temperature measurement.
2. Secondly I personally prefer the temperature reported in milli units. However that will standardize various. Also solves the decimal point issue.

However I am OK with your take.

3. I appreciate your attempts to make it an IIO as I think it may make it m= ore futuristic.

Quoted 33 lines

Thanks,

Jonathan

Quoted 9 lines
---
 drivers/staging/iio/Kconfig            |    1 +
 drivers/staging/iio/Makefile           |    1 +
 drivers/staging/iio/barometer/Kconfig  |   12 +
 drivers/staging/iio/barometer/Makefile |    5 +
 drivers/staging/iio/barometer/baro.h   |    8 +
 drivers/staging/iio/barometer/bmp085.c |  418

++++++++++++++++++++++++++++++++

Quoted 18 lines
 drivers/staging/iio/barometer/bmp085.h |   73 ++++++
 7 files changed, 518 insertions(+), 0 deletions(-)
 create mode 100644 drivers/staging/iio/barometer/Kconfig
 create mode 100644 drivers/staging/iio/barometer/Makefile
 create mode 100644 drivers/staging/iio/barometer/baro.h
 create mode 100644 drivers/staging/iio/barometer/bmp085.c
 create mode 100644 drivers/staging/iio/barometer/bmp085.h
drivers/staging/iio/Kconfig +1 -0
index ed48815..d5ca09a 100644
@@ -46,6 +46,7 @@ source "drivers/staging/iio/gyro/Kconfig"
 source "drivers/staging/iio/imu/Kconfig"
 source "drivers/staging/iio/light/Kconfig"
 source "drivers/staging/iio/magnetometer/Kconfig"
+source "drivers/staging/iio/barometer/Kconfig"
 
Quoted 3 lines

drivers/staging/iio/Makefil=

Quoted 3 lines
drivers/staging/iio/Kconfig +0 -0
 source "drivers/staging/iio/trigger/Kconfig"
 
drivers/staging/iio/Makefil= renamed from drivers/staging/iio/Makefile +0 -0

e

Quoted 59 lines

Review

Quoted 9 lines

index e909674..73112b2 100644

drivers/staging/iio/Makefile +1 -0
@@ -16,3 +16,4 @@ obj-y +=3D imu/
 obj-y +=3D light/
 obj-y +=3D trigger/
 obj-y +=3D magnetometer/
+obj-y +=3D barometer/
(quoted diff) +0 -0

b/drivers/staging/iio/barometer/Kconfig

Review

Quoted 18 lines

new file mode 100644
index 0000000..d5942e9

drivers/staging/iio/barometer/Kconfig new file +12 -0
@@ -0,0 +1,12 @@
+#
+# IIO Digital Barometer Sensor drivers configuration
+#
+comment "Digital barometer sensors"
+
+config BMP085
+
+   tristate "BMP085 Barometer Sensor I2C driver"
+   depends on I2C
+   help
+     Say yes here to build support for Bosch Sensortec BMP085,
+     digital barometer sensor.
(quoted diff) +0 -0

b/drivers/staging/iio/barometer/Makefile

Review

Quoted 11 lines

new file mode 100644
index 0000000..3234d96

drivers/staging/iio/barometer/Makefile new file +5 -0
@@ -0,0 +1,5 @@
+#
+# Makefile for digital barometer sensor drivers
+#
+
+obj-$(CONFIG_BMP085) +=3D bmp085.o
(quoted diff) +0 -0

b/drivers/staging/iio/barometer/baro.h

drivers/staging/iio/barometer/baro.h line 7

Quoted 12 lines

new file mode 100644
index 0000000..e3b73a1

drivers/staging/iio/barometer/baro.h new file +7 -0
@@ -0,0 +1,8 @@
+
+#include "../sysfs.h"
+
+/* Barometer types of attribute */
+
+#define IIO_DEV_ATTR_BARO_PRESSURE(_mode, _show, _store, _addr)    \
+   IIO_DEVICE_ATTR(baro_pressure, _mode, _show, NULL, _addr)

If it's processed (i.e. si units) it needs to be baro_pressure_input. If raw it needs to be baro_pressure_raw and conversion factors etc provided.

Review

Quoted 2 lines
drivers/staging/iio/barometer/baro.h new file +1 -0
+
(quoted diff) +0 -0

b/drivers/staging/iio/barometer/bmp085.c

Quoted 13 lines

drivers/staging/iio/barometer/bmp085.c line 8

Quoted 13 lines

new file mode 100644
index 0000000..67dac39

drivers/staging/iio/barometer/bmp085.c new file +8 -0
@@ -0,0 +1,418 @@
+/**
+ * Bosch Sensortec BMP085 Digital Pressure Sensor
+ *
+ * Written by: Matthias Brugger <[email protected]>
+ *
+ * Copyright (C) 2010 Fraunhofer Institute for Integrated Circuits
+ *
+ * This program is free software; you can redistribute it and/or modif=

y

Quoted 1 line

drivers/staging/iio/barometer/bmp085.c line 9

Quoted 1 line
drivers/staging/iio/barometer/bmp085.c new file +1 -0
+ * it under the terms of the GNU General Public License as published b=

y

Quoted 35 lines
Quoted 18 lines
drivers/staging/iio/barometer/bmp085.c new file +18 -0
+ * 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.,
+ * 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+ */
+
+#include <linux/module.h>
+#include <linux/init.h>
+#include <linux/slab.h>
+#include <linux/i2c.h>

drivers/staging/iio/barometer/bmp085.c line 37

Quoted 10 lines
drivers/staging/iio/barometer/bmp085.c new file +10 -0
+#include <linux/mutex.h>
+#include <linux/delay.h>
+#include <linux/time.h>
+#include <linux/mutex.h>
+
+#include "bmp085.h"
+
+int oss =3D 3;
+module_param(oss, int , S_IRUSR);
+MODULE_PARM_DESC(oss, "Oversampling setting [0-3]");

Not convinced this should be a module parameter. Better to use a combination
of board config (for default on a given board) and appropriate sysfs attribute
to allow it to be changed. Still, fine for initial merge, we can change this
later.

Quoted 3 lines

drivers/staging/iio/barometer/bmp085.c line 38

Quoted 2 lines
drivers/staging/iio/barometer/bmp085.c new file +1 -0
+

+/***********************************************************************=

*

Quoted 5 lines

**

drivers/staging/iio/barometer/bmp085.c line 40

Quoted 1 line
drivers/staging/iio/barometer/bmp085.c new file +1 -0
+ * Calcualtion of temperature and pressure

Typo Calcualtion -> Calculation.

drivers/staging/iio/barometer/bmp085.c line 40

Quoted 1 line
drivers/staging/iio/barometer/bmp085.c new file +1 -0
+

*************************************************************************=

*

Quoted 43 lines

/

Quoted 6 lines
drivers/staging/iio/barometer/bmp085.c new file +6 -0
+static short bmp085_calc_temperature(struct i2c_client *client,
+          unsigned long ut)
+{
+   struct bmp085_data *data =3D i2c_get_clientdata(client);
+   long x1, x2;
+   short temp;

drivers/staging/iio/barometer/bmp085.c

Quoted 10 lines
drivers/staging/iio/barometer/bmp085.c new file +10 -0
+
+   x1 =3D ((long) ut - (long) data->ac6) * (long) data->ac5 >> 15;
+   x2 =3D ((long) data->mc << 11) / (x1 + data->md);
+   data->b5 =3D x1 + x2;
+   temp =3D ((data->b5 + 8) >> 4);
+
+   return temp;
+}
+
+static long bmp085_calc_pressure(struct i2c_client *client, unsigned

long up)

Quoted 25 lines
drivers/staging/iio/barometer/bmp085.c new file +25 -0
+{
+   struct bmp085_data *data =3D i2c_get_clientdata(client);
+   long b6, x1, x2, x3, b3;
+   unsigned long b4, b7;
+   long pressure, p;
+   long tmp;
+
+   b6 =3D data->b5 - 4000;
+   x1 =3D (data->b2 * (b6 * b6 / (1<<12))) / (1<<11);
+   x2 =3D data->ac2 * b6 / (1<<11);
+   x3 =3D x1 + x2;
+   b3 =3D (((data->ac1 * 4 + x3) << data->oss) + 2) / 4;
+
+   x1 =3D data->ac3 * b6 / (1<<13);
+   x2 =3D (data->b1 * ((b6 * b6) / (1<<12))) / (1<<16);
+   x3 =3D ((x1 + x2) + 2) / (1<<2);
+   b4 =3D data->ac4 * (unsigned long) (x3 + 32768) / (1<<15);
+   b7 =3D ((unsigned long)up - b3) * (50000 >> data->oss);
+
+   if (b7 < 0x80000000)
+           p =3D (b7 * 2) / b4;
+   else
+           p =3D (b7 / b4) * 2;
+   tmp =3D (p / (1<<8)) * (p / (1<<8));
+   x1 =3D (tmp * 3038) / (1<<16);
Quoted 8 lines

drivers/staging/iio/barometer/bmp085.c line 88

Quoted 7 lines
drivers/staging/iio/barometer/bmp085.c new file +6 -0
+   x2 =3D (-7357 * p) / (1<<16);
+   pressure =3D p + ((x1 + x2 + 3791) / (1<<4));
+
+   return pressure;
+}
+

+/***********************************************************************=

*

Quoted 4 lines

**

drivers/staging/iio/barometer/bmp085.c line 89

Quoted 2 lines
drivers/staging/iio/barometer/bmp085.c new file +2 -0
+ * Digital interface to sensor
+

*************************************************************************=

*

Quoted 52 lines

/

drivers/staging/iio/barometer/bmp085.c line 90

Quoted 1 line
drivers/staging/iio/barometer/bmp085.c new file +1 -0
+

This is an extremely slim function. I think it would be easier to remove it and
just ahve the i2c_block_data function inline in the code.

drivers/staging/iio/barometer/bmp085.c line 91

Quoted 1 line
drivers/staging/iio/barometer/bmp085.c new file +1 -0
+static ssize_t bmp085_read(struct i2c_client *client, u8 reg, size_t

count,

drivers/staging/iio/barometer/bmp085.c line 98

Quoted 5 lines
drivers/staging/iio/barometer/bmp085.c new file +5 -0
+          unsigned char *buffer)
+{
+   int rc;
+   rc =3D i2c_smbus_read_i2c_block_data(client, reg, count, buffer);
+   if (rc < 0)

No. Pass the error that came out of the i2c command on. Never eat an error as you just reduce the information available.

Quoted 11 lines
drivers/staging/iio/barometer/bmp085.c new file +11 -0
+                   return -EIO;
+
+   return count;
+}
+
+static short bmp085_read_temp(struct i2c_client *client)
+{
+   s32 ret;
+   short temp;
+   struct bmp085_data *data =3D i2c_get_clientdata(client);
+

drivers/staging/iio/barometer/bmp085.c line 119

Quoted 10 lines
drivers/staging/iio/barometer/bmp085.c new file +10 -0
+   mutex_lock(&data->bmp085_lock);
+   ret =3D i2c_smbus_write_byte_data(client, BMP085_START_CONV,
+                  BMP085_START_TEMP);
+   mutex_unlock(&data->bmp085_lock);
+   if (ret < 0) {
+           dev_warn(&client->dev, "starting temperature conversation "
+                          "failed\n");
+           return ret;
+   }
+

probably msleep.

Quoted 16 lines
drivers/staging/iio/barometer/bmp085.c new file +16 -0
+   mdelay(5);
+   ret =3D bmp085_read(client, BMP085_REG_CONV, 2, data->data);
+   if (ret < 0) {
+           dev_warn(&client->dev, "reading ut failed, value is %#x\n"
+                           , ret);
+           return ret;
+   }
+
+   data->ut =3D (data->data[0] << 8) | data->data[1];
+
+   temp =3D bmp085_calc_temperature(client, data->ut);
+
+   return temp;
+}
+
+static long bmp085_read_pressure(struct i2c_client *client)
Quoted 22 lines

drivers/staging/iio/barometer/bmp085.c line 141

Quoted 6 lines
drivers/staging/iio/barometer/bmp085.c new file +6 -0
+{
+   unsigned long up =3D 0;
+   int ret;
+   u8 xlsb, ret1, ret2;
+   long pressure;
+   u8 reg;

Don't worry about the todo. Overshooting on this isn't going to greatly change your possible read rate.

Quoted 14 lines
drivers/staging/iio/barometer/bmp085.c new file +14 -0
+   /* TODO should be 4.5, 7.5, 13.5, 25.5 ms */
+   int time_delay[4] =3D {5, 8, 14, 26};
+   struct bmp085_data *data =3D i2c_get_clientdata(client);
+
+   if (data->oss =3D=3D 0)
+           reg =3D BMP085_START_PRESS_OSRS0;
+   else if (data->oss =3D=3D 1)
+           reg =3D BMP085_START_PRESS_OSRS1;
+   else if (data->oss =3D=3D 2)
+           reg =3D BMP085_START_PRESS_OSRS2;
+   else if (data->oss =3D=3D 3)
+           reg =3D BMP085_START_PRESS_OSRS3;
+   else {
+           dev_warn(&client->dev, "undefined oss value, use oss =3D 0\=

n");

Quoted 26 lines

drivers/staging/iio/barometer/bmp085.c line 165

Quoted 10 lines
drivers/staging/iio/barometer/bmp085.c new file +10 -0
+           data->oss =3D 0;
+           reg =3D BMP085_START_PRESS_OSRS0;
+   }
+
+   mutex_lock(&data->bmp085_lock);
+   ret =3D i2c_smbus_write_byte_data(client, BMP085_START_CONV, reg);
+   mutex_unlock(&data->bmp085_lock);
+   if (ret < 0)
+           return ret;
+

Does this need to be that precise? If not an msleep would be a better bet to allow the system to get on with something else.

drivers/staging/iio/barometer/bmp085.c

Quoted 13 lines
drivers/staging/iio/barometer/bmp085.c new file +13 -0
+   mdelay(time_delay[data->oss]);
+
+   mutex_lock(&data->bmp085_lock);
+   ret1 =3D i2c_smbus_read_byte_data(client, 0xf6);
+   ret2 =3D i2c_smbus_read_byte_data(client, 0xf7);
+   xlsb =3D i2c_smbus_read_byte_data(client, 0xf8);
+   mutex_unlock(&data->bmp085_lock);
+
+   up =3D (((unsigned long) ret1 << 16) | ((unsigned long) ret2 << 8)
+                           | (unsigned long) xlsb) >> (8 - data->oss);
+   data->up =3D up;
+
+   pressure =3D bmp085_calc_pressure(client, up);

Why cache the pressure?

Quoted 7 lines

drivers/staging/iio/barometer/bmp085.c line 88

Quoted 6 lines
drivers/staging/iio/barometer/bmp085.c new file +5 -0
+   data->pressure =3D pressure;
+
+   return pressure;
+}
+

+/***********************************************************************=

*

Quoted 4 lines

**

drivers/staging/iio/barometer/bmp085.c line 194

Quoted 2 lines
drivers/staging/iio/barometer/bmp085.c new file +2 -0
+ * sysfs attributes
+

*************************************************************************=

*

Quoted 14 lines

/

Quoted 13 lines
drivers/staging/iio/barometer/bmp085.c new file +13 -0
+static ssize_t barometer_show_temp(struct device *dev,
+           struct device_attribute *da, char *buf)
+{
+   struct iio_dev *indio_dev =3D dev_get_drvdata(dev);
+   struct bmp085_data *data =3D indio_dev->dev_data;
+   struct i2c_client *client =3D data->client;
+   long status;
+
+   status =3D bmp085_read_temp(client);
+   if (status < 0)
+           dev_warn(&client->dev, "error reading temperature: %ld\n",
+                           status);
+
Quoted 8 lines

drivers/staging/iio/barometer/bmp085.c

Quoted 8 lines
drivers/staging/iio/barometer/bmp085.c new file +8 -0
+   data->temp =3D status;
+
+   return sprintf(buf, "%ld\n", data->temp);
+}
+static IIO_DEV_ATTR_TEMP_RAW(barometer_show_temp);
+
+/**
+ * In standard mode, the temperature has to be reat every second befor=

e

Quoted 5 lines

the

drivers/staging/iio/barometer/bmp085.c line 205

Quoted 1 line
drivers/staging/iio/barometer/bmp085.c new file +1 -0
+ * pressure can be reat. We leave this semantics to the userspace, if

later
past tense of read is infact read not reat.

Quoted 1 line
drivers/staging/iio/barometer/bmp085.c new file +1 -0
+ * on a trigger based reading will be implemented, this should be take=

n

Quoted 57 lines

into

drivers/staging/iio/barometer/bmp085.c line 210

Quoted 1 line
drivers/staging/iio/barometer/bmp085.c new file +1 -0
+ * account.

Ouch, that's an uggly requirement.

drivers/staging/iio/barometer/bmp085.c

Quoted 12 lines
drivers/staging/iio/barometer/bmp085.c new file +12 -0
+ */
+static ssize_t barometer_show_pressure(struct device *dev,
+           struct device_attribute *da, char *buf)
+{
+   struct iio_dev *indio_dev =3D dev_get_drvdata(dev);
+   struct bmp085_data *data =3D indio_dev->dev_data;
+   struct i2c_client *client =3D data->client;
+   long status;
+
+   status =3D bmp085_read_pressure(client);
+   if (status < 0)
+           dev_warn(&client->dev, "error reading pressure: %ld\n",

status);

drivers/staging/iio/barometer/bmp085.c line 220

Quoted 1 line
drivers/staging/iio/barometer/bmp085.c new file +1 -0
+

Why cache the preesure?

drivers/staging/iio/barometer/bmp085.c

Quoted 5 lines
drivers/staging/iio/barometer/bmp085.c new file +5 -0
+   data->pressure =3D status;
+
+   return sprintf(buf, "%ld\n", data->pressure);
+}
+static IIO_DEV_ATTR_BARO_PRESSURE(S_IRUGO, barometer_show_pressure,

NULL, 0);

drivers/staging/iio/barometer/bmp085.c

Quoted 6 lines
drivers/staging/iio/barometer/bmp085.c new file +6 -0
+
+static ssize_t barometer_show_id_version(struct device *dev,
+           struct device_attribute *da, char *buf)
+{
+   struct iio_dev *indio_dev =3D dev_get_drvdata(dev);
+   struct bmp085_data *data =3D indio_dev->dev_data;

Doesn't really matter, but we do have a helper function for this (and at somepoint I'll clean all the direct reads out of the tree) struct bmp085_data *data =3D iio_dev_get_devdata(indio_dev);

drivers/staging/iio/barometer/bmp085.c line 247

Quoted 13 lines
drivers/staging/iio/barometer/bmp085.c new file +13 -0
+
+   return sprintf(buf, "%x_%x\n", data->chip_id, data->chip_version);
+}
+static IIO_DEV_ATTR_REV(barometer_show_id_version);
+
+static ssize_t barometer_show_oss(struct device *dev,
+           struct device_attribute *da, char *buf)
+{
+   struct iio_dev *indio_dev =3D dev_get_drvdata(dev);
+   struct bmp085_data *data =3D indio_dev->dev_data;
+
+   return sprintf(buf, "%d\n", data->oss);
+}

So is oss (which is sampling frequency) either 1Hz or 2Hz? (I haven't looked at datasheet but under the abi that's what this is giving us).

drivers/staging/iio/barometer/bmp085.c line 250

Quoted 3 lines
drivers/staging/iio/barometer/bmp085.c new file +3 -0
+static IIO_DEV_ATTR_SAMP_FREQ(S_IRUGO, barometer_show_oss, NULL);
+
+static IIO_CONST_ATTR_TEMP_SCALE("0.1");

No real problem with this. Personally I'd probably just do the trivial amount of fixed point arithmetic in the temperature output.

sprintf(buf, "%d.%d\n", temp/10, temp%10);

Quoted 16 lines
Quoted 5 lines
drivers/staging/iio/barometer/bmp085.c new file +4 -0
+
+static struct attribute *bmp085_attributes[] =3D {
+   &iio_dev_attr_temp_raw.dev_attr.attr,
+   &iio_dev_attr_baro_pressure.dev_attr.attr,

drivers/staging/iio/barometer/bmp085.c line 264

Quoted 10 lines
drivers/staging/iio/barometer/bmp085.c new file +10 -0
+   &iio_dev_attr_revision.dev_attr.attr,
+   &iio_dev_attr_sampling_frequency.dev_attr.attr,
+   &iio_const_attr_temp_scale.dev_attr.attr,
+   NULL
+};
+
+static const struct attribute_group bmp085_attr_group =3D {
+   .attrs =3D bmp085_attributes,
+};
+

+/***********************************************************************=

*

Quoted 4 lines

**

drivers/staging/iio/barometer/bmp085.c line 268

Quoted 2 lines
drivers/staging/iio/barometer/bmp085.c new file +2 -0
+ * Calibration data processing
+

*************************************************************************=

*

Quoted 12 lines

/

drivers/staging/iio/barometer/bmp085.c

Quoted 11 lines
drivers/staging/iio/barometer/bmp085.c new file +11 -0
+
+static int bmp085_init_client(struct i2c_client *client)
+{
+   struct bmp085_data *data =3D i2c_get_clientdata(client);
+   int i;
+
+   i =3D bmp085_read(client, BMP085_REG_CHIP_ID, 1, &data->chip_id);
+   if (i < 0)
+           dev_warn(&client->dev, "Chip ID not read\n");
+
+   i =3D bmp085_read(client, BMP085_REG_VERSION, 1, &data->chip_versio=

n);

Quoted 7 lines

drivers/staging/iio/barometer/bmp085.c

Quoted 7 lines
drivers/staging/iio/barometer/bmp085.c new file +7 -0
+   if (i < 0)
+           dev_warn(&client->dev, "Version not read\n");
+
+   i =3D bmp085_read(client, BMP085_REG_PROM, BMP085_PROM_LENGTH,
+                   data->data);
+   if (i < 0)
+           dev_warn(&client->dev, "Unable to read %d bytes from addres=

s "

Quoted 1 line

drivers/staging/iio/barometer/bmp085.c line 282

Quoted 1 line
drivers/staging/iio/barometer/bmp085.c new file +1 -0
+                           "%#x\n", BMP085_PROM_LENGTH, BMP085_REG_PRO=

M);

Quoted 113 lines
Quoted 7 lines
drivers/staging/iio/barometer/bmp085.c new file +7 -0
+
+   data->ac1 =3D (data->data[0] << 8) | data->data[1];
+   data->ac2 =3D (data->data[2] << 8) | data->data[3];
+   data->ac3 =3D (data->data[4] << 8) | data->data[5];
+   data->ac4 =3D (data->data[6] << 8) | data->data[7];
+   data->ac5 =3D (data->data[8] << 8) | data->data[9];
+   data->ac6 =3D (data->data[10] << 8) | data->data[11];

drivers/staging/iio/barometer/bmp085.c line 299

Quoted 10 lines
drivers/staging/iio/barometer/bmp085.c new file +10 -0
+   data->b1 =3D (data->data[12] << 8) | data->data[13];
+   data->b2 =3D (data->data[14] << 8) | data->data[15];
+   data->mb =3D (data->data[16] << 8) | data->data[17];
+   data->mc =3D (data->data[18] << 8) | data->data[19];
+   data->md =3D (data->data[20] << 8) | data->data[21];
+
+   return 0;
+}
+
+static struct i2c_driver bmp085_drv;

Why is this here?

Quoted 16 lines
drivers/staging/iio/barometer/bmp085.c new file +16 -0
+static int bmp085_probe(struct i2c_client *client,
+           const struct i2c_device_id *id)
+{
+   struct i2c_adapter *adapter =3D to_i2c_adapter(client->dev.parent);
+   struct bmp085_data *data;
+   struct bmp085_data *data2;
+   int status =3D 0;
+
+   if (!i2c_check_functionality(adapter, I2C_FUNC_SMBUS_BYTE_DATA |
+                           I2C_FUNC_SMBUS_WORD_DATA))
+           return -EIO;
+
+   /* Allocate driver data */
+   data =3D kzalloc(sizeof(struct bmp085_data), GFP_KERNEL);
+   if (!data)
+           return -ENOMEM;

drivers/staging/iio/barometer/bmp085.c

Quoted 10 lines
drivers/staging/iio/barometer/bmp085.c new file +10 -0
+
+   if ((oss < 0) || (oss > 3)) {
+           status =3D -EINVAL;
+           goto err;
+   }
+   data->oss =3D oss;
+
+   data->client =3D client;
+   i2c_set_clientdata(client, data);
+   data2 =3D i2c_get_clientdata(client);

Guessing the above is dead debug code?

drivers/staging/iio/barometer/bmp085.c line 334

Quoted 5 lines
drivers/staging/iio/barometer/bmp085.c new file +5 -0
+
+   /* Initialize the BMP085 chip */
+   bmp085_init_client(client);
+
+   __mutex_init(&data->bmp085_lock, "bmp085_lock", NULL);

Why the underscore form? I've not seen this before.

Quoted 8 lines
drivers/staging/iio/barometer/bmp085.c new file +8 -0
+
+   /* Register with IIO */
+   data->indio_dev =3D iio_allocate_device();
+   if (data->indio_dev =3D=3D NULL) {
+           status =3D -ENOMEM;
+           goto err;
+   }
+

drivers/staging/iio/barometer/bmp085.c line 352

Quoted 10 lines
drivers/staging/iio/barometer/bmp085.c new file +10 -0
+   data->indio_dev->dev.parent =3D &client->dev;
+   data->indio_dev->attrs =3D &bmp085_attr_group;
+   data->indio_dev->dev_data =3D (void *)(data);
+   data->indio_dev->driver_module =3D THIS_MODULE;
+   data->indio_dev->modes =3D INDIO_DIRECT_MODE;
+
+   status =3D iio_device_register(data->indio_dev);
+   if (status < 0)
+           goto err_iio;
+

Remove this as it's not needed.

Quoted 7 lines
drivers/staging/iio/barometer/bmp085.c new file +7 -0
+   dev_info(&client->dev, "driver enabled\n");
+
+   return 0;
+
+err_iio:
+   kfree(data->indio_dev);
+err:

drivers/staging/iio/barometer/bmp085.c line 369

Quoted 10 lines
drivers/staging/iio/barometer/bmp085.c new file +10 -0
+   kfree(data);
+   return status;
+}
+
+static int __devexit bmp085_remove(struct i2c_client *client)
+{
+   struct bmp085_data *data =3D i2c_get_clientdata(client);
+
+   if (mutex_is_locked(&data->bmp085_lock))
+           mutex_unlock(&data->bmp085_lock);

Something weird is occuring if you can get here without the lock being unlocked.

Quoted 22 lines
drivers/staging/iio/barometer/bmp085.c new file +22 -0
+
+   iio_device_unregister(data->indio_dev);
+   iio_free_device(data->indio_dev);
+
+   kfree(data);
+
+   dev_info(&client->dev, "driver removed\n");
+
+   return 0;
+}
+
+static const struct i2c_device_id bmp085_id[] =3D {
+   { "bmp085", 0 },
+   {}
+};
+MODULE_DEVICE_TABLE(i2c, bmp085_id);
+
+static struct i2c_driver bmp085_drv =3D {
+   .driver =3D {
+           .name =3D  "bmp085",
+           .owner =3D THIS_MODULE,
+   },
Quoted 8 lines

drivers/staging/iio/barometer/bmp085.c line 395

Quoted 8 lines
drivers/staging/iio/barometer/bmp085.c new file +8 -0
+   .suspend =3D NULL,
+   .resume =3D NULL,
+   .probe =3D bmp085_probe,
+   .remove =3D __devexit_p(bmp085_remove),
+   .id_table =3D bmp085_id,
+};
+
+/*--------------------------------------------------------------------=

-

Quoted 5 lines

----*/

drivers/staging/iio/barometer/bmp085.c line 402

Quoted 3 lines
drivers/staging/iio/barometer/bmp085.c new file +3 -0
+
+static int __init bmp085_init_module(void)
+{

Get rid of tis debug.

Quoted 11 lines

drivers/staging/iio/barometer/bmp085.c

Quoted 11 lines
drivers/staging/iio/barometer/bmp085.c new file +11 -0
+   printk(KERN_INFO"bmp085 loading...\n");
+
+   return i2c_add_driver(&bmp085_drv);
+}
+
+static void __exit bmp085_exit_module(void)
+{
+   i2c_del_driver(&bmp085_drv);
+}
+
+MODULE_AUTHOR("Matthias Brugger <[email protected]>")=

;

Quoted 8 lines

drivers/staging/iio/barometer/bmp085.c line 410

Quoted 1 line
drivers/staging/iio/barometer/bmp085.c new file +1 -0
+MODULE_DESCRIPTION("I2c device driver for BMP085 barometererator

sensor");

Review

Quoted 5 lines
drivers/staging/iio/barometer/bmp085.c new file +4 -0
+MODULE_LICENSE("GPL");
+
+module_init(bmp085_init_module);
+module_exit(bmp085_exit_module);
(quoted diff) +0 -0

b/drivers/staging/iio/barometer/bmp085.h

Quoted 12 lines

drivers/staging/iio/barometer/bmp085.h line 7

Quoted 12 lines

new file mode 100644
index 0000000..5ed2fb1

drivers/staging/iio/barometer/bmp085.h new file +7 -0
@@ -0,0 +1,73 @@
+#ifndef BMP085_H
+#define BMP085_H
+
+#include "../iio.h"
+#include "baro.h"
+
+#define BMP085_REG_CONV            0xF6 /* Temperature/pressure value =

UT

Quoted 78 lines

or UP */

Quoted 20 lines
drivers/staging/iio/barometer/bmp085.h new file +20 -0
+#define BMP085_REG_CONV_XLS        0xF8
+
+#define BMP085_REG_PROM            0xAA
+#define BMP085_PROM_LENGTH 22
+
+#define BMP085_REG_AC1             0xAA
+#define BMP085_REG_AC2             0xAC
+#define BMP085_REG_AC3             0xAE
+#define BMP085_REG_AC4             0xB0
+#define BMP085_REG_AC5             0xB2
+#define BMP085_REG_AC6             0xB4
+#define BMP085_REG_B1              0xB6
+#define BMP085_REG_B2              0xB8
+#define BMP085_REG_MB              0xBA
+#define BMP085_REG_MC              0xBC
+#define BMP085_REG_MD              0xBE
+
+#define BMP085_START_CONV  0xF4
+
+#define BMP085_START_TEMP  0x2E  /* wait 4.5 ms */

drivers/staging/iio/barometer/bmp085.h line 37

Quoted 10 lines
drivers/staging/iio/barometer/bmp085.h new file +10 -0
+
+#define BMP085_START_PRESS_OSRS0 0x34 /* wait 4.5 ms */
+#define BMP085_START_PRESS_OSRS1 0x74 /* wait 7.5 ms */
+#define BMP085_START_PRESS_OSRS2 0xB4 /* wait 13.5 ms */
+#define BMP085_START_PRESS_OSRS3 0xF4 /* wait 25.5 ms */
+
+#define BMP085_REG_CHIP_ID 0xD0
+#define BMP085_REG_VERSION 0xD1
+#define BMP085_CHIP_ID             0x55
+

Ideally this structure would have some documentation (kernel doc) to make reviewing the driver easier.

drivers/staging/iio/barometer/bmp085.h line 45

Quoted 8 lines
drivers/staging/iio/barometer/bmp085.h new file +8 -0
+struct bmp085_data {
+   struct i2c_client *client;
+   struct iio_dev *indio_dev;
+
+   struct mutex bmp085_lock;
+
+   int oss;
+   long temp;

Why long? Looking at the code this always looks to be 16 bit to me, so s16 would be more appropraite.

Quoted 18 lines
drivers/staging/iio/barometer/bmp085.h new file +18 -0
+   long pressure;
+
+   short ac1;
+   short ac2;
+   short ac3;
+   unsigned short ac4;
+   unsigned short ac5;
+   unsigned short ac6;
+
+   short b1;
+   short b2;
+   long b5;
+
+   short mb;
+   short mc;
+   short md;
+
+   unsigned long ut;

drivers/staging/iio/barometer/bmp085.h line 73

Quoted 10 lines
drivers/staging/iio/barometer/bmp085.h new file +10 -0
+   unsigned long up;
+
+   u8 chip_id;
+   u8 chip_version;
+
+   unsigned char data[22];
+};
+
+
+#endif

--
To unsubscribe from this list: send the line "unsubscribe linux-iio" in the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html

#3 lore raw
In reply to Jonathan Cameron
Quoted 18 lines

-----Original Message-----
From: Datta, Shubhrajyoti

Quoted 13 lines

-----Original Message-----
From: [email protected] [mailto:linux-iio- [email protected]] On Behalf Of Jonathan Cameron
Sent: Friday, October 15, 2010 3:51 PM
To: Matthias Brugger
Cc: [email protected]; matthias
Subject: Re: [PATCH] iio - add barometer bmp085

Quoted 4 lines · Matthias Brugger

This patch adds:
- digital barometer support to the iio subsytem
- Bosch Sensortec bmp085 driver

Quoted 7 lines
Quoted 2 lines
Quoted 2 lines

I resend the patches I sent yesterday, because I merged them to one. Also the comments and the define has been deleted and so, from my

point

Quoted 2 lines

of view is ready to merge.
One quick comment about patch submissions in general. When it's an

updated

Quoted 1 line

version of a previously posted patch, the title should be something lik=

e

Quoted 9 lines
Quoted 9 lines

[PATCH V2] iio - add barometer bmp085. Makes it easy down the line to make
sure you have the right patch!.

To sumarise the important inline comments:

As a general rule, if you know the size of the storage of a give value (because it is comming from hardware) it is better to use fixed sized types. u16 and friends. It's way too unpredictable how large a long o=

r

Quoted 6 lines
Quoted 6 lines

a short might be.

Don't eat errors.

All channel naming must have either _raw or _input on the end of the direct read attributes so we know whether it is already in SI units=

.

Quoted 5 lines
Quoted 2 lines

Mostly fine, but various comments inline.

Some of the comments are fixed in the following you may want to see Drivers/misc/bmp085.c.

Does this work for you?

Quoted 3 lines

Some of the points
1. You may solve the dependency of the pressure needing the temperature b=

y

Quoted 5 lines

triggering the temperature measurement.
2. Secondly I personally prefer the temperature reported in milli units. However that will standardize various. Also solves the decimal point issue.

However that will standardize various. - > drivers.

Quoted 33 lines

However I am OK with your take.

3. I appreciate your attempts to make it an IIO as I think it may make it more futuristic.

Quoted 23 lines

Thanks,

Jonathan

Quoted 9 lines
---
 drivers/staging/iio/Kconfig            |    1 +
 drivers/staging/iio/Makefile           |    1 +
 drivers/staging/iio/barometer/Kconfig  |   12 +
 drivers/staging/iio/barometer/Makefile |    5 +
 drivers/staging/iio/barometer/baro.h   |    8 +
 drivers/staging/iio/barometer/bmp085.c |  418

++++++++++++++++++++++++++++++++

Quoted 8 lines
 drivers/staging/iio/barometer/bmp085.h |   73 ++++++
 7 files changed, 518 insertions(+), 0 deletions(-)
 create mode 100644 drivers/staging/iio/barometer/Kconfig
 create mode 100644 drivers/staging/iio/barometer/Makefile
 create mode 100644 drivers/staging/iio/barometer/baro.h
 create mode 100644 drivers/staging/iio/barometer/bmp085.c
 create mode 100644 drivers/staging/iio/barometer/bmp085.h
Quoted 1 line
Quoted 1 line

drivers/staging/iio/Kconfi=

Quoted 1 line
drivers/staging/iio/Kconfi= renamed from drivers/staging/iio/Kconfig +0 -0

g

Quoted 86 lines
Quoted 9 lines
Quoted 9 lines

index ed48815..d5ca09a 100644

drivers/staging/iio/Kconfig +1 -0
@@ -46,6 +46,7 @@ source "drivers/staging/iio/gyro/Kconfig"
 source "drivers/staging/iio/imu/Kconfig"
 source "drivers/staging/iio/light/Kconfig"
 source "drivers/staging/iio/magnetometer/Kconfig"
+source "drivers/staging/iio/barometer/Kconfig"
 
Quoted 3 lines

Review

Quoted 3 lines
drivers/staging/iio/Kconfig +0 -0
 source "drivers/staging/iio/trigger/Kconfig"
 
(quoted diff) +0 -0

b/drivers/staging/iio/Makefile

Quoted 59 lines

Review

Quoted 9 lines

index e909674..73112b2 100644

drivers/staging/iio/Makefile +1 -0
@@ -16,3 +16,4 @@ obj-y +=3D imu/
 obj-y +=3D light/
 obj-y +=3D trigger/
 obj-y +=3D magnetometer/
+obj-y +=3D barometer/
(quoted diff) +0 -0

b/drivers/staging/iio/barometer/Kconfig

Review

Quoted 18 lines

new file mode 100644
index 0000000..d5942e9

drivers/staging/iio/barometer/Kconfig new file +12 -0
@@ -0,0 +1,12 @@
+#
+# IIO Digital Barometer Sensor drivers configuration
+#
+comment "Digital barometer sensors"
+
+config BMP085
+
+ tristate "BMP085 Barometer Sensor I2C driver"
+ depends on I2C
+ help
+   Say yes here to build support for Bosch Sensortec BMP085,
+   digital barometer sensor.
(quoted diff) +0 -0

b/drivers/staging/iio/barometer/Makefile

Review

Quoted 11 lines

new file mode 100644
index 0000000..3234d96

drivers/staging/iio/barometer/Makefile new file +5 -0
@@ -0,0 +1,5 @@
+#
+# Makefile for digital barometer sensor drivers
+#
+
+obj-$(CONFIG_BMP085) +=3D bmp085.o
(quoted diff) +0 -0

b/drivers/staging/iio/barometer/baro.h

drivers/staging/iio/barometer/baro.h line 7

Quoted 12 lines

new file mode 100644
index 0000000..e3b73a1

drivers/staging/iio/barometer/baro.h new file +7 -0
@@ -0,0 +1,8 @@
+
+#include "../sysfs.h"
+
+/* Barometer types of attribute */
+
+#define IIO_DEV_ATTR_BARO_PRESSURE(_mode, _show, _store, _addr)  \
+ IIO_DEVICE_ATTR(baro_pressure, _mode, _show, NULL, _addr)

If it's processed (i.e. si units) it needs to be baro_pressure_input. If raw it needs to be baro_pressure_raw and conversion factors etc provided.

Review

Quoted 2 lines
drivers/staging/iio/barometer/baro.h new file +1 -0
+
(quoted diff) +0 -0

b/drivers/staging/iio/barometer/bmp085.c

Quoted 13 lines

drivers/staging/iio/barometer/bmp085.c line 8

Quoted 13 lines

new file mode 100644
index 0000000..67dac39

drivers/staging/iio/barometer/bmp085.c new file +8 -0
@@ -0,0 +1,418 @@
+/**
+ * Bosch Sensortec BMP085 Digital Pressure Sensor
+ *
+ * Written by: Matthias Brugger <[email protected]>
+ *
+ * Copyright (C) 2010 Fraunhofer Institute for Integrated Circuits
+ *
+ * This program is free software; you can redistribute it and/or

modify

Quoted 35 lines
Quoted 1 line

drivers/staging/iio/barometer/bmp085.c line 9

Quoted 1 line
drivers/staging/iio/barometer/bmp085.c new file +1 -0
+ * it under the terms of the GNU General Public License as published

by

Quoted 33 lines
Quoted 18 lines
drivers/staging/iio/barometer/bmp085.c new file +18 -0
+ * 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.,
+ * 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+ */
+
+#include <linux/module.h>
+#include <linux/init.h>
+#include <linux/slab.h>
+#include <linux/i2c.h>

drivers/staging/iio/barometer/bmp085.c line 37

Quoted 10 lines
drivers/staging/iio/barometer/bmp085.c new file +10 -0
+#include <linux/mutex.h>
+#include <linux/delay.h>
+#include <linux/time.h>
+#include <linux/mutex.h>
+
+#include "bmp085.h"
+
+int oss =3D 3;
+module_param(oss, int , S_IRUSR);
+MODULE_PARM_DESC(oss, "Oversampling setting [0-3]");

Not convinced this should be a module parameter. Better to use a combination
of board config (for default on a given board) and appropriate sysfs attribute
to allow it to be changed. Still, fine for initial merge, we can chang=

e

Quoted 6 lines
Quoted 5 lines

this
later.

Quoted 2 lines
drivers/staging/iio/barometer/bmp085.c new file +1 -0
+

+/***********************************************************************=

*

Quoted 6 lines
Quoted 5 lines

**

drivers/staging/iio/barometer/bmp085.c line 40

Quoted 1 line
drivers/staging/iio/barometer/bmp085.c new file +1 -0
+ * Calcualtion of temperature and pressure

Typo Calcualtion -> Calculation.

Quoted 1 line
drivers/staging/iio/barometer/bmp085.c new file +1 -0
+

*************************************************************************=

*

Quoted 51 lines
Quoted 42 lines

/

Quoted 6 lines
drivers/staging/iio/barometer/bmp085.c new file +6 -0
+static short bmp085_calc_temperature(struct i2c_client *client,
+        unsigned long ut)
+{
+ struct bmp085_data *data =3D i2c_get_clientdata(client);
+ long x1, x2;
+ short temp;

drivers/staging/iio/barometer/bmp085.c

Quoted 10 lines
drivers/staging/iio/barometer/bmp085.c new file +10 -0
+
+ x1 =3D ((long) ut - (long) data->ac6) * (long) data->ac5 >> 15;
+ x2 =3D ((long) data->mc << 11) / (x1 + data->md);
+ data->b5 =3D x1 + x2;
+ temp =3D ((data->b5 + 8) >> 4);
+
+ return temp;
+}
+
+static long bmp085_calc_pressure(struct i2c_client *client, unsigned

long up)

Quoted 24 lines
drivers/staging/iio/barometer/bmp085.c new file +24 -0
+{
+ struct bmp085_data *data =3D i2c_get_clientdata(client);
+ long b6, x1, x2, x3, b3;
+ unsigned long b4, b7;
+ long pressure, p;
+ long tmp;
+
+ b6 =3D data->b5 - 4000;
+ x1 =3D (data->b2 * (b6 * b6 / (1<<12))) / (1<<11);
+ x2 =3D data->ac2 * b6 / (1<<11);
+ x3 =3D x1 + x2;
+ b3 =3D (((data->ac1 * 4 + x3) << data->oss) + 2) / 4;
+
+ x1 =3D data->ac3 * b6 / (1<<13);
+ x2 =3D (data->b1 * ((b6 * b6) / (1<<12))) / (1<<16);
+ x3 =3D ((x1 + x2) + 2) / (1<<2);
+ b4 =3D data->ac4 * (unsigned long) (x3 + 32768) / (1<<15);
+ b7 =3D ((unsigned long)up - b3) * (50000 >> data->oss);
+
+ if (b7 < 0x80000000)
+         p =3D (b7 * 2) / b4;
+ else
+         p =3D (b7 / b4) * 2;
+ tmp =3D (p / (1<<8)) * (p / (1<<8));
Quoted 9 lines

drivers/staging/iio/barometer/bmp085.c line 88

Quoted 8 lines
drivers/staging/iio/barometer/bmp085.c new file +7 -0
+ x1 =3D (tmp * 3038) / (1<<16);
+ x2 =3D (-7357 * p) / (1<<16);
+ pressure =3D p + ((x1 + x2 + 3791) / (1<<4));
+
+ return pressure;
+}
+
Quoted 1 line

+/***********************************************************************=

*

Quoted 5 lines
Quoted 4 lines

**

Quoted 2 lines
drivers/staging/iio/barometer/bmp085.c new file +2 -0
+ * Digital interface to sensor
+

*************************************************************************=

*

Quoted 75 lines
Quoted 3 lines

/

drivers/staging/iio/barometer/bmp085.c line 90

Quoted 1 line
drivers/staging/iio/barometer/bmp085.c new file +1 -0
+

This is an extremely slim function. I think it would be easier to

remove

Quoted 71 lines

it and
just ahve the i2c_block_data function inline in the code.

drivers/staging/iio/barometer/bmp085.c line 91

Quoted 1 line
drivers/staging/iio/barometer/bmp085.c new file +1 -0
+static ssize_t bmp085_read(struct i2c_client *client, u8 reg, size_t

count,

drivers/staging/iio/barometer/bmp085.c line 98

Quoted 5 lines
drivers/staging/iio/barometer/bmp085.c new file +5 -0
+        unsigned char *buffer)
+{
+ int rc;
+ rc =3D i2c_smbus_read_i2c_block_data(client, reg, count, buffer);
+ if (rc < 0)

No. Pass the error that came out of the i2c command on. Never eat an error as you just reduce the information available.

Quoted 11 lines
drivers/staging/iio/barometer/bmp085.c new file +11 -0
+                 return -EIO;
+
+ return count;
+}
+
+static short bmp085_read_temp(struct i2c_client *client)
+{
+ s32 ret;
+ short temp;
+ struct bmp085_data *data =3D i2c_get_clientdata(client);
+

drivers/staging/iio/barometer/bmp085.c line 119

Quoted 10 lines
drivers/staging/iio/barometer/bmp085.c new file +10 -0
+ mutex_lock(&data->bmp085_lock);
+ ret =3D i2c_smbus_write_byte_data(client, BMP085_START_CONV,
+                BMP085_START_TEMP);
+ mutex_unlock(&data->bmp085_lock);
+ if (ret < 0) {
+         dev_warn(&client->dev, "starting temperature conversation "
+                        "failed\n");
+         return ret;
+ }
+

probably msleep.

Quoted 12 lines
drivers/staging/iio/barometer/bmp085.c new file +12 -0
+ mdelay(5);
+ ret =3D bmp085_read(client, BMP085_REG_CONV, 2, data->data);
+ if (ret < 0) {
+         dev_warn(&client->dev, "reading ut failed, value is %#x\n"
+                         , ret);
+         return ret;
+ }
+
+ data->ut =3D (data->data[0] << 8) | data->data[1];
+
+ temp =3D bmp085_calc_temperature(client, data->ut);
+

drivers/staging/iio/barometer/bmp085.c line 141

Quoted 10 lines
drivers/staging/iio/barometer/bmp085.c new file +10 -0
+ return temp;
+}
+
+static long bmp085_read_pressure(struct i2c_client *client)
+{
+ unsigned long up =3D 0;
+ int ret;
+ u8 xlsb, ret1, ret2;
+ long pressure;
+ u8 reg;

Don't worry about the todo. Overshooting on this isn't going to greatly change your possible read rate.

Quoted 14 lines
drivers/staging/iio/barometer/bmp085.c new file +14 -0
+ /* TODO should be 4.5, 7.5, 13.5, 25.5 ms */
+ int time_delay[4] =3D {5, 8, 14, 26};
+ struct bmp085_data *data =3D i2c_get_clientdata(client);
+
+ if (data->oss =3D=3D 0)
+         reg =3D BMP085_START_PRESS_OSRS0;
+ else if (data->oss =3D=3D 1)
+         reg =3D BMP085_START_PRESS_OSRS1;
+ else if (data->oss =3D=3D 2)
+         reg =3D BMP085_START_PRESS_OSRS2;
+ else if (data->oss =3D=3D 3)
+         reg =3D BMP085_START_PRESS_OSRS3;
+ else {
+         dev_warn(&client->dev, "undefined oss value, use oss =3D 0\=

n");

Quoted 26 lines
Quoted 26 lines

drivers/staging/iio/barometer/bmp085.c line 165

Quoted 10 lines
drivers/staging/iio/barometer/bmp085.c new file +10 -0
+         data->oss =3D 0;
+         reg =3D BMP085_START_PRESS_OSRS0;
+ }
+
+ mutex_lock(&data->bmp085_lock);
+ ret =3D i2c_smbus_write_byte_data(client, BMP085_START_CONV, reg);
+ mutex_unlock(&data->bmp085_lock);
+ if (ret < 0)
+         return ret;
+

Does this need to be that precise? If not an msleep would be a better bet to allow the system to get on with something else.

drivers/staging/iio/barometer/bmp085.c

Quoted 13 lines
drivers/staging/iio/barometer/bmp085.c new file +13 -0
+ mdelay(time_delay[data->oss]);
+
+ mutex_lock(&data->bmp085_lock);
+ ret1 =3D i2c_smbus_read_byte_data(client, 0xf6);
+ ret2 =3D i2c_smbus_read_byte_data(client, 0xf7);
+ xlsb =3D i2c_smbus_read_byte_data(client, 0xf8);
+ mutex_unlock(&data->bmp085_lock);
+
+ up =3D (((unsigned long) ret1 << 16) | ((unsigned long) ret2 << 8)
+                         | (unsigned long) xlsb) >> (8 - data->oss);
+ data->up =3D up;
+
+ pressure =3D bmp085_calc_pressure(client, up);

Why cache the pressure?

Quoted 8 lines
Quoted 7 lines

drivers/staging/iio/barometer/bmp085.c line 88

Quoted 6 lines
drivers/staging/iio/barometer/bmp085.c new file +5 -0
+ data->pressure =3D pressure;
+
+ return pressure;
+}
+

+/***********************************************************************=

*

Quoted 5 lines
Quoted 4 lines

**

Quoted 2 lines
drivers/staging/iio/barometer/bmp085.c new file +2 -0
+ * sysfs attributes
+

*************************************************************************=

*

Quoted 15 lines
Quoted 15 lines

/

Quoted 14 lines
drivers/staging/iio/barometer/bmp085.c new file +14 -0
+static ssize_t barometer_show_temp(struct device *dev,
+         struct device_attribute *da, char *buf)
+{
+ struct iio_dev *indio_dev =3D dev_get_drvdata(dev);
+ struct bmp085_data *data =3D indio_dev->dev_data;
+ struct i2c_client *client =3D data->client;
+ long status;
+
+ status =3D bmp085_read_temp(client);
+ if (status < 0)
+         dev_warn(&client->dev, "error reading temperature: %ld\n",
+                         status);
+
+ data->temp =3D status;
Quoted 10 lines
Quoted 7 lines

drivers/staging/iio/barometer/bmp085.c

Quoted 7 lines
drivers/staging/iio/barometer/bmp085.c new file +7 -0
+
+ return sprintf(buf, "%ld\n", data->temp);
+}
+static IIO_DEV_ATTR_TEMP_RAW(barometer_show_temp);
+
+/**
+ * In standard mode, the temperature has to be reat every second

before

Quoted 2 lines

the

Quoted 1 line
drivers/staging/iio/barometer/bmp085.c new file +1 -0
+ * pressure can be reat. We leave this semantics to the userspace, i=

f

Quoted 77 lines
Quoted 3 lines

later
past tense of read is infact read not reat.

Quoted 1 line
drivers/staging/iio/barometer/bmp085.c new file +1 -0
+ * on a trigger based reading will be implemented, this should be

taken

Quoted 57 lines

into

drivers/staging/iio/barometer/bmp085.c line 210

Quoted 1 line
drivers/staging/iio/barometer/bmp085.c new file +1 -0
+ * account.

Ouch, that's an uggly requirement.

drivers/staging/iio/barometer/bmp085.c

Quoted 12 lines
drivers/staging/iio/barometer/bmp085.c new file +12 -0
+ */
+static ssize_t barometer_show_pressure(struct device *dev,
+         struct device_attribute *da, char *buf)
+{
+ struct iio_dev *indio_dev =3D dev_get_drvdata(dev);
+ struct bmp085_data *data =3D indio_dev->dev_data;
+ struct i2c_client *client =3D data->client;
+ long status;
+
+ status =3D bmp085_read_pressure(client);
+ if (status < 0)
+         dev_warn(&client->dev, "error reading pressure: %ld\n",

status);

drivers/staging/iio/barometer/bmp085.c line 220

Quoted 1 line
drivers/staging/iio/barometer/bmp085.c new file +1 -0
+

Why cache the preesure?

drivers/staging/iio/barometer/bmp085.c

Quoted 5 lines
drivers/staging/iio/barometer/bmp085.c new file +5 -0
+ data->pressure =3D status;
+
+ return sprintf(buf, "%ld\n", data->pressure);
+}
+static IIO_DEV_ATTR_BARO_PRESSURE(S_IRUGO, barometer_show_pressure,

NULL, 0);

drivers/staging/iio/barometer/bmp085.c

Quoted 6 lines
drivers/staging/iio/barometer/bmp085.c new file +6 -0
+
+static ssize_t barometer_show_id_version(struct device *dev,
+         struct device_attribute *da, char *buf)
+{
+ struct iio_dev *indio_dev =3D dev_get_drvdata(dev);
+ struct bmp085_data *data =3D indio_dev->dev_data;

Doesn't really matter, but we do have a helper function for this (and at somepoint I'll clean all the direct reads out of the tree) struct bmp085_data *data =3D iio_dev_get_devdata(indio_dev);

drivers/staging/iio/barometer/bmp085.c line 247

Quoted 13 lines
drivers/staging/iio/barometer/bmp085.c new file +13 -0
+
+ return sprintf(buf, "%x_%x\n", data->chip_id, data->chip_version);
+}
+static IIO_DEV_ATTR_REV(barometer_show_id_version);
+
+static ssize_t barometer_show_oss(struct device *dev,
+         struct device_attribute *da, char *buf)
+{
+ struct iio_dev *indio_dev =3D dev_get_drvdata(dev);
+ struct bmp085_data *data =3D indio_dev->dev_data;
+
+ return sprintf(buf, "%d\n", data->oss);
+}

So is oss (which is sampling frequency) either 1Hz or 2Hz? (I haven't looked at datasheet but under the abi that's what this is giving us).

drivers/staging/iio/barometer/bmp085.c line 250

Quoted 3 lines
drivers/staging/iio/barometer/bmp085.c new file +3 -0
+static IIO_DEV_ATTR_SAMP_FREQ(S_IRUGO, barometer_show_oss, NULL);
+
+static IIO_CONST_ATTR_TEMP_SCALE("0.1");

No real problem with this. Personally I'd probably just do the trivial amount of fixed point arithmetic in the temperature output.

sprintf(buf, "%d.%d\n", temp/10, temp%10);

Quoted 16 lines
Quoted 5 lines
drivers/staging/iio/barometer/bmp085.c new file +4 -0
+
+static struct attribute *bmp085_attributes[] =3D {
+ &iio_dev_attr_temp_raw.dev_attr.attr,
+ &iio_dev_attr_baro_pressure.dev_attr.attr,

drivers/staging/iio/barometer/bmp085.c line 264

Quoted 10 lines
drivers/staging/iio/barometer/bmp085.c new file +10 -0
+ &iio_dev_attr_revision.dev_attr.attr,
+ &iio_dev_attr_sampling_frequency.dev_attr.attr,
+ &iio_const_attr_temp_scale.dev_attr.attr,
+ NULL
+};
+
+static const struct attribute_group bmp085_attr_group =3D {
+ .attrs =3D bmp085_attributes,
+};
+
Quoted 1 line

+/***********************************************************************=

*

Quoted 5 lines
Quoted 4 lines

**

Quoted 2 lines
drivers/staging/iio/barometer/bmp085.c new file +2 -0
+ * Calibration data processing
+

*************************************************************************=

*

Quoted 12 lines
Quoted 12 lines

/

drivers/staging/iio/barometer/bmp085.c

Quoted 11 lines
drivers/staging/iio/barometer/bmp085.c new file +11 -0
+
+static int bmp085_init_client(struct i2c_client *client)
+{
+ struct bmp085_data *data =3D i2c_get_clientdata(client);
+ int i;
+
+ i =3D bmp085_read(client, BMP085_REG_CHIP_ID, 1, &data->chip_id);
+ if (i < 0)
+         dev_warn(&client->dev, "Chip ID not read\n");
+
+ i =3D bmp085_read(client, BMP085_REG_VERSION, 1, &data->chip_versio=

n);

Quoted 7 lines
Quoted 7 lines

drivers/staging/iio/barometer/bmp085.c

Quoted 7 lines
drivers/staging/iio/barometer/bmp085.c new file +7 -0
+ if (i < 0)
+         dev_warn(&client->dev, "Version not read\n");
+
+ i =3D bmp085_read(client, BMP085_REG_PROM, BMP085_PROM_LENGTH,
+                 data->data);
+ if (i < 0)
+         dev_warn(&client->dev, "Unable to read %d bytes from addres=

s "

Quoted 1 line
Quoted 1 line

drivers/staging/iio/barometer/bmp085.c line 282

Quoted 1 line
drivers/staging/iio/barometer/bmp085.c new file +1 -0
+                         "%#x\n", BMP085_PROM_LENGTH, BMP085_REG_PRO=

M);

Quoted 113 lines
Quoted 113 lines
Quoted 7 lines
drivers/staging/iio/barometer/bmp085.c new file +7 -0
+
+ data->ac1 =3D (data->data[0] << 8) | data->data[1];
+ data->ac2 =3D (data->data[2] << 8) | data->data[3];
+ data->ac3 =3D (data->data[4] << 8) | data->data[5];
+ data->ac4 =3D (data->data[6] << 8) | data->data[7];
+ data->ac5 =3D (data->data[8] << 8) | data->data[9];
+ data->ac6 =3D (data->data[10] << 8) | data->data[11];

drivers/staging/iio/barometer/bmp085.c line 299

Quoted 10 lines
drivers/staging/iio/barometer/bmp085.c new file +10 -0
+ data->b1 =3D (data->data[12] << 8) | data->data[13];
+ data->b2 =3D (data->data[14] << 8) | data->data[15];
+ data->mb =3D (data->data[16] << 8) | data->data[17];
+ data->mc =3D (data->data[18] << 8) | data->data[19];
+ data->md =3D (data->data[20] << 8) | data->data[21];
+
+ return 0;
+}
+
+static struct i2c_driver bmp085_drv;

Why is this here?

Quoted 16 lines
drivers/staging/iio/barometer/bmp085.c new file +16 -0
+static int bmp085_probe(struct i2c_client *client,
+         const struct i2c_device_id *id)
+{
+ struct i2c_adapter *adapter =3D to_i2c_adapter(client->dev.parent);
+ struct bmp085_data *data;
+ struct bmp085_data *data2;
+ int status =3D 0;
+
+ if (!i2c_check_functionality(adapter, I2C_FUNC_SMBUS_BYTE_DATA |
+                         I2C_FUNC_SMBUS_WORD_DATA))
+         return -EIO;
+
+ /* Allocate driver data */
+ data =3D kzalloc(sizeof(struct bmp085_data), GFP_KERNEL);
+ if (!data)
+         return -ENOMEM;

drivers/staging/iio/barometer/bmp085.c

Quoted 10 lines
drivers/staging/iio/barometer/bmp085.c new file +10 -0
+
+ if ((oss < 0) || (oss > 3)) {
+         status =3D -EINVAL;
+         goto err;
+ }
+ data->oss =3D oss;
+
+ data->client =3D client;
+ i2c_set_clientdata(client, data);
+ data2 =3D i2c_get_clientdata(client);

Guessing the above is dead debug code?

drivers/staging/iio/barometer/bmp085.c line 334

Quoted 5 lines
drivers/staging/iio/barometer/bmp085.c new file +5 -0
+
+ /* Initialize the BMP085 chip */
+ bmp085_init_client(client);
+
+ __mutex_init(&data->bmp085_lock, "bmp085_lock", NULL);

Why the underscore form? I've not seen this before.

Quoted 8 lines
drivers/staging/iio/barometer/bmp085.c new file +8 -0
+
+ /* Register with IIO */
+ data->indio_dev =3D iio_allocate_device();
+ if (data->indio_dev =3D=3D NULL) {
+         status =3D -ENOMEM;
+         goto err;
+ }
+

drivers/staging/iio/barometer/bmp085.c line 352

Quoted 10 lines
drivers/staging/iio/barometer/bmp085.c new file +10 -0
+ data->indio_dev->dev.parent =3D &client->dev;
+ data->indio_dev->attrs =3D &bmp085_attr_group;
+ data->indio_dev->dev_data =3D (void *)(data);
+ data->indio_dev->driver_module =3D THIS_MODULE;
+ data->indio_dev->modes =3D INDIO_DIRECT_MODE;
+
+ status =3D iio_device_register(data->indio_dev);
+ if (status < 0)
+         goto err_iio;
+

Remove this as it's not needed.

Quoted 7 lines
drivers/staging/iio/barometer/bmp085.c new file +7 -0
+ dev_info(&client->dev, "driver enabled\n");
+
+ return 0;
+
+err_iio:
+ kfree(data->indio_dev);
+err:

drivers/staging/iio/barometer/bmp085.c line 369

Quoted 10 lines
drivers/staging/iio/barometer/bmp085.c new file +10 -0
+ kfree(data);
+ return status;
+}
+
+static int __devexit bmp085_remove(struct i2c_client *client)
+{
+ struct bmp085_data *data =3D i2c_get_clientdata(client);
+
+ if (mutex_is_locked(&data->bmp085_lock))
+         mutex_unlock(&data->bmp085_lock);

Something weird is occuring if you can get here without the lock being unlocked.

Quoted 22 lines
drivers/staging/iio/barometer/bmp085.c new file +22 -0
+
+ iio_device_unregister(data->indio_dev);
+ iio_free_device(data->indio_dev);
+
+ kfree(data);
+
+ dev_info(&client->dev, "driver removed\n");
+
+ return 0;
+}
+
+static const struct i2c_device_id bmp085_id[] =3D {
+ { "bmp085", 0 },
+ {}
+};
+MODULE_DEVICE_TABLE(i2c, bmp085_id);
+
+static struct i2c_driver bmp085_drv =3D {
+ .driver =3D {
+         .name =3D  "bmp085",
+         .owner =3D THIS_MODULE,
+ },
Quoted 8 lines
Quoted 8 lines

drivers/staging/iio/barometer/bmp085.c line 395

Quoted 8 lines
drivers/staging/iio/barometer/bmp085.c new file +8 -0
+ .suspend =3D NULL,
+ .resume =3D NULL,
+ .probe =3D bmp085_probe,
+ .remove =3D __devexit_p(bmp085_remove),
+ .id_table =3D bmp085_id,
+};
+
+/*------------------------------------------------------------------=

-

Quoted 26 lines

--

Quoted 5 lines

----*/

drivers/staging/iio/barometer/bmp085.c line 402

Quoted 3 lines
drivers/staging/iio/barometer/bmp085.c new file +3 -0
+
+static int __init bmp085_init_module(void)
+{

Get rid of tis debug.

Quoted 11 lines

drivers/staging/iio/barometer/bmp085.c

Quoted 11 lines
drivers/staging/iio/barometer/bmp085.c new file +11 -0
+ printk(KERN_INFO"bmp085 loading...\n");
+
+ return i2c_add_driver(&bmp085_drv);
+}
+
+static void __exit bmp085_exit_module(void)
+{
+ i2c_del_driver(&bmp085_drv);
+}
+
+MODULE_AUTHOR("Matthias Brugger

<[email protected]>");

Quoted 8 lines

drivers/staging/iio/barometer/bmp085.c line 410

Quoted 1 line
drivers/staging/iio/barometer/bmp085.c new file +1 -0
+MODULE_DESCRIPTION("I2c device driver for BMP085 barometererator

sensor");

Review

Quoted 5 lines
drivers/staging/iio/barometer/bmp085.c new file +4 -0
+MODULE_LICENSE("GPL");
+
+module_init(bmp085_init_module);
+module_exit(bmp085_exit_module);
(quoted diff) +0 -0

b/drivers/staging/iio/barometer/bmp085.h

Quoted 12 lines
Quoted 4 lines
Quoted 4 lines

new file mode 100644
index 0000000..5ed2fb1

drivers/staging/iio/barometer/bmp085.h new file +0 -0
Quoted 8 lines

drivers/staging/iio/barometer/bmp085.h line 7

Quoted 8 lines
drivers/staging/iio/barometer/bmp085.h new file +7 -0
@@ -0,0 +1,73 @@
+#ifndef BMP085_H
+#define BMP085_H
+
+#include "../iio.h"
+#include "baro.h"
+
+#define BMP085_REG_CONV          0xF6 /* Temperature/pressure value =

UT

Quoted 78 lines
Quoted 78 lines

or UP */

Quoted 20 lines
drivers/staging/iio/barometer/bmp085.h new file +20 -0
+#define BMP085_REG_CONV_XLS      0xF8
+
+#define BMP085_REG_PROM          0xAA
+#define BMP085_PROM_LENGTH       22
+
+#define BMP085_REG_AC1           0xAA
+#define BMP085_REG_AC2           0xAC
+#define BMP085_REG_AC3           0xAE
+#define BMP085_REG_AC4           0xB0
+#define BMP085_REG_AC5           0xB2
+#define BMP085_REG_AC6           0xB4
+#define BMP085_REG_B1            0xB6
+#define BMP085_REG_B2            0xB8
+#define BMP085_REG_MB            0xBA
+#define BMP085_REG_MC            0xBC
+#define BMP085_REG_MD            0xBE
+
+#define BMP085_START_CONV        0xF4
+
+#define BMP085_START_TEMP        0x2E  /* wait 4.5 ms */

drivers/staging/iio/barometer/bmp085.h line 37

Quoted 10 lines
drivers/staging/iio/barometer/bmp085.h new file +10 -0
+
+#define BMP085_START_PRESS_OSRS0 0x34 /* wait 4.5 ms */
+#define BMP085_START_PRESS_OSRS1 0x74 /* wait 7.5 ms */
+#define BMP085_START_PRESS_OSRS2 0xB4 /* wait 13.5 ms */
+#define BMP085_START_PRESS_OSRS3 0xF4 /* wait 25.5 ms */
+
+#define BMP085_REG_CHIP_ID       0xD0
+#define BMP085_REG_VERSION       0xD1
+#define BMP085_CHIP_ID           0x55
+

Ideally this structure would have some documentation (kernel doc) to make reviewing the driver easier.

drivers/staging/iio/barometer/bmp085.h line 45

Quoted 8 lines
drivers/staging/iio/barometer/bmp085.h new file +8 -0
+struct bmp085_data {
+ struct i2c_client *client;
+ struct iio_dev *indio_dev;
+
+ struct mutex bmp085_lock;
+
+ int oss;
+ long temp;

Why long? Looking at the code this always looks to be 16 bit to me, so s16 would be more appropraite.

Quoted 18 lines
drivers/staging/iio/barometer/bmp085.h new file +18 -0
+ long pressure;
+
+ short ac1;
+ short ac2;
+ short ac3;
+ unsigned short ac4;
+ unsigned short ac5;
+ unsigned short ac6;
+
+ short b1;
+ short b2;
+ long b5;
+
+ short mb;
+ short mc;
+ short md;
+
+ unsigned long ut;

drivers/staging/iio/barometer/bmp085.h line 73

Quoted 10 lines
drivers/staging/iio/barometer/bmp085.h new file +10 -0
+ unsigned long up;
+
+ u8 chip_id;
+ u8 chip_version;
+
+ unsigned char data[22];
+};
+
+
+#endif

--
To unsubscribe from this list: send the line "unsubscribe linux-iio" in the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html

#4 lore raw
In reply to Jonathan Cameron

Hi Jonathan,

some comments on your comments below.
Afterwards I'll send the patch.

Quoted 12 lines · Jonathan Cameron
Quoted 6 lines · Matthias Brugger

This patch adds:
- digital barometer support to the iio subsytem
- Bosch Sensortec bmp085 driver

I resend the patches I sent yesterday, because I merged them to one.
Also the comments and the define has been deleted and so, from my point of view is ready to merge.

One quick comment about patch submissions in general. When it's an updated version of a previously posted patch, the title should be something like [PATCH V2] iio - add barometer bmp085. Makes it easy down the line to make sure you have the right patch!.

Quoted 6 lines

To sumarise the important inline comments:

As a general rule, if you know the size of the storage of a give value (because it is comming from hardware) it is better to use fixed sized types. u16 and friends. It's way too unpredictable how large a long or a short might be.

not quite sure if I changed it everywhere. Would you mind double-check it once again?

Quoted 6 lines

drivers/staging/iio/barometer/baro.h line 7

Quoted 4 lines
drivers/staging/iio/barometer/baro.h new file +4 -0
+/* Barometer types of attribute */
+
+#define IIO_DEV_ATTR_BARO_PRESSURE(_mode, _show, _store, _addr)	\
+	IIO_DEVICE_ATTR(baro_pressure, _mode, _show, NULL, _addr)

If it's processed (i.e. si units) it needs to be baro_pressure_input. If raw it needs to be baro_pressure_raw and conversion factors etc provided.

It is in pascal, so I assume it's ok to use the _input suffix.

Quoted 9 lines

drivers/staging/iio/barometer/bmp085.c line 37

Quoted 5 lines
drivers/staging/iio/barometer/bmp085.c new file +5 -0
+#include "bmp085.h"
+
+int oss = 3;
+module_param(oss, int , S_IRUSR);
+MODULE_PARM_DESC(oss, "Oversampling setting [0-3]");

Not convinced this should be a module parameter. Better to use a combination of board config (for default on a given board) and appropriate sysfs attribute to allow it to be changed. Still, fine for initial merge, we can change this later.

Well maybe this needs another iteration, because oss means oversampling_setting which describes the sampling methode of the hardware (ultra low power, standard, high resolution, ultra high resolution). The conversion time depends on this. So maybe we should provide this information through strings instead of the oss number.

Quoted 7 lines

drivers/staging/iio/barometer/bmp085.c line 178

Quoted 5 lines
drivers/staging/iio/barometer/bmp085.c new file +5 -0
+	up = (((unsigned long) ret1 << 16) | ((unsigned long) ret2 << 8)
+				| (unsigned long) xlsb) >> (8 - data->oss);
+	data->up = up;
+
+	pressure = bmp085_calc_pressure(client, up);

Why cache the pressure?

drivers/staging/iio/barometer/bmp085.c line 179

Quoted 1 line
drivers/staging/iio/barometer/bmp085.c new file +1 -0
+	data->pressure = pressure;

It's not necessary here but later on we might put it in a ring_buffer or something. For now we can delete it from the source and header files.

Quoted 6 lines
Quoted 2 lines

+ * In standard mode, the temperature has to be reat every second before the
+ * pressure can be reat. We leave this semantics to the userspace, if later

past tense of read is infact read not reat.

Quoted 2 lines

+ * on a trigger based reading will be implemented, this should be taken into
+ * account.

Ouch, that's an uggly requirement.

Maybe we should read the temperature everytime before reading the pressure, or we should put a trigger as Shubhrajyoti proposed. (Sorry I have not had a look on your driver...).

Quoted 6 lines
Quoted 6 lines

+ */

drivers/staging/iio/barometer/bmp085.c new file +5 -0
+static ssize_t barometer_show_pressure(struct device *dev,
+		struct device_attribute *da, char *buf)
+{
+	struct iio_dev *indio_dev = dev_get_drvdata(dev);
+	struct bmp085_data *data = indio_dev->dev_data;
Quoted 8 lines

drivers/staging/iio/barometer/bmp085.c line 223

Quoted 7 lines
drivers/staging/iio/barometer/bmp085.c new file +7 -0
+	struct i2c_client *client = data->client;
+	long status;
+
+	status = bmp085_read_pressure(client);
+	if (status < 0)
+		dev_warn(&client->dev, "error reading pressure: %ld\n", status);
+

Why cache the preesure?

See above.

Quoted 9 lines

drivers/staging/iio/barometer/bmp085.c

Quoted 7 lines
drivers/staging/iio/barometer/bmp085.c new file +6 -0
+	data->pressure = status;
+
+	return sprintf(buf, "%ld\n", data->pressure);
+}
 
+	if (mutex_is_locked(&data->bmp085_lock))
+		mutex_unlock(&data->bmp085_lock);

Something weird is occuring if you can get here without the lock being unlocked.

That's true for now, but if you use triggers, it might be different,
right? Anyway for now I deleted the lines.

Quoted 3 lines

drivers/staging/iio/barometer/bmp085.h line 45

Quoted 1 line
drivers/staging/iio/barometer/bmp085.h new file +1 -0
+	long temp;

Why long? Looking at the code this always looks to be 16 bit to me, so s16 would be more appropraite.

As I mentioned beforehand, for now we can delete this anyway. We just have to think about the shorts in the code...

Quoted 3 lines

Review

Quoted 3 lines
(quoted diff) +2 -0
+	long pressure;
+

Regards,
Matthias