commit 3785ca084f0a5a69f5e3b5080145895d2b11a901
author Todd Poynor <toddpoynor@google.com> Thu Jul 19 00:31:40 2012 -0700
committer Varun Wadekar <vwadekar@nvidia.com> Mon Jul 23 15:00:43 2012 +0530
tree d96dc3fcfcc5b2ec334e0be926dfea495c8282b8
parent e34ccfdfa5c191f35f8528f0b1bd83549ce77616

power: smb347: manage EN pin if given in pdata

Change-Id: Ie6c6828dc382aaacdd8cb1d3f5d19e9c8bb7d843
Signed-off-by: Todd Poynor <toddpoynor@google.com>

drivers/power/smb347-charger.c

diff --git a/drivers/power/smb347-charger.c b/drivers/power/smb347-charger.c
index 09cc839..5f4cb9f 100644
--- a/drivers/power/smb347-charger.c
+++ b/drivers/power/smb347-charger.c
@@ -142,6 +142,7 @@
 	unsigned int		mains_current_limit;
 	bool			usb_hc_mode;
 	bool			usb_otg_enabled;
+	int			en_gpio;
 	struct dentry		*dentry;
 	const struct smb347_charger_platform_data *pdata;
 };
@@ -324,8 +325,12 @@
 
 	if (smb->pdata->enable_control != SMB347_CHG_ENABLE_SW) {
 		smb->charging_enabled = enable;
-		dev_dbg(&smb->client->dev,
-			"charging enable/disable in SW disabled\n");
+
+		if (smb->en_gpio)
+			gpio_set_value(
+				smb->en_gpio,
+				(smb->pdata->enable_control ==
+				 SMB347_CHG_ENABLE_PIN_ACTIVE_LOW) ^ enable);
 		return 0;
 	}
 
@@ -1359,6 +1364,19 @@
 
 	smb->mains_current_limit = smb->pdata->mains_current_limit;
 
+	if (pdata->en_gpio) {
+		ret = gpio_request_one(
+			pdata->en_gpio,
+			smb->pdata->enable_control ==
+			SMB347_CHG_ENABLE_PIN_ACTIVE_LOW ?
+			GPIOF_OUT_INIT_HIGH : GPIOF_OUT_INIT_LOW,
+			smb->client->name);
+		if (ret < 0)
+			dev_warn(dev, "failed to claim EN GPIO: %d\n", ret);
+		else
+			smb->en_gpio = pdata->en_gpio;
+	}
+
 	ret = smb347_hw_init(smb);
 	if (ret < 0)
 		return ret;

include/linux/power/smb347-charger.h

diff --git a/include/linux/power/smb347-charger.h b/include/linux/power/smb347-charger.h
index 2bd340b..f944dfc 100644
--- a/include/linux/power/smb347-charger.h
+++ b/include/linux/power/smb347-charger.h
@@ -115,6 +115,7 @@
 	bool		usb_mode_pin_ctrl;
 	char		**supplied_to;
 	size_t		num_supplicants;
+	int		en_gpio;
 };
 
 #endif /* SMB347_CHARGER_H */