summaryrefslogtreecommitdiff
path: root/drivers/power
diff options
context:
space:
mode:
authorSyed Rafiuddin <srafiuddin@nvidia.com>2012-03-07 15:24:14 +0530
committerSimone Willett <swillett@nvidia.com>2012-03-07 21:49:29 -0800
commit1d7053ebe8ea39b10c22d85987d0107df0f955f3 (patch)
tree416c5ffa15e4b22a53051d2f0504164da3cf6eb7 /drivers/power
parent8de83f0f826e8b5f9d043d60e144ecdb3ac79bc4 (diff)
power: smb349: Enable OTG support
Addition of OTG support in smb349 charger driver Change-Id: Ib38c9f4c06285ae07d93cfa3c6f5e1637aaa9460 Signed-off-by: Syed Rafiuddin <srafiuddin@nvidia.com> Reviewed-on: http://git-master/r/86936 Reviewed-by: Sachin Nikam <snikam@nvidia.com>
Diffstat (limited to 'drivers/power')
-rw-r--r--drivers/power/smb349-charger.c149
1 files changed, 131 insertions, 18 deletions
diff --git a/drivers/power/smb349-charger.c b/drivers/power/smb349-charger.c
index 6a4c738b4647..880fa04c5383 100644
--- a/drivers/power/smb349-charger.c
+++ b/drivers/power/smb349-charger.c
@@ -35,6 +35,7 @@
#include <linux/gpio.h>
#include <linux/interrupt.h>
#include <linux/irq.h>
+#include <linux/usb/otg.h>
#define SMB349_CHARGE 0x00
#define SMB349_CHRG_CRNTS 0x01
@@ -82,6 +83,8 @@
#define ENABLE_CHARGE 0x02
static struct smb349_charger *charger;
+static int smb349_configure_charger(struct i2c_client *client, int value);
+static int smb349_configure_interrupts(struct i2c_client *client);
static int smb349_read(struct i2c_client *client, int reg)
{
@@ -165,33 +168,93 @@ static void smb349_clear_interrupts(struct i2c_client *client)
__func__);
}
-static int smb349_configure_charger(struct i2c_client *client)
+static int smb349_configure_otg(struct i2c_client *client, int enable)
{
int ret = 0;
- /* Enable volatile writes to registers */
+ /*Enable volatile writes to registers*/
ret = smb349_volatile_writes(client, SMB349_ENABLE_WRITE);
if (ret < 0) {
- dev_err(&client->dev, "%s() error in configuring charger..\n",
+ dev_err(&client->dev, "%s error in configuring otg..\n",
__func__);
goto error;
}
- /* Enable charging */
- ret = smb349_update_reg(client, SMB349_CMD_REG, ENABLE_CHARGE);
- if (ret < 0) {
- dev_err(&client->dev, "%s(): Failed in writing register"
+ if (enable) {
+ /* Enable OTG */
+ 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;
+ goto error;
+ }
+
+ } else {
+ /* 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;
+ }
}
- /* Configure THERM ctrl */
- ret = smb349_update_reg(client, SMB349_THERM_CTRL, THERM_CTRL);
+ /* Disable volatile writes to registers */
+ ret = smb349_volatile_writes(client, SMB349_DISABLE_WRITE);
if (ret < 0) {
- dev_err(&client->dev, "%s: err %d\n", __func__, ret);
+ dev_err(&client->dev, "%s error in configuring OTG..\n",
+ __func__);
+ goto error;
+ }
+error:
+ return ret;
+}
+
+static int smb349_configure_charger(struct i2c_client *client, int value)
+{
+ int ret = 0;
+
+ /* Enable volatile writes to registers */
+ ret = smb349_volatile_writes(client, SMB349_ENABLE_WRITE);
+ if (ret < 0) {
+ dev_err(&client->dev, "%s() error in configuring charger..\n",
+ __func__);
goto error;
}
+ if (value) {
+ /* Enable charging */
+ ret = smb349_update_reg(client, SMB349_CMD_REG, ENABLE_CHARGE);
+ if (ret < 0) {
+ dev_err(&client->dev, "%s(): Failed in writing register"
+ "0x%02x\n", __func__, SMB349_CMD_REG);
+ goto error;
+ }
+
+ /* Configure THERM ctrl */
+ ret = smb349_update_reg(client, SMB349_THERM_CTRL, THERM_CTRL);
+ if (ret < 0) {
+ dev_err(&client->dev, "%s: err %d\n", __func__, ret);
+ goto error;
+ }
+ } else {
+ 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<<1))));
+ 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) {
@@ -214,14 +277,13 @@ static irqreturn_t smb349_status_isr(int irq, void *dev_id)
"0x%02x\n", __func__, SMB349_STS_REG_D);
goto irq_error;
} else if (val != 0) {
-
if (val & DEDICATED_CHARGER)
charger->chrg_type = AC;
else if (val & CHRG_DOWNSTRM_PORT)
charger->chrg_type = USB;
/* configure charger */
- ret = smb349_configure_charger(client);
+ ret = smb349_configure_charger(client, 1);
if (ret < 0) {
dev_err(&client->dev, "%s() error in configuring"
"charger..\n", __func__);
@@ -232,17 +294,21 @@ static irqreturn_t smb349_status_isr(int irq, void *dev_id)
} else {
charger->state = stopped;
- ret = smb349_read(client, SMB349_CMD_REG);
+ /* Disable charger */
+ ret = smb349_configure_charger(client, 0);
if (ret < 0) {
- dev_err(&client->dev, "%s: err %d\n", __func__, ret);
+ dev_err(&client->dev, "%s() error in configuring"
+ "charger..\n", __func__);
goto irq_error;
}
- ret = smb349_write(client, SMB349_CMD_REG, (ret & (~(1<<1))));
+ ret = smb349_configure_interrupts(client);
if (ret < 0) {
- dev_err(&client->dev, "%s: err %d\n", __func__, ret);
+ dev_err(&client->dev, "%s() error in configuring"
+ "charger..\n", __func__);
goto irq_error;
}
+
}
if (charger->charger_cb)
@@ -319,6 +385,46 @@ error:
return ret;
}
+static void smb349_otg_status(enum usb_otg_state otg_state, void *data)
+{
+ struct i2c_client *client = charger->client;
+ int ret;
+
+ if (otg_state == OTG_STATE_A_HOST) {
+
+ /* configure charger */
+ ret = smb349_configure_charger(client, 0);
+ if (ret < 0)
+ dev_err(&client->dev, "%s() error in configuring"
+ "otg..\n", __func__);
+
+ /* ENABLE OTG */
+ ret = smb349_configure_otg(client, 1);
+ if (ret < 0)
+ dev_err(&client->dev, "%s() error in configuring"
+ "otg..\n", __func__);
+
+ } else if (otg_state == OTG_STATE_A_SUSPEND) {
+
+ /* Disable OTG */
+ ret = smb349_configure_otg(client, 0);
+ if (ret < 0)
+ dev_err(&client->dev, "%s() error in configuring"
+ "otg..\n", __func__);
+
+ /* configure charger */
+ ret = smb349_configure_charger(client, 1);
+ if (ret < 0)
+ dev_err(&client->dev, "%s() error in configuring"
+ "otg..\n", __func__);
+
+ ret = smb349_configure_interrupts(client);
+ if (ret < 0)
+ dev_err(&client->dev, "%s() error in configuring"
+ "otg..\n", __func__);
+ }
+}
+
static int __devinit smb349_probe(struct i2c_client *client,
const struct i2c_device_id *id)
{
@@ -343,6 +449,14 @@ static int __devinit smb349_probe(struct i2c_client *client,
goto error;
}
+ ret = register_otg_callback(smb349_otg_status, charger);
+ if (ret < 0)
+ goto error;
+
+ ret = smb349_configure_charger(client, 1);
+ if (ret < 0)
+ return ret;
+
ret = smb349_configure_interrupts(client);
if (ret < 0) {
dev_err(&client->dev, "%s() error in configuring charger..\n",
@@ -359,7 +473,6 @@ static int __devinit smb349_probe(struct i2c_client *client,
__func__);
goto error;
}
-
return 0;
error:
kfree(charger);