diff options
author | Max Krummenacher <max.krummenacher@toradex.com> | 2018-06-21 09:58:24 +0200 |
---|---|---|
committer | Max Krummenacher <max.krummenacher@toradex.com> | 2018-06-21 09:58:24 +0200 |
commit | 47133a000cd65fc17873e562e2f72b368b615760 (patch) | |
tree | edcd6be8a1d66c7b440af54700eaf807333c690a /drivers/mfd | |
parent | 6fb9f3c8a4992f67dcb3ce413df2e22e96b2d400 (diff) | |
parent | 0bd2bedb3501db249b347e5acbfd3415bd7667a5 (diff) |
Merge tag 'v4.4.138' into toradex_vf_4.4-next
This is the 4.4.138 stable release
Diffstat (limited to 'drivers/mfd')
-rw-r--r-- | drivers/mfd/palmas.c | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/drivers/mfd/palmas.c b/drivers/mfd/palmas.c index 8f8bacb67a15..a6b5259ffbdd 100644 --- a/drivers/mfd/palmas.c +++ b/drivers/mfd/palmas.c @@ -430,6 +430,20 @@ static void palmas_power_off(void) { unsigned int addr; int ret, slave; + struct device_node *np = palmas_dev->dev->of_node; + + if (of_property_read_bool(np, "ti,palmas-override-powerhold")) { + addr = PALMAS_BASE_TO_REG(PALMAS_PU_PD_OD_BASE, + PALMAS_PRIMARY_SECONDARY_PAD2); + slave = PALMAS_BASE_TO_SLAVE(PALMAS_PU_PD_OD_BASE); + + ret = regmap_update_bits(palmas_dev->regmap[slave], addr, + PALMAS_PRIMARY_SECONDARY_PAD2_GPIO_7_MASK, 0); + if (ret) + dev_err(palmas_dev->dev, + "Unable to write PRIMARY_SECONDARY_PAD2 %d\n", + ret); + } if (!palmas_dev) return; |