From 7cf362760dc45ba26e55214690a3cc0021085071 Mon Sep 17 00:00:00 2001
From: Colin Foe-Parker <colin.foeparker@logicpd.com>
Date: Tue, 20 Nov 2012 15:18:44 +0530
Subject: [PATCH] --- yaml --- r: 345007 b: refs/heads/master c:
 eb433dad48b49f757255f2860db5c2bd61dcae0d h: refs/heads/master i:   345005:
 a1f1975e43fe65610c52285d3fb8ca14ec37a28c   345003:
 102a09d8803cbd0c4303f3eb7116611560cf8dcc   344999:
 af55f15805b039282c60251b496c355be6b33981   344991:
 71c2145082a5604357a11784113ee7ed0c7b72fe v: v3

---
 [refs]                                               |  2 +-
 .../devicetree/bindings/regulator/tps65217.txt       |  4 ++++
 trunk/drivers/mfd/tps65217.c                         | 12 ++++++++++++
 3 files changed, 17 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 74cfb9d16843..99e2898fbcff 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 433e075c7f3b45c946c539ceeddc641c61adef5e
+refs/heads/master: eb433dad48b49f757255f2860db5c2bd61dcae0d
diff --git a/trunk/Documentation/devicetree/bindings/regulator/tps65217.txt b/trunk/Documentation/devicetree/bindings/regulator/tps65217.txt
index d316fb895daf..4f05d208c95c 100644
--- a/trunk/Documentation/devicetree/bindings/regulator/tps65217.txt
+++ b/trunk/Documentation/devicetree/bindings/regulator/tps65217.txt
@@ -11,6 +11,9 @@ Required properties:
   using the standard binding for regulators found at
   Documentation/devicetree/bindings/regulator/regulator.txt.
 
+Optional properties:
+- ti,pmic-shutdown-controller: Telling the PMIC to shutdown on PWR_EN toggle.
+
   The valid names for regulators are:
   tps65217: dcdc1, dcdc2, dcdc3, ldo1, ldo2, ldo3 and ldo4
 
@@ -20,6 +23,7 @@ Example:
 
 	tps: tps@24 {
 		compatible = "ti,tps65217";
+		ti,pmic-shutdown-controller;
 
 		regulators {
 			dcdc1_reg: dcdc1 {
diff --git a/trunk/drivers/mfd/tps65217.c b/trunk/drivers/mfd/tps65217.c
index 3fb32e655254..c7f17d86db78 100644
--- a/trunk/drivers/mfd/tps65217.c
+++ b/trunk/drivers/mfd/tps65217.c
@@ -160,6 +160,7 @@ static int __devinit tps65217_probe(struct i2c_client *client,
 	unsigned int version;
 	unsigned int chip_id = ids->driver_data;
 	const struct of_device_id *match;
+	bool status_off = false;
 	int ret;
 
 	if (client->dev.of_node) {
@@ -170,6 +171,8 @@ static int __devinit tps65217_probe(struct i2c_client *client,
 			return -EINVAL;
 		}
 		chip_id = (unsigned int)match->data;
+		status_off = of_property_read_bool(client->dev.of_node,
+					"ti,pmic-shutdown-controller");
 	}
 
 	if (!chip_id) {
@@ -207,6 +210,15 @@ static int __devinit tps65217_probe(struct i2c_client *client,
 		return ret;
 	}
 
+	/* Set the PMIC to shutdown on PWR_EN toggle */
+	if (status_off) {
+		ret = tps65217_set_bits(tps, TPS65217_REG_STATUS,
+				TPS65217_STATUS_OFF, TPS65217_STATUS_OFF,
+				TPS65217_PROTECT_NONE);
+		if (ret)
+			dev_warn(tps->dev, "unable to set the status OFF\n");
+	}
+
 	dev_info(tps->dev, "TPS65217 ID %#x version 1.%d\n",
 			(version & TPS65217_CHIPID_CHIP_MASK) >> 4,
 			version & TPS65217_CHIPID_REV_MASK);