sergiotarxz/nuttx
sergiotarxz/nuttx
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

power: battery_charger: add ioctl for charging input current

Browse Source
This commit is contained in:
Juha Niskanen 2017-06-06 06:56:50 -06:00 committed by Gregory Nutt
parent 9120a78ee3
commit e577072790
4 changed files with 92 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
drivers/power/battery_charger.c
View File

@ -227,6 +227,18 @@ static int bat_charger_ioctl(FAR struct file *filep, int cmd,
} }
break; break;
case BATIOC_INPUT_CURRENT:
{
int amps;
FAR int *ampsp = (FAR int *)((uintptr_t)arg);
if (ampsp)
{
amps = *ampsp;
ret = dev->ops->input_current(dev, amps);
}
}
break;
default: default:
_err("ERROR: Unrecognized cmd: %d\n", cmd); _err("ERROR: Unrecognized cmd: %d\n", cmd);
ret = -ENOTTY; ret = -ENOTTY;

75
drivers/power/bq2425x.c
View File

@ -122,6 +122,7 @@ static inline int bq2425x_getreport(FAR struct bq2425x_dev_s *priv,
uint8_t *report); uint8_t *report);
static inline int bq2425x_reset(FAR struct bq2425x_dev_s *priv); static inline int bq2425x_reset(FAR struct bq2425x_dev_s *priv);
static inline int bq2425x_watchdog(FAR struct bq2425x_dev_s *priv, bool enable); static inline int bq2425x_watchdog(FAR struct bq2425x_dev_s *priv, bool enable);
static inline int bq2425x_powersupply(FAR struct bq2425x_dev_s *priv, int current);
static inline int bq2425x_setvolt(FAR struct bq2425x_dev_s *priv, int volts); static inline int bq2425x_setvolt(FAR struct bq2425x_dev_s *priv, int volts);
static inline int bq2425x_setcurr(FAR struct bq2425x_dev_s *priv, int current); static inline int bq2425x_setcurr(FAR struct bq2425x_dev_s *priv, int current);
@ -132,6 +133,7 @@ static int bq2425x_health(struct battery_charger_dev_s *dev, int *health);
static int bq2425x_online(struct battery_charger_dev_s *dev, bool *status); static int bq2425x_online(struct battery_charger_dev_s *dev, bool *status);
static int bq2425x_voltage(struct battery_charger_dev_s *dev, int value); static int bq2425x_voltage(struct battery_charger_dev_s *dev, int value);
static int bq2425x_current(struct battery_charger_dev_s *dev, int value); static int bq2425x_current(struct battery_charger_dev_s *dev, int value);
static int bq2425x_input_current(struct battery_charger_dev_s *dev, int value);
/**************************************************************************** /****************************************************************************
* Private Data * Private Data
@ -143,7 +145,8 @@ static const struct battery_charger_operations_s g_bq2425xops =
bq2425x_health, bq2425x_health,
bq2425x_online, bq2425x_online,
bq2425x_voltage, bq2425x_voltage,
bq2425x_current bq2425x_current,
bq2425x_input_current
}; };
/**************************************************************************** /****************************************************************************
@ -273,7 +276,7 @@ static inline int bq2425x_reset(FAR struct bq2425x_dev_s *priv)
ret = bq2425x_getreg8(priv, BQ2425X_REG_2, &regval); ret = bq2425x_getreg8(priv, BQ2425X_REG_2, &regval);
if (ret < 0) if (ret < 0)
{ {
baterr("ERROR: Error reading from BQ2425X! Error = %d\n", ret); baterr("ERROR: Error reading from BQ2425X! Error = %d\n", ret);
return ret; return ret;
} }
@ -283,7 +286,7 @@ static inline int bq2425x_reset(FAR struct bq2425x_dev_s *priv)
ret = bq2425x_putreg8(priv, BQ2425X_REG_2, regval); ret = bq2425x_putreg8(priv, BQ2425X_REG_2, regval);
if (ret < 0) if (ret < 0)
{ {
baterr("ERROR: Error writing to BQ2425X! Error = %d\n", ret); baterr("ERROR: Error writing to BQ2425X! Error = %d\n", ret);
return ret; return ret;
} }
@ -297,7 +300,7 @@ static inline int bq2425x_reset(FAR struct bq2425x_dev_s *priv)
ret = bq2425x_putreg8(priv, BQ2425X_REG_2, regval); ret = bq2425x_putreg8(priv, BQ2425X_REG_2, regval);
if (ret < 0) if (ret < 0)
{ {
baterr("ERROR: Error writing to BQ2425X! Error = %d\n", ret); baterr("ERROR: Error writing to BQ2425X! Error = %d\n", ret);
return ret; return ret;
} }
@ -320,7 +323,7 @@ static inline int bq2425x_watchdog(FAR struct bq2425x_dev_s *priv, bool enable)
ret = bq2425x_getreg8(priv, BQ2425X_REG_1, &regval); ret = bq2425x_getreg8(priv, BQ2425X_REG_1, &regval);
if (ret < 0) if (ret < 0)
{ {
baterr("ERROR: Error reading from BQ2425X! Error = %d\n", ret); baterr("ERROR: Error reading from BQ2425X! Error = %d\n", ret);
return ret; return ret;
} }
@ -336,7 +339,7 @@ static inline int bq2425x_watchdog(FAR struct bq2425x_dev_s *priv, bool enable)
ret = bq2425x_putreg8(priv, BQ2425X_REG_1, regval); ret = bq2425x_putreg8(priv, BQ2425X_REG_1, regval);
if (ret < 0) if (ret < 0)
{ {
baterr("ERROR: Error writing to BQ2425X! Error = %d\n", ret); baterr("ERROR: Error writing to BQ2425X! Error = %d\n", ret);
return ret; return ret;
} }
@ -493,6 +496,10 @@ static inline int bq2425x_powersupply(FAR struct bq2425x_dev_s *priv, int curren
switch (current) switch (current)
{ {
case BATTERY_INPUT_CURRENT_EXT_LIM:
idx = BQ2425X_INP_CURR_EXT_ILIM;
break;
case 100: case 100:
idx = BQ2425X_INP_CURR_LIM_100MA; idx = BQ2425X_INP_CURR_LIM_100MA;
break; break;
@ -518,7 +525,7 @@ static inline int bq2425x_powersupply(FAR struct bq2425x_dev_s *priv, int curren
break; break;
default: default:
baterr("ERROR: Current not supported, setting default to 100mA.!\n"); baterr("ERROR: Current not supported, setting default to 100mA!\n");
idx = BQ2425X_INP_CURR_LIM_100MA; idx = BQ2425X_INP_CURR_LIM_100MA;
break; break;
} }
@ -528,7 +535,7 @@ static inline int bq2425x_powersupply(FAR struct bq2425x_dev_s *priv, int curren
ret = bq2425x_getreg8(priv, BQ2425X_REG_2, &regval); ret = bq2425x_getreg8(priv, BQ2425X_REG_2, &regval);
if (ret < 0) if (ret < 0)
{ {
baterr("ERROR: Error reading from BQ2425X! Error = %d\n", ret); baterr("ERROR: Error reading from BQ2425X! Error = %d\n", ret);
return ret; return ret;
} }
@ -544,7 +551,7 @@ static inline int bq2425x_powersupply(FAR struct bq2425x_dev_s *priv, int curren
ret = bq2425x_putreg8(priv, BQ2425X_REG_2, regval); ret = bq2425x_putreg8(priv, BQ2425X_REG_2, regval);
if (ret < 0) if (ret < 0)
{ {
baterr("ERROR: Error writing to BQ2425X! Error = %d\n", ret); baterr("ERROR: Error writing to BQ2425X! Error = %d\n", ret);
return ret; return ret;
} }
@ -575,7 +582,7 @@ static inline int bq2425x_setvolt(FAR struct bq2425x_dev_s *priv, int volts)
ret = bq2425x_getreg8(priv, BQ2425X_REG_3, &regval); ret = bq2425x_getreg8(priv, BQ2425X_REG_3, &regval);
if (ret < 0) if (ret < 0)
{ {
baterr("ERROR: Error reading from BQ2425X! Error = %d\n", ret); baterr("ERROR: Error reading from BQ2425X! Error = %d\n", ret);
return ret; return ret;
} }
@ -592,7 +599,7 @@ static inline int bq2425x_setvolt(FAR struct bq2425x_dev_s *priv, int volts)
ret = bq2425x_putreg8(priv, BQ2425X_REG_3, regval); ret = bq2425x_putreg8(priv, BQ2425X_REG_3, regval);
if (ret < 0) if (ret < 0)
{ {
baterr("ERROR: Error writing to BQ2425X! Error = %d\n", ret); baterr("ERROR: Error writing to BQ2425X! Error = %d\n", ret);
return ret; return ret;
} }
@ -623,7 +630,7 @@ static inline int bq2425x_setcurr(FAR struct bq2425x_dev_s *priv, int current)
ret = bq2425x_getreg8(priv, BQ2425X_REG_4, &regval); ret = bq2425x_getreg8(priv, BQ2425X_REG_4, &regval);
if (ret < 0) if (ret < 0)
{ {
baterr("ERROR: Error reading from BQ2425X! Error = %d\n", ret); baterr("ERROR: Error reading from BQ2425X! Error = %d\n", ret);
return ret; return ret;
} }
@ -640,7 +647,7 @@ static inline int bq2425x_setcurr(FAR struct bq2425x_dev_s *priv, int current)
ret = bq2425x_putreg8(priv, BQ2425X_REG_4, regval); ret = bq2425x_putreg8(priv, BQ2425X_REG_4, regval);
if (ret < 0) if (ret < 0)
{ {
baterr("ERROR: Error writing to BQ2425X! Error = %d\n", ret); baterr("ERROR: Error writing to BQ2425X! Error = %d\n", ret);
return ret; return ret;
} }
@ -666,7 +673,7 @@ static int bq2425x_voltage(struct battery_charger_dev_s *dev, int value)
ret = bq2425x_setvolt(priv, value); ret = bq2425x_setvolt(priv, value);
if (ret < 0) if (ret < 0)
{ {
baterr("ERROR: Error setting voltage to BQ2425X! Error = %d\n", ret); baterr("ERROR: Error setting voltage to BQ2425X! Error = %d\n", ret);
return ret; return ret;
} }
@ -691,7 +698,30 @@ static int bq2425x_current(struct battery_charger_dev_s *dev, int value)
ret = bq2425x_setcurr(priv, value); ret = bq2425x_setcurr(priv, value);
if (ret < 0) if (ret < 0)
{ {
baterr("ERROR: Error setting current to BQ2425X! Error = %d\n", ret); baterr("ERROR: Error setting current to BQ2425X! Error = %d\n", ret);
return ret;
}
return OK;
}
/****************************************************************************
* Name: bq2425x_input_current
*
* Description:
* Set the power-supply input current limit
*
****************************************************************************/
static int bq2425x_input_current(struct battery_charger_dev_s *dev, int value)
{
FAR struct bq2425x_dev_s *priv = (FAR struct bq2425x_dev_s *)dev;
int ret;
ret = bq2425x_powersupply(priv, value);
if (ret < 0)
{
baterr("ERROR: Failed to set BQ2425x power supply input limit: %d\n", ret);
return ret; return ret;
} }
@ -718,18 +748,19 @@ static int bq2425x_current(struct battery_charger_dev_s *dev, int value)
* Input Parameters: * Input Parameters:
* i2c - An instance of the I2C interface to use to communicate with * i2c - An instance of the I2C interface to use to communicate with
* the BQ2425x * the BQ2425x
* addr - The I2C address of the BQ2425x (Better be 0x36). * addr - The I2C address of the BQ2425x (Better be 0x6a)
* frequency - The I2C frequency * frequency - The I2C frequency
* current - The input current our power-supply can offer to charger
* *
* Returned Value: * Returned Value:
* A pointer to the initializeed lower-half driver instance. A NULL pointer * A pointer to the initialized lower-half driver instance. A NULL pointer
* is returned on a failure to initialize the BQ2425x lower half. * is returned on a failure to initialize the BQ2425x lower half.
* *
****************************************************************************/ ****************************************************************************/
FAR struct battery_charger_dev_s * FAR struct battery_charger_dev_s *
bq2425x_initialize(FAR struct i2c_master_s *i2c, uint8_t addr, bq2425x_initialize(FAR struct i2c_master_s *i2c, uint8_t addr,
uint32_t frequency) uint32_t frequency, int current)
{ {
FAR struct bq2425x_dev_s *priv; FAR struct bq2425x_dev_s *priv;
int ret; int ret;
@ -767,12 +798,12 @@ FAR struct battery_charger_dev_s *
return NULL; return NULL;
} }
/* Define that our power supply can offer 2000mA to the charger */ /* Define the current that our power supply can offer to the charger. */
ret = bq2425x_powersupply(priv, 2000); ret = bq2425x_powersupply(priv, current);
if (ret < 0) if (ret < 0)
{ {
baterr("ERROR: Failed to set BQ2425x power supply current: %d\n", ret); baterr("ERROR: Failed to set BQ2425x power supply input limit: %d\n", ret);
kmm_free(priv); kmm_free(priv);
return NULL; return NULL;
} }
@ -781,4 +812,4 @@ FAR struct battery_charger_dev_s *
return (FAR struct battery_charger_dev_s *)priv; return (FAR struct battery_charger_dev_s *)priv;
} }
#endif /* CONFIG_BATTERY && CONFIG_I2C && CONFIG_I2C_BQ2425X */ #endif /* CONFIG_BATTERY_CHARGER && CONFIG_I2C && CONFIG_I2C_BQ2425X */

27
include/nuttx/power/battery_charger.h
View File

@ -46,7 +46,6 @@
#include <stdbool.h> #include <stdbool.h>
#include <semaphore.h> #include <semaphore.h>
#include <fixedmath.h>
#ifdef CONFIG_BATTERY_CHARGER #ifdef CONFIG_BATTERY_CHARGER
@ -81,8 +80,18 @@
* Input value: A pointer to type bool. * Input value: A pointer to type bool.
* BATIOC_VOLTAGE - Define the wished charger voltage to charge the battery. * BATIOC_VOLTAGE - Define the wished charger voltage to charge the battery.
* Input value: An int defining the voltage value. * Input value: An int defining the voltage value.
* BATIOC_CURRENT - Define the wished charger current to charge the battery.
* Input value: An int defining the current value.
* BATIOC_INPUT_CURRENT - Define the input current limit of power supply.
* Input value: An int defining the input current limit value.
*/ */
/* Special input values for BATIOC_INPUT_CURRENT that may optionally
* be supported by lower-half driver:
*/
#define BATTERY_INPUT_CURRENT_EXT_LIM (-1) /* External input current limit */
/**************************************************************************** /****************************************************************************
* Public Types * Public Types
****************************************************************************/ ****************************************************************************/
@ -127,7 +136,7 @@ struct battery_charger_operations_s
int (*health)(struct battery_charger_dev_s *dev, int *health); int (*health)(struct battery_charger_dev_s *dev, int *health);
/* Return true if the batter is online */ /* Return true if the battery is online */
int (*online)(struct battery_charger_dev_s *dev, bool *status); int (*online)(struct battery_charger_dev_s *dev, bool *status);
@ -138,6 +147,10 @@ struct battery_charger_operations_s
/* Set the wished current rate used for charging */ /* Set the wished current rate used for charging */
int (*current)(struct battery_charger_dev_s *dev, int value); int (*current)(struct battery_charger_dev_s *dev, int value);
/* Set the input current limit of power supply */
int (*input_current)(struct battery_charger_dev_s *dev, int value);
}; };
/* This structure defines the battery driver state structure */ /* This structure defines the battery driver state structure */
@ -201,27 +214,27 @@ int battery_charger_register(FAR const char *devpath,
* CONFIG_BATTERY_CHARGER - Upper half battery fuel gauge driver support * CONFIG_BATTERY_CHARGER - Upper half battery fuel gauge driver support
* CONFIG_I2C - I2C support * CONFIG_I2C - I2C support
* CONFIG_I2C_BQ2425X - And the driver must be explictly selected. * CONFIG_I2C_BQ2425X - And the driver must be explictly selected.
* CONFIG_I2C_BQ24250 or CONFIG_I2C_BQ24251 - The driver must know which
* chip is on the board in order to scale the voltage correctly.
* *
* Input Parameters: * Input Parameters:
* i2c - An instance of the I2C interface to use to communicate with * i2c - An instance of the I2C interface to use to communicate with
* the BQ2425X * the BQ2425X
* addr - The I2C address of the BQ2425X (Better be 0x6A). * addr - The I2C address of the BQ2425X (Better be 0x6A).
* frequency - The I2C frequency * frequency - The I2C frequency
* current - The input current our power-supply can offer to charger
* *
* Returned Value: * Returned Value:
* A pointer to the initializeed battery driver instance. A NULL pointer * A pointer to the initialized battery driver instance. A NULL pointer
* is returned on a failure to initialize the BQ2425X lower half. * is returned on a failure to initialize the BQ2425X lower half.
* *
****************************************************************************/ ****************************************************************************/
#if defined(CONFIG_I2C) && defined(CONFIG_I2C_BQ2425X) #if defined(CONFIG_I2C) && defined(CONFIG_I2C_BQ2425X)
struct i2c_master_s; /* Forward reference */
struct i2c_master_s;
FAR struct battery_charger_dev_s *bq2425x_initialize(FAR struct i2c_master_s *i2c, FAR struct battery_charger_dev_s *bq2425x_initialize(FAR struct i2c_master_s *i2c,
uint8_t addr, uint8_t addr,
uint32_t frequency); uint32_t frequency,
int current);
#endif #endif
#undef EXTERN #undef EXTERN

13
include/nuttx/power/battery_ioctl.h
View File

@ -48,11 +48,12 @@
* Pre-processor Definitions * Pre-processor Definitions
****************************************************************************/ ****************************************************************************/
#define BATIOC_STATE _BATIOC(0x0001) #define BATIOC_STATE _BATIOC(0x0001)
#define BATIOC_HEALTH _BATIOC(0x0002) #define BATIOC_HEALTH _BATIOC(0x0002)
#define BATIOC_ONLINE _BATIOC(0x0003) #define BATIOC_ONLINE _BATIOC(0x0003)
#define BATIOC_VOLTAGE _BATIOC(0x0004) #define BATIOC_VOLTAGE _BATIOC(0x0004)
#define BATIOC_CURRENT _BATIOC(0x0005) #define BATIOC_CURRENT _BATIOC(0x0005)
#define BATIOC_CAPACITY _BATIOC(0x0006) #define BATIOC_INPUT_CURRENT _BATIOC(0x0006)
#define BATIOC_CAPACITY _BATIOC(0x0007)
#endif /* __INCLUDE_NUTTX_POWER_BATTERY_IOCTL_H */ #endif /* __INCLUDE_NUTTX_POWER_BATTERY_IOCTL_H */