diff options
| author | Chandler Zhang <chazhang@nvidia.com> | 2012-03-09 15:48:42 +0800 |
|---|---|---|
| committer | Rohan Somvanshi <rsomvanshi@nvidia.com> | 2012-03-15 08:43:18 -0700 |
| commit | d748841ab04d0cb829e426cd0301cd4de48a3983 (patch) | |
| tree | 5fdb3fb809899d3f64d475ee932b671e69897891 /drivers/power | |
| parent | 570a5790a9ce288c093ea9ae838cf8e7e8aa8fe6 (diff) | |
power: smb349: set PGOOD to active low at OTG
1. Turn PGOOD to active low when OTG is enabled
2. Free irq in error handling and smb349_remove
Bug 937188
Change-Id: I94a58c8dfd9066034335ec4507b80d1607fe029f
Signed-off-by: Chandler Zhang <chazhang@nvidia.com>
Reviewed-on: http://git-master/r/89028
Reviewed-by: Rohan Somvanshi <rsomvanshi@nvidia.com>
Tested-by: Rohan Somvanshi <rsomvanshi@nvidia.com>
Diffstat (limited to 'drivers/power')
| -rw-r--r-- | drivers/power/smb349-charger.c | 51 |
1 files changed, 36 insertions, 15 deletions
diff --git a/drivers/power/smb349-charger.c b/drivers/power/smb349-charger.c index 880fa04c5383..d6a3ef2afc53 100644 --- a/drivers/power/smb349-charger.c +++ b/drivers/power/smb349-charger.c @@ -181,36 +181,53 @@ static int smb349_configure_otg(struct i2c_client *client, int enable) } if (enable) { + /* Configure PGOOD to be active low */ + ret = smb349_read(client, SMB349_SYSOK_USB3); + if (ret < 0) { + dev_err(&client->dev, "%s: err %d\n", __func__, ret); + goto error; + } + + ret = smb349_write(client, SMB349_SYSOK_USB3, (ret & (~(1)))); + if (ret < 0) { + dev_err(&client->dev, "%s: err %d\n", __func__, ret); + goto error; + } + /* Enable OTG */ - ret = smb349_update_reg(client, SMB349_CMD_REG, 0x10); - if (ret < 0) { - dev_err(&client->dev, "%s: Failed in writing register" + ret = smb349_update_reg(client, SMB349_CMD_REG, 0x10); + if (ret < 0) { + dev_err(&client->dev, "%s: Failed in writing register" "0x%02x\n", __func__, SMB349_CMD_REG); goto error; - } - + } } else { - /* Disable OTG */ - ret = smb349_read(client, SMB349_CMD_REG); - if (ret < 0) { + /* Disable OTG */ + ret = smb349_read(client, SMB349_CMD_REG); + if (ret < 0) { dev_err(&client->dev, "%s: err %d\n", __func__, ret); goto error; - } + } + + ret = smb349_write(client, SMB349_CMD_REG, (ret & (~(1<<4)))); + if (ret < 0) { + dev_err(&client->dev, "%s: err %d\n", __func__, ret); + goto error; + } - ret = smb349_write(client, SMB349_CMD_REG, (ret & (~(1<<4)))); - if (ret < 0) { + /* Configure PGOOD to be active high */ + ret = smb349_update_reg(client, SMB349_SYSOK_USB3, 0x01); + if (ret < 0) { dev_err(&client->dev, "%s: err %d\n", __func__, ret); goto error; - } + } } /* Disable volatile writes to registers */ ret = smb349_volatile_writes(client, SMB349_DISABLE_WRITE); - if (ret < 0) { + if (ret < 0) dev_err(&client->dev, "%s error in configuring OTG..\n", __func__); - goto error; - } error: return ret; } @@ -473,8 +490,10 @@ static int __devinit smb349_probe(struct i2c_client *client, __func__); goto error; } + return 0; error: + free_irq(irq_num, charger); kfree(charger); return ret; } @@ -483,7 +502,9 @@ static int __devexit smb349_remove(struct i2c_client *client) { struct smb349_charger *charger = i2c_get_clientdata(client); + free_irq(gpio_to_irq(client->irq), charger); kfree(charger); + return 0; } |