Corrected temperature and time to empty/full conversions.
Temperature is in 0.1°C, time is in seconds.
Signed-off-by: Benson Leung <[email protected]>
---
drivers/power/bq20z75.c | 18 ++++++++++++------
1 files changed, 12 insertions(+), 6 deletions(-)
diff --git a/drivers/power/bq20z75.c b/drivers/power/bq20z75.c
index 4141775..998123e 100644
--- a/drivers/power/bq20z75.c
+++ b/drivers/power/bq20z75.c
@@ -269,12 +269,15 @@ static void bq20z75_unit_adjustment(struct i2c_client *client,
{
#define BASE_UNIT_CONVERSION 1000
#define BATTERY_MODE_CAP_MULT_WATT (10 * BASE_UNIT_CONVERSION)
-#define TIME_UNIT_CONVERSION 600
-#define TEMP_KELVIN_TO_CELCIUS 2731
+#define TIME_UNIT_CONVERSION 60
+#define TEMP_KELVIN_TO_CELSIUS 2731
switch (psp) {
case POWER_SUPPLY_PROP_ENERGY_NOW:
case POWER_SUPPLY_PROP_ENERGY_FULL:
case POWER_SUPPLY_PROP_ENERGY_FULL_DESIGN:
+ /* bq20z75 provides energy in units of 10mWh.
+ * Convert to µW
+ */
val->intval *= BATTERY_MODE_CAP_MULT_WATT;
break;
@@ -288,14 +291,17 @@ static void bq20z75_unit_adjustment(struct i2c_client *client,
break;
case POWER_SUPPLY_PROP_TEMP:
- /* bq20z75 provides battery tempreture in 0.1°K
- * so convert it to 0.1°C */
- val->intval -= TEMP_KELVIN_TO_CELCIUS;
- val->intval *= 10;
+ /* bq20z75 provides battery temperature in 0.1K
+ * so convert it to 0.1°C
+ */
+ val->intval -= TEMP_KELVIN_TO_CELSIUS;
break;
case POWER_SUPPLY_PROP_TIME_TO_EMPTY_AVG:
case POWER_SUPPLY_PROP_TIME_TO_FULL_AVG:
+ /* bq20z75 provides time to empty and time to full in minutes.
+ * Convert to seconds
+ */
val->intval *= TIME_UNIT_CONVERSION;
break;
--
1.7.1
Corrected temperature and time to empty/full conversions.
Temperature is in 0.1°C, time is in seconds.
Corrected units in comment. "Convert to µWh."
Signed-off-by: Benson Leung <[email protected]>
---
drivers/power/bq20z75.c | 18 ++++++++++++------
1 files changed, 12 insertions(+), 6 deletions(-)
diff --git a/drivers/power/bq20z75.c b/drivers/power/bq20z75.c
index 4141775..123e169 100644
--- a/drivers/power/bq20z75.c
+++ b/drivers/power/bq20z75.c
@@ -269,12 +269,15 @@ static void bq20z75_unit_adjustment(struct i2c_client *client,
{
#define BASE_UNIT_CONVERSION 1000
#define BATTERY_MODE_CAP_MULT_WATT (10 * BASE_UNIT_CONVERSION)
-#define TIME_UNIT_CONVERSION 600
-#define TEMP_KELVIN_TO_CELCIUS 2731
+#define TIME_UNIT_CONVERSION 60
+#define TEMP_KELVIN_TO_CELSIUS 2731
switch (psp) {
case POWER_SUPPLY_PROP_ENERGY_NOW:
case POWER_SUPPLY_PROP_ENERGY_FULL:
case POWER_SUPPLY_PROP_ENERGY_FULL_DESIGN:
+ /* bq20z75 provides energy in units of 10mWh.
+ * Convert to µWh
+ */
val->intval *= BATTERY_MODE_CAP_MULT_WATT;
break;
@@ -288,14 +291,17 @@ static void bq20z75_unit_adjustment(struct i2c_client *client,
break;
case POWER_SUPPLY_PROP_TEMP:
- /* bq20z75 provides battery tempreture in 0.1°K
- * so convert it to 0.1°C */
- val->intval -= TEMP_KELVIN_TO_CELCIUS;
- val->intval *= 10;
+ /* bq20z75 provides battery temperature in 0.1K
+ * so convert it to 0.1°C
+ */
+ val->intval -= TEMP_KELVIN_TO_CELSIUS;
break;
case POWER_SUPPLY_PROP_TIME_TO_EMPTY_AVG:
case POWER_SUPPLY_PROP_TIME_TO_FULL_AVG:
+ /* bq20z75 provides time to empty and time to full in minutes.
+ * Convert to seconds
+ */
val->intval *= TIME_UNIT_CONVERSION;
break;
--
1.7.1
On Sun, 2011-02-27 at 17:41 -0800, Benson Leung wrote:
> Corrected temperature and time to empty/full conversions.
> Temperature is in 0.1°C, time is in seconds.
>
> Corrected units in comment. "Convert to µWh."
>
> Signed-off-by: Benson Leung <[email protected]>
> ---
> drivers/power/bq20z75.c | 18 ++++++++++++------
> 1 files changed, 12 insertions(+), 6 deletions(-)
>
> diff --git a/drivers/power/bq20z75.c b/drivers/power/bq20z75.c
> index 4141775..123e169 100644
> --- a/drivers/power/bq20z75.c
> +++ b/drivers/power/bq20z75.c
> @@ -269,12 +269,15 @@ static void bq20z75_unit_adjustment(struct i2c_client *client,
> {
> #define BASE_UNIT_CONVERSION 1000
> #define BATTERY_MODE_CAP_MULT_WATT (10 * BASE_UNIT_CONVERSION)
> -#define TIME_UNIT_CONVERSION 600
> -#define TEMP_KELVIN_TO_CELCIUS 2731
> +#define TIME_UNIT_CONVERSION 60
> +#define TEMP_KELVIN_TO_CELSIUS 2731
> switch (psp) {
> case POWER_SUPPLY_PROP_ENERGY_NOW:
> case POWER_SUPPLY_PROP_ENERGY_FULL:
> case POWER_SUPPLY_PROP_ENERGY_FULL_DESIGN:
> + /* bq20z75 provides energy in units of 10mWh.
> + * Convert to µWh
> + */
> val->intval *= BATTERY_MODE_CAP_MULT_WATT;
> break;
>
> @@ -288,14 +291,17 @@ static void bq20z75_unit_adjustment(struct i2c_client *client,
> break;
>
> case POWER_SUPPLY_PROP_TEMP:
> - /* bq20z75 provides battery tempreture in 0.1°K
> - * so convert it to 0.1°C */
> - val->intval -= TEMP_KELVIN_TO_CELCIUS;
> - val->intval *= 10;
> + /* bq20z75 provides battery temperature in 0.1K
> + * so convert it to 0.1°C
> + */
> + val->intval -= TEMP_KELVIN_TO_CELSIUS;
> break;
>
> case POWER_SUPPLY_PROP_TIME_TO_EMPTY_AVG:
> case POWER_SUPPLY_PROP_TIME_TO_FULL_AVG:
> + /* bq20z75 provides time to empty and time to full in minutes.
> + * Convert to seconds
> + */
> val->intval *= TIME_UNIT_CONVERSION;
> break;
>
LGTM
Acked-by: Rhyland Klein <[email protected]>
Hi Anton,
Rhyland has LGTM'd my change to the bq20z75 driver to fix temperature
and time units. Can it go upstream?
Thanks,
Benson
On Wed, Mar 9, 2011 at 11:00 AM, Rhyland Klein <[email protected]> wrote:
>
> On Sun, 2011-02-27 at 17:41 -0800, Benson Leung wrote:
> > Corrected temperature and time to empty/full conversions.
> > Temperature is in 0.1?C, time is in seconds.
> >
> > Corrected units in comment. "Convert to ?Wh."
> >
> > Signed-off-by: Benson Leung <[email protected]>
> > ---
> > ?drivers/power/bq20z75.c | ? 18 ++++++++++++------
> > ?1 files changed, 12 insertions(+), 6 deletions(-)
> >
> > diff --git a/drivers/power/bq20z75.c b/drivers/power/bq20z75.c
> > index 4141775..123e169 100644
> > --- a/drivers/power/bq20z75.c
> > +++ b/drivers/power/bq20z75.c
> > @@ -269,12 +269,15 @@ static void ?bq20z75_unit_adjustment(struct i2c_client *client,
> > ?{
> > ?#define BASE_UNIT_CONVERSION ? ? ? ? 1000
> > ?#define BATTERY_MODE_CAP_MULT_WATT ? (10 * BASE_UNIT_CONVERSION)
> > -#define TIME_UNIT_CONVERSION ? ? ? ? 600
> > -#define TEMP_KELVIN_TO_CELCIUS ? ? ? ? ? ? ? 2731
> > +#define TIME_UNIT_CONVERSION ? ? ? ? 60
> > +#define TEMP_KELVIN_TO_CELSIUS ? ? ? ? ? ? ? 2731
> > ? ? ? switch (psp) {
> > ? ? ? case POWER_SUPPLY_PROP_ENERGY_NOW:
> > ? ? ? case POWER_SUPPLY_PROP_ENERGY_FULL:
> > ? ? ? case POWER_SUPPLY_PROP_ENERGY_FULL_DESIGN:
> > + ? ? ? ? ? ? /* bq20z75 provides energy in units of 10mWh.
> > + ? ? ? ? ? ? ?* Convert to ?Wh
> > + ? ? ? ? ? ? ?*/
> > ? ? ? ? ? ? ? val->intval *= BATTERY_MODE_CAP_MULT_WATT;
> > ? ? ? ? ? ? ? break;
> >
> > @@ -288,14 +291,17 @@ static void ?bq20z75_unit_adjustment(struct i2c_client *client,
> > ? ? ? ? ? ? ? break;
> >
> > ? ? ? case POWER_SUPPLY_PROP_TEMP:
> > - ? ? ? ? ? ? /* bq20z75 provides battery tempreture in 0.1?K
> > - ? ? ? ? ? ? ?* so convert it to 0.1?C */
> > - ? ? ? ? ? ? val->intval -= TEMP_KELVIN_TO_CELCIUS;
> > - ? ? ? ? ? ? val->intval *= 10;
> > + ? ? ? ? ? ? /* bq20z75 provides battery temperature in 0.1K
> > + ? ? ? ? ? ? ?* so convert it to 0.1?C
> > + ? ? ? ? ? ? ?*/
> > + ? ? ? ? ? ? val->intval -= TEMP_KELVIN_TO_CELSIUS;
> > ? ? ? ? ? ? ? break;
> >
> > ? ? ? case POWER_SUPPLY_PROP_TIME_TO_EMPTY_AVG:
> > ? ? ? case POWER_SUPPLY_PROP_TIME_TO_FULL_AVG:
> > + ? ? ? ? ? ? /* bq20z75 provides time to empty and time to full in minutes.
> > + ? ? ? ? ? ? ?* Convert to seconds
> > + ? ? ? ? ? ? ?*/
> > ? ? ? ? ? ? ? val->intval *= TIME_UNIT_CONVERSION;
> > ? ? ? ? ? ? ? break;
> >
>
> LGTM
>
> Acked-by: Rhyland Klein <[email protected]>
>
>
--
Benson Leung
Software Engineer,?Chrom* OS
[email protected]
On Wed, Mar 16, 2011 at 02:41:52AM -0700, Benson Leung wrote:
> Hi Anton,
>
> Rhyland has LGTM'd my change to the bq20z75 driver to fix temperature
> and time units. Can it go upstream?
Sorry for the delay, the patch is now applied.
Thanks!
--
Anton Vorontsov
Email: [email protected]