diff options
| author | Linux Build Service Account <lnxbuild@localhost> | 2014-07-22 19:00:59 -0700 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2014-07-22 19:00:59 -0700 |
| commit | e6abc9c8768692ce92395d75fccc66a1196f5b7c (patch) | |
| tree | c2ce3edaa2f74f236b191e31b33448725f8f5e7d | |
| parent | 5926263f996bc002123149ffc487abf72189acb6 (diff) | |
| parent | 8f46fe106a8f436558061e166228a1bc24c15e98 (diff) | |
Merge "power: smb1360: Enable temperature and charger-error blinking"
| -rw-r--r-- | drivers/power/smb1360-charger-fg.c | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/drivers/power/smb1360-charger-fg.c b/drivers/power/smb1360-charger-fg.c index 6c68419f2508..63ce62e214d9 100644 --- a/drivers/power/smb1360-charger-fg.c +++ b/drivers/power/smb1360-charger-fg.c @@ -62,6 +62,7 @@ #define CFG_STAT_CTRL_REG 0x09 #define CHG_STAT_IRQ_ONLY_BIT BIT(4) +#define CHG_TEMP_CHG_ERR_BLINK_BIT BIT(3) #define CHG_STAT_ACTIVE_HIGH_BIT BIT(1) #define CHG_STAT_DISABLE_BIT BIT(0) @@ -2227,12 +2228,15 @@ static int smb1360_hw_init(struct smb1360_chip *chip) /* interrupt enabling - active low */ if (chip->client->irq) { - mask = CHG_STAT_IRQ_ONLY_BIT | CHG_STAT_ACTIVE_HIGH_BIT - | CHG_STAT_DISABLE_BIT; + mask = CHG_STAT_IRQ_ONLY_BIT + | CHG_STAT_ACTIVE_HIGH_BIT + | CHG_STAT_DISABLE_BIT + | CHG_TEMP_CHG_ERR_BLINK_BIT; + if (!chip->pulsed_irq) reg = CHG_STAT_IRQ_ONLY_BIT; else - reg = 0; + reg = CHG_TEMP_CHG_ERR_BLINK_BIT; rc = smb1360_masked_write(chip, CFG_STAT_CTRL_REG, mask, reg); if (rc < 0) { dev_err(chip->dev, "Couldn't set irq config rc = %d\n", |