public inbox for linux-kernel@vger.kernel.org
 help / color / mirror / Atom feed
* [PATCH] hwmon: HIH-6130: Support I2C bus drivers without I2C_FUNC_SMBUS_QUICK
@ 2013-12-11  0:57 José Miguel Gonçalves
  2013-12-11  1:28 ` [lm-sensors] " Guenter Roeck
  0 siblings, 1 reply; 2+ messages in thread
From: José Miguel Gonçalves @ 2013-12-11  0:57 UTC (permalink / raw)
  To: Jean Delvare, Guenter Roeck, lm-sensors, linux-kernel
  Cc: José Miguel Gonçalves

Some I2C bus drivers do not allow zero-lenght data transfers which are
required to start a mesurement with the HIH6130/1 sensor. Nevertheless,
we can overcome this limitation by writing a zero dummy byte. This byte
is ignored by the sensor and was verified to be working with the OMAP
I2C bus driver in a BeagleBone board.

Signed-off-by: José Miguel Gonçalves <jose.goncalves@inov.pt>
---
 drivers/hwmon/hih6130.c |   16 ++++++++++++++--
 1 file changed, 14 insertions(+), 2 deletions(-)

diff --git a/drivers/hwmon/hih6130.c b/drivers/hwmon/hih6130.c
index 2dc37c7..a860cc4 100644
--- a/drivers/hwmon/hih6130.c
+++ b/drivers/hwmon/hih6130.c
@@ -121,8 +121,20 @@ static int hih6130_update_measurements(struct i2c_client *client)
 	 */
 	if (time_after(jiffies, hih6130->last_update + HZ) || !hih6130->valid) {
 
-		/* write to slave address, no data, to request a measurement */
-		ret = i2c_master_send(client, tmp, 0);
+		/*
+		 * Write to slave address, to request a measurement.
+		 * According with the datasheet it should be with no data, but
+		 * for systems with I2C bus drivers that do not allow zero
+		 * length packets we write one dummy byte to allow sensor
+		 * measurements on them.
+		 */
+		if (i2c_get_functionality(client->adapter) &
+		    I2C_FUNC_SMBUS_QUICK) {
+			ret = i2c_master_send(client, tmp, 0);
+		} else {
+			tmp[0] = 0;
+			ret = i2c_master_send(client, tmp, 1);
+		}
 		if (ret < 0)
 			goto out;
 
-- 
1.7.10.4


^ permalink raw reply related	[flat|nested] 2+ messages in thread

* Re: [lm-sensors] [PATCH] hwmon: HIH-6130: Support I2C bus drivers without I2C_FUNC_SMBUS_QUICK
  2013-12-11  0:57 [PATCH] hwmon: HIH-6130: Support I2C bus drivers without I2C_FUNC_SMBUS_QUICK José Miguel Gonçalves
@ 2013-12-11  1:28 ` Guenter Roeck
  0 siblings, 0 replies; 2+ messages in thread
From: Guenter Roeck @ 2013-12-11  1:28 UTC (permalink / raw)
  To: José Miguel Gonçalves, Jean Delvare, Guenter Roeck,
	lm-sensors, linux-kernel

On 12/10/2013 04:57 PM, José Miguel Gonçalves wrote:
> Some I2C bus drivers do not allow zero-lenght data transfers which are

s/lenght/length/

> required to start a mesurement with the HIH6130/1 sensor. Nevertheless,

s/mesurement/measurement/

> we can overcome this limitation by writing a zero dummy byte. This byte
> is ignored by the sensor and was verified to be working with the OMAP
> I2C bus driver in a BeagleBone board.
>
> Signed-off-by: José Miguel Gonçalves <jose.goncalves@inov.pt>
> ---
>   drivers/hwmon/hih6130.c |   16 ++++++++++++++--
>   1 file changed, 14 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/hwmon/hih6130.c b/drivers/hwmon/hih6130.c
> index 2dc37c7..a860cc4 100644
> --- a/drivers/hwmon/hih6130.c
> +++ b/drivers/hwmon/hih6130.c
> @@ -121,8 +121,20 @@ static int hih6130_update_measurements(struct i2c_client *client)
>   	 */
>   	if (time_after(jiffies, hih6130->last_update + HZ) || !hih6130->valid) {
>
> -		/* write to slave address, no data, to request a measurement */
> -		ret = i2c_master_send(client, tmp, 0);
> +		/*
> +		 * Write to slave address, to request a measurement.

s/,//

> +		 * According with the datasheet it should be with no data, but
> +		 * for systems with I2C bus drivers that do not allow zero
> +		 * length packets we write one dummy byte to allow sensor
> +		 * measurements on them.
> +		 */
> +		if (i2c_get_functionality(client->adapter) &
> +		    I2C_FUNC_SMBUS_QUICK) {
> +			ret = i2c_master_send(client, tmp, 0);
> +		} else {
> +			tmp[0] = 0;
> +			ret = i2c_master_send(client, tmp, 1);
> +		}

You can simplify this code by introducing a variable to hold
the write length into struct hih6130. This variable can be
initialized with 1 or 0 in the probe function.

	if (i2c_check_functionality(client->adapter, I2C_FUNC_SMBUS_QUICK))
		hih6130->write_length = 0;
	else
		hih6130->write_length = 1;

Then replace above code with

	tmp[0] = 0;
	ret = i2c_master_send(client, tmp, hih6130->write_length);

This way you don't have to call i2c_{get,check}_functionality() repeatedly.

Thanks,
Guenter
	
>   		if (ret < 0)
>   			goto out;
>
>


^ permalink raw reply	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2013-12-11  1:28 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2013-12-11  0:57 [PATCH] hwmon: HIH-6130: Support I2C bus drivers without I2C_FUNC_SMBUS_QUICK José Miguel Gonçalves
2013-12-11  1:28 ` [lm-sensors] " Guenter Roeck

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox