| Message ID | 1353404927-14412-3-git-send-email-anilkumar@ti.com |
|---|---|
| State | Accepted |
| Headers | show |
Hi Anilkumar, On Tue, Nov 20, 2012 at 03:18:44PM +0530, AnilKumar Ch wrote: > From: Colin Foe-Parker <colin.foeparker@logicpd.com> > > Set tps65217 PMIC status to OFF if power enable toggle is supported. > By setting this bit to 1 to enter PMIC to OFF state when PWR_EN pin > is pulled low. Also adds a DT flag to specify that device pmic > supports shutdown control or not. > > Signed-off-by: Colin Foe-Parker <colin.foeparker@logicpd.com> > [anilkumar@ti.com: move the additions to tps65217 MFD driver] > Signed-off-by: AnilKumar Ch <anilkumar@ti.com> > --- > .../devicetree/bindings/regulator/tps65217.txt | 4 ++++ > drivers/mfd/tps65217.c | 12 ++++++++++++ > 2 files changed, 16 insertions(+) Applied, thanks. I suppose you're not expecting the whole patchset to go through one tree ? Cheers, Samuel.
On Wed, Nov 21, 2012 at 19:17:58, Samuel Ortiz wrote: > Hi Anilkumar, > > On Tue, Nov 20, 2012 at 03:18:44PM +0530, AnilKumar Ch wrote: > > From: Colin Foe-Parker <colin.foeparker@logicpd.com> > > > > Set tps65217 PMIC status to OFF if power enable toggle is supported. > > By setting this bit to 1 to enter PMIC to OFF state when PWR_EN pin > > is pulled low. Also adds a DT flag to specify that device pmic > > supports shutdown control or not. > > > > Signed-off-by: Colin Foe-Parker <colin.foeparker@logicpd.com> > > [anilkumar@ti.com: move the additions to tps65217 MFD driver] > > Signed-off-by: AnilKumar Ch <anilkumar@ti.com> > > --- > > .../devicetree/bindings/regulator/tps65217.txt | 4 ++++ > > drivers/mfd/tps65217.c | 12 ++++++++++++ > > 2 files changed, 16 insertions(+) > Applied, thanks. > I suppose you're not expecting the whole patchset to go through one tree ? > Hi Samuel, Thanks much. Yes, I will request the corresponding owners to pick rest of the patches. Thanks AnilKumar
diff --git a/Documentation/devicetree/bindings/regulator/tps65217.txt b/Documentation/devicetree/bindings/regulator/tps65217.txt index d316fb8..4f05d20 100644 --- a/Documentation/devicetree/bindings/regulator/tps65217.txt +++ b/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/drivers/mfd/tps65217.c b/drivers/mfd/tps65217.c index 3fb32e6..c7f17d8 100644 --- a/drivers/mfd/tps65217.c +++ b/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);