Fwd: [PATCH] bq27x00_battery: Some fixes

Fwd: [PATCH] bq27x00_battery: Some fixes

[Anton Vorontsov]

The same is for this patch.

Comments, Reviewed-by or Acked-by?

p.s. FWIW, I already asked Pali to factor out bq27x00_battery_time()
     fix to a separate patch.

----- Forwarded message from Pali Rohár <pali.rohar@gmail.com> -----

Date: Wed, 26 Jan 2011 21:42:39 +0100
From: Pali Rohár <pali.rohar@gmail.com>
To: Anton Vorontsov <cbouatmailru@gmail.com>
Cc: David Woodhouse <dwmw2@infradead.org>
Subject: Re: [PATCH] bq27x00_battery

This patch fix reporting correct (devided by resistor sense) values on
bq27000/bq27200 batteries.

Signed-off-by: Pali Rohár <pali.rohar@gmail.com>
Tested-by: Pali Rohár <pali.rohar@gmail.com>

--- a/drivers/power/bq27x00_battery.c	2011-01-26 21:30:40.000000000 +0100
+++ b/drivers/power/bq27x00_battery.c	2011-01-26 21:32:34.000000000 +0100
@@ -37,10 +37,11 @@
 #define BQ27x00_REG_TTF			0x18
 #define BQ27x00_REG_TTECP		0x26

+#define BQ27000_RS			20 /* Resistor sense */
 #define BQ27000_REG_RSOC		0x0B /* Relative State-of-Charge */
 #define BQ27000_FLAG_CHGS		BIT(7)

-#define BQ27500_REG_SOC			0x2c
+#define BQ27500_REG_SOC			0x2C
 #define BQ27500_FLAG_DSC		BIT(0)
 #define BQ27500_FLAG_FC			BIT(9)

@@ -112,7 +113,7 @@ static int bq27x00_battery_temperature(s
 }

 /*
- * Return the battery Voltage in milivolts
+ * Return the battery Voltage in µV
  * Or < 0 if something fails.
  */
 static int bq27x00_battery_voltage(struct bq27x00_device_info *di)
@@ -130,7 +131,7 @@ static int bq27x00_battery_voltage(struc
 }

 /*
- * Return the battery average current
+ * Return the battery average current in µA
  * Note that current can be negative signed as well
  * Or 0 if something fails.
  */
@@ -149,6 +150,7 @@ static int bq27x00_battery_current(struc
 	if (di->chip == BQ27500) {
 		/* bq27500 returns signed value */
 		curr = (int)(s16)curr;
+		curr *= 1000;
 	} else {
 		ret = bq27x00_read(BQ27x00_REG_FLAGS, &flags, 0, di);
 		if (ret < 0) {
@@ -159,9 +161,10 @@ static int bq27x00_battery_current(struc
 			dev_dbg(di->dev, "negative current!\n");
 			curr = -curr;
 		}
+		curr = curr * 3570 / BQ27000_RS;
 	}

-	return curr * 1000;
+	return curr;
 }

 /*
@@ -233,7 +236,7 @@ static int bq27x00_battery_time(struct b
 	}

 	if (tval == 65535)
-		return -ENODATA;
+		tval = 0;

 	val->intval = tval * 60;
 	return 0;

----- End forwarded message -----

Re: Fwd: [PATCH] bq27x00_battery: Some fixes

[Rodolfo Giometti]

On Mon, Jan 31, 2011 at 04:54:17PM +0300, Anton Vorontsov wrote:
> The same is for this patch.
> 
> Comments, Reviewed-by or Acked-by?
> 
> p.s. FWIW, I already asked Pali to factor out bq27x00_battery_time()
>      fix to a separate patch.
> 
> ----- Forwarded message from Pali Rohár <pali.rohar@gmail.com> -----
> 
> Date: Wed, 26 Jan 2011 21:42:39 +0100
> From: Pali Rohár <pali.rohar@gmail.com>
> To: Anton Vorontsov <cbouatmailru@gmail.com>
> Cc: David Woodhouse <dwmw2@infradead.org>
> Subject: Re: [PATCH] bq27x00_battery
> 
> This patch fix reporting correct (devided by resistor sense) values on
> bq27000/bq27200 batteries.
> 
> Signed-off-by: Pali Rohár <pali.rohar@gmail.com>
> Tested-by: Pali Rohár <pali.rohar@gmail.com>
> 
> --- a/drivers/power/bq27x00_battery.c	2011-01-26 21:30:40.000000000 +0100
> +++ b/drivers/power/bq27x00_battery.c	2011-01-26 21:32:34.000000000 +0100
> @@ -37,10 +37,11 @@
>  #define BQ27x00_REG_TTF			0x18
>  #define BQ27x00_REG_TTECP		0x26
> 
> +#define BQ27000_RS			20 /* Resistor sense */
>  #define BQ27000_REG_RSOC		0x0B /* Relative State-of-Charge */
>  #define BQ27000_FLAG_CHGS		BIT(7)
> 
> -#define BQ27500_REG_SOC			0x2c
> +#define BQ27500_REG_SOC			0x2C
>  #define BQ27500_FLAG_DSC		BIT(0)
>  #define BQ27500_FLAG_FC			BIT(9)
> 
> @@ -112,7 +113,7 @@ static int bq27x00_battery_temperature(s
>  }
> 
>  /*
> - * Return the battery Voltage in milivolts
> + * Return the battery Voltage in µV
>   * Or < 0 if something fails.
>   */
>  static int bq27x00_battery_voltage(struct bq27x00_device_info *di)
> @@ -130,7 +131,7 @@ static int bq27x00_battery_voltage(struc
>  }

Ok, but I think we should change the function name adding _mV...

> 
>  /*
> - * Return the battery average current
> + * Return the battery average current in µA
>   * Note that current can be negative signed as well
>   * Or 0 if something fails.
>   */
> @@ -149,6 +150,7 @@ static int bq27x00_battery_current(struc
>  	if (di->chip == BQ27500) {
>  		/* bq27500 returns signed value */
>  		curr = (int)(s16)curr;
> +		curr *= 1000;
>  	} else {
>  		ret = bq27x00_read(BQ27x00_REG_FLAGS, &flags, 0, di);
>  		if (ret < 0) {
> @@ -159,9 +161,10 @@ static int bq27x00_battery_current(struc
>  			dev_dbg(di->dev, "negative current!\n");
>  			curr = -curr;
>  		}
> +		curr = curr * 3570 / BQ27000_RS;
>  	}
> 
> -	return curr * 1000;
> +	return curr;
>  }

And here _mA.

>  /*
> @@ -233,7 +236,7 @@ static int bq27x00_battery_time(struct b
>  	}
> 
>  	if (tval == 65535)
> -		return -ENODATA;
> +		tval = 0;
> 
>  	val->intval = tval * 60;
>  	return 0;
> 
> ----- End forwarded message -----

Ciao,

Rodolfo

-- 

GNU/Linux Solutions                  e-mail: giometti@enneenne.com
Linux Device Driver                          giometti@linux.it
Embedded Systems                     phone:  +39 349 2432127
UNIX programming                     skype:  rodolfo.giometti
Freelance ICT Italia - Consulente ICT Italia - www.consulenti-ict.it

Re: Fwd: [PATCH] bq27x00_battery: Some fixes

[Pali Rohár]

2011/1/31 Rodolfo Giometti <giometti@enneenne.com>:
> On Mon, Jan 31, 2011 at 04:54:17PM +0300, Anton Vorontsov wrote:
>> The same is for this patch.
>>
>> Comments, Reviewed-by or Acked-by?
>>
>> p.s. FWIW, I already asked Pali to factor out bq27x00_battery_time()
>>      fix to a separate patch.
>>
>> ----- Forwarded message from Pali Rohár <pali.rohar@gmail.com> -----
>>
>> Date: Wed, 26 Jan 2011 21:42:39 +0100
>> From: Pali Rohár <pali.rohar@gmail.com>
>> To: Anton Vorontsov <cbouatmailru@gmail.com>
>> Cc: David Woodhouse <dwmw2@infradead.org>
>> Subject: Re: [PATCH] bq27x00_battery
>>
>> This patch fix reporting correct (devided by resistor sense) values on
>> bq27000/bq27200 batteries.
>>
>> Signed-off-by: Pali Rohár <pali.rohar@gmail.com>
>> Tested-by: Pali Rohár <pali.rohar@gmail.com>
>>
>> --- a/drivers/power/bq27x00_battery.c 2011-01-26 21:30:40.000000000 +0100
>> +++ b/drivers/power/bq27x00_battery.c 2011-01-26 21:32:34.000000000 +0100
>> @@ -37,10 +37,11 @@
>>  #define BQ27x00_REG_TTF                      0x18
>>  #define BQ27x00_REG_TTECP            0x26
>>
>> +#define BQ27000_RS                   20 /* Resistor sense */
>>  #define BQ27000_REG_RSOC             0x0B /* Relative State-of-Charge */
>>  #define BQ27000_FLAG_CHGS            BIT(7)
>>
>> -#define BQ27500_REG_SOC                      0x2c
>> +#define BQ27500_REG_SOC                      0x2C
>>  #define BQ27500_FLAG_DSC             BIT(0)
>>  #define BQ27500_FLAG_FC                      BIT(9)
>>
>> @@ -112,7 +113,7 @@ static int bq27x00_battery_temperature(s
>>  }
>>
>>  /*
>> - * Return the battery Voltage in milivolts
>> + * Return the battery Voltage in µV
>>   * Or < 0 if something fails.
>>   */
>>  static int bq27x00_battery_voltage(struct bq27x00_device_info *di)
>> @@ -130,7 +131,7 @@ static int bq27x00_battery_voltage(struc
>>  }
>
> Ok, but I think we should change the function name adding _mV...
>
>>
>>  /*
>> - * Return the battery average current
>> + * Return the battery average current in µA
>>   * Note that current can be negative signed as well
>>   * Or 0 if something fails.
>>   */
>> @@ -149,6 +150,7 @@ static int bq27x00_battery_current(struc
>>       if (di->chip == BQ27500) {
>>               /* bq27500 returns signed value */
>>               curr = (int)(s16)curr;
>> +             curr *= 1000;
>>       } else {
>>               ret = bq27x00_read(BQ27x00_REG_FLAGS, &flags, 0, di);
>>               if (ret < 0) {
>> @@ -159,9 +161,10 @@ static int bq27x00_battery_current(struc
>>                       dev_dbg(di->dev, "negative current!\n");
>>                       curr = -curr;
>>               }
>> +             curr = curr * 3570 / BQ27000_RS;
>>       }
>>
>> -     return curr * 1000;
>> +     return curr;
>>  }
>
> And here _mA.
>
>>  /*
>> @@ -233,7 +236,7 @@ static int bq27x00_battery_time(struct b
>>       }
>>
>>       if (tval == 65535)
>> -             return -ENODATA;
>> +             tval = 0;
>>
>>       val->intval = tval * 60;
>>       return 0;
>>
>> ----- End forwarded message -----
>
> Ciao,
>
> Rodolfo
>
> --
>
> GNU/Linux Solutions                  e-mail: giometti@enneenne.com
> Linux Device Driver                          giometti@linux.it
> Embedded Systems                     phone:  +39 349 2432127
> UNIX programming                     skype:  rodolfo.giometti
> Freelance ICT Italia - Consulente ICT Italia - www.consulenti-ict.it
>

Why rename to _mA/_mV? Functions return values in µA/µV (units from
Documentation/power/power_supply_class.txt)

-- 
Pali Rohár
pali.rohar@gmail.com

Re: Fwd: [PATCH] bq27x00_battery: Some fixes

[Lars-Peter Clausen]

On 01/31/2011 02:54 PM, Anton Vorontsov wrote:
> The same is for this patch.
> 
> Comments, Reviewed-by or Acked-by?
> 
> p.s. FWIW, I already asked Pali to factor out bq27x00_battery_time()
>      fix to a separate patch.
> 

Hi

I have a larger series pending which adds support for the bq27000 chip and polling to
the bq27x00 driver. Since this series does some refactoring of the bq27x00 driver, it
might make sense to rebase this (and the other) patch ontop of that series instead of
the other way around.

I'll try to send it in later today or tomorrow. For now you can take a look at it at
http://git.metafoo.de/?p=linux-2.6;a=shortlog;h=refs/heads/bq27x00-for-upstream

- Lars

> ----- Forwarded message from Pali Rohár <pali.rohar@gmail.com> -----
> 
> Date: Wed, 26 Jan 2011 21:42:39 +0100
> From: Pali Rohár <pali.rohar@gmail.com>
> To: Anton Vorontsov <cbouatmailru@gmail.com>
> Cc: David Woodhouse <dwmw2@infradead.org>
> Subject: Re: [PATCH] bq27x00_battery
> 
> This patch fix reporting correct (devided by resistor sense) values on
> bq27000/bq27200 batteries.
> 
> Signed-off-by: Pali Rohár <pali.rohar@gmail.com>
> Tested-by: Pali Rohár <pali.rohar@gmail.com>
> 
> --- a/drivers/power/bq27x00_battery.c	2011-01-26 21:30:40.000000000 +0100
> +++ b/drivers/power/bq27x00_battery.c	2011-01-26 21:32:34.000000000 +0100
> @@ -37,10 +37,11 @@
>  #define BQ27x00_REG_TTF			0x18
>  #define BQ27x00_REG_TTECP		0x26
> 
> +#define BQ27000_RS			20 /* Resistor sense */
>  #define BQ27000_REG_RSOC		0x0B /* Relative State-of-Charge */
>  #define BQ27000_FLAG_CHGS		BIT(7)
> 
> -#define BQ27500_REG_SOC			0x2c
> +#define BQ27500_REG_SOC			0x2C
>  #define BQ27500_FLAG_DSC		BIT(0)
>  #define BQ27500_FLAG_FC			BIT(9)
> 
> @@ -112,7 +113,7 @@ static int bq27x00_battery_temperature(s
>  }
> 
>  /*
> - * Return the battery Voltage in milivolts
> + * Return the battery Voltage in µV
>   * Or < 0 if something fails.
>   */
>  static int bq27x00_battery_voltage(struct bq27x00_device_info *di)
> @@ -130,7 +131,7 @@ static int bq27x00_battery_voltage(struc
>  }
> 
>  /*
> - * Return the battery average current
> + * Return the battery average current in µA
>   * Note that current can be negative signed as well
>   * Or 0 if something fails.
>   */
> @@ -149,6 +150,7 @@ static int bq27x00_battery_current(struc
>  	if (di->chip == BQ27500) {
>  		/* bq27500 returns signed value */
>  		curr = (int)(s16)curr;
> +		curr *= 1000;
>  	} else {
>  		ret = bq27x00_read(BQ27x00_REG_FLAGS, &flags, 0, di);
>  		if (ret < 0) {
> @@ -159,9 +161,10 @@ static int bq27x00_battery_current(struc
>  			dev_dbg(di->dev, "negative current!\n");
>  			curr = -curr;
>  		}
> +		curr = curr * 3570 / BQ27000_RS;
>  	}
> 
> -	return curr * 1000;
> +	return curr;
>  }
> 
>  /*
> @@ -233,7 +236,7 @@ static int bq27x00_battery_time(struct b
>  	}
> 
>  	if (tval == 65535)
> -		return -ENODATA;
> +		tval = 0;
> 
>  	val->intval = tval * 60;
>  	return 0;
> 
> ----- End forwarded message -----
> --
> To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at  http://vger.kernel.org/majordomo-info.html
> Please read the FAQ at  http://www.tux.org/lkml/

Re: Fwd: [PATCH] bq27x00_battery: Some fixes

[Anton Vorontsov]

On Mon, Jan 31, 2011 at 07:15:06PM +0100, Lars-Peter Clausen wrote:
> On 01/31/2011 02:54 PM, Anton Vorontsov wrote:
> > The same is for this patch.
> > 
> > Comments, Reviewed-by or Acked-by?
> > 
> > p.s. FWIW, I already asked Pali to factor out bq27x00_battery_time()
> >      fix to a separate patch.
> > 
> 
> Hi
> 
> I have a larger series pending which adds support for the bq27000 chip and polling to
> the bq27x00 driver. Since this series does some refactoring of the bq27x00 driver, it
> might make sense to rebase this (and the other) patch ontop of that series instead of
> the other way around.

Pali was first to send out his work, so I think that it would make
sense to ask you to rebase your work on top. Especially since Pali's
patches were somewhat reviewed already.

I hope Pali will resend the fixed versions quickly enough so
that I'll apply the patches asap and you'll easily use git
for rebasing.

Thanks!

-- 
Anton Vorontsov
Email: cbouatmailru@gmail.com

Re: Fwd: [PATCH] bq27x00_battery: Some fixes

[Lars-Peter Clausen]

On 01/31/2011 07:27 PM, Anton Vorontsov wrote:
> On Mon, Jan 31, 2011 at 07:15:06PM +0100, Lars-Peter Clausen wrote:
>> On 01/31/2011 02:54 PM, Anton Vorontsov wrote:
>>> The same is for this patch.
>>>
>>> Comments, Reviewed-by or Acked-by?
>>>
>>> p.s. FWIW, I already asked Pali to factor out bq27x00_battery_time()
>>>      fix to a separate patch.
>>>
>>
>> Hi
>>
>> I have a larger series pending which adds support for the bq27000 chip and polling to
>> the bq27x00 driver. Since this series does some refactoring of the bq27x00 driver, it
>> might make sense to rebase this (and the other) patch ontop of that series instead of
>> the other way around.
> 
> Pali was first to send out his work, so I think that it would make
> sense to ask you to rebase your work on top. Especially since Pali's
> patches were somewhat reviewed already.

I suspect it to be substantial more work to rebase mine on top of his. That's why I'm
asking for a exception in this case. I would be willing to adjust his patches, so
they can be applied on top of mine.

> 
> I hope Pali will resend the fixed versions quickly enough so
> that I'll apply the patches asap and you'll easily use git
> for rebasing.
> 

git won't help in this case, because my patches basically rewrite the parts changed
by Palis patches. It would be one merge conflict after another, I guess.

> Thanks!
> 

Re: Fwd: [PATCH] bq27x00_battery: Some fixes

[Pali Rohár]

2011/1/31 Lars-Peter Clausen <lars@metafoo.de>:
> On 01/31/2011 07:27 PM, Anton Vorontsov wrote:
>> On Mon, Jan 31, 2011 at 07:15:06PM +0100, Lars-Peter Clausen wrote:
>>> On 01/31/2011 02:54 PM, Anton Vorontsov wrote:
>>>> The same is for this patch.
>>>>
>>>> Comments, Reviewed-by or Acked-by?
>>>>
>>>> p.s. FWIW, I already asked Pali to factor out bq27x00_battery_time()
>>>>      fix to a separate patch.
>>>>
>>>
>>> Hi
>>>
>>> I have a larger series pending which adds support for the bq27000 chip and polling to
>>> the bq27x00 driver. Since this series does some refactoring of the bq27x00 driver, it
>>> might make sense to rebase this (and the other) patch ontop of that series instead of
>>> the other way around.
>>
>> Pali was first to send out his work, so I think that it would make
>> sense to ask you to rebase your work on top. Especially since Pali's
>> patches were somewhat reviewed already.
>
> I suspect it to be substantial more work to rebase mine on top of his. That's why I'm
> asking for a exception in this case. I would be willing to adjust his patches, so
> they can be applied on top of mine.
>
>>
>> I hope Pali will resend the fixed versions quickly enough so
>> that I'll apply the patches asap and you'll easily use git
>> for rebasing.
>>
>
> git won't help in this case, because my patches basically rewrite the parts changed
> by Palis patches. It would be one merge conflict after another, I guess.
>
>> Thanks!
>>
>
>

Can you then merge my changes with your in git?

-- 
Pali Rohár
pali.rohar@gmail.com