diff options
| -rw-r--r-- | drivers/i2c/chips/pcf50606.c | 31 |
1 files changed, 19 insertions, 12 deletions
diff --git a/drivers/i2c/chips/pcf50606.c b/drivers/i2c/chips/pcf50606.c index a1c92d3f2a4..aaec6e80eb5 100644 --- a/drivers/i2c/chips/pcf50606.c +++ b/drivers/i2c/chips/pcf50606.c @@ -72,12 +72,19 @@ static unsigned short normal_i2c[] = { 0x08, I2C_CLIENT_END }; I2C_CLIENT_INSMOD_1(pcf50606); -#define PCF50606_F_CHG_FAST 0x00000001 /* Charger Fast allowed */ -#define PCF50606_F_CHG_PRESENT 0x00000002 /* Charger present */ -#define PCF50606_F_CHG_FOK 0x00000004 /* Fast OK for battery */ -#define PCF50606_F_CHG_ERR 0x00000008 /* Charger Error */ -#define PCF50606_F_CHG_PROT 0x00000010 /* Charger Protection */ -#define PCF50606_F_CHG_READY 0x00000020 /* Charging completed */ +#define PCF50606_B_CHG_FAST 0 /* Charger Fast allowed */ +#define PCF50606_B_CHG_PRESENT 1 /* Charger present */ +#define PCF50606_B_CHG_FOK 2 /* Fast OK for battery */ +#define PCF50606_B_CHG_ERR 3 /* Charger Error */ +#define PCF50606_B_CHG_PROT 4 /* Charger Protection */ +#define PCF50606_B_CHG_READY 5 /* Charging completed */ + +#define PCF50606_F_CHG_FAST (1<<PCF50606_B_CHG_FAST) /* Charger Fast allowed */ +#define PCF50606_F_CHG_PRESENT (1<<PCF50606_B_CHG_PRESENT) /* Charger present */ +#define PCF50606_F_CHG_FOK (1<<PCF50606_B_CHG_FOK) /* Fast OK for battery */ +#define PCF50606_F_CHG_ERR (1<<PCF50606_B_CHG_ERR) /* Charger Error */ +#define PCF50606_F_CHG_PROT (1<<PCF50606_B_CHG_PROT) /* Charger Protection */ +#define PCF50606_F_CHG_READY (1<<PCF50606_B_CHG_READY) /* Charging completed */ #define PCF50606_F_CHG_MASK 0x000000fc #define PCF50606_F_PWR_PRESSED 0x00000100 @@ -1087,12 +1094,12 @@ static ssize_t set_chgmode(struct device *dev, struct device_attribute *attr, static DEVICE_ATTR(chgmode, S_IRUGO | S_IWUSR, show_chgmode, set_chgmode); static const char *chgstate_names[] = { - [PCF50606_F_CHG_FAST] = "fast_enabled", - [PCF50606_F_CHG_PRESENT] = "present", - [PCF50606_F_CHG_FOK] = "fast_ok", - [PCF50606_F_CHG_ERR] = "error", - [PCF50606_F_CHG_PROT] = "protection", - [PCF50606_F_CHG_READY] = "ready", + [PCF50606_B_CHG_FAST] = "fast_enabled", + [PCF50606_B_CHG_PRESENT] = "present", + [PCF50606_B_CHG_FOK] = "fast_ok", + [PCF50606_B_CHG_ERR] = "error", + [PCF50606_B_CHG_PROT] = "protection", + [PCF50606_B_CHG_READY] = "ready", }; static ssize_t show_chgstate(struct device *dev, struct device_attribute *attr, |