diff options
| author | Evan Wilson <evan@oliodevices.com> | 2016-05-12 00:35:36 +0000 |
|---|---|---|
| committer | Gerrit Code Review <gerrit2@ip-172-31-25-77.us-west-1.compute.internal> | 2015-04-16 10:08:13 +0000 |
| commit | 7e962382f41bf0fd50ae4d8231639d01a7bd2247 (patch) | |
| tree | 7d9820eeea9fe071aaebbc2e0e739bed0e87b57a /drivers/mfd/tps65910.c | |
| parent | d461ebe9ada981f1aea84e762e79bc3771cb65c7 (diff) | |
| parent | 427160c0a0820798d703d5dc413bcb5583de8fa6 (diff) | |
| download | olio-linux-3.10-7e962382f41bf0fd50ae4d8231639d01a7bd2247.tar.xz olio-linux-3.10-7e962382f41bf0fd50ae4d8231639d01a7bd2247.zip | |
Merge "YAFFA (Yet Another Fix For Alarm), this time removing the sys_nirq pin from pad_wkup in device tree. Also fixing i2c-1s pin address and some spelling and indentation issues." into android-3.10-bringupstaging
Diffstat (limited to 'drivers/mfd/tps65910.c')
| -rw-r--r-- | drivers/mfd/tps65910.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/mfd/tps65910.c b/drivers/mfd/tps65910.c index 7d1a1769bb1..94f52d5ef69 100644 --- a/drivers/mfd/tps65910.c +++ b/drivers/mfd/tps65910.c @@ -503,8 +503,10 @@ static struct tps65910_board *tps65910_parse_dt(struct i2c_client *client, board_info->slp_keepon.clkout32k_keepon = prop; board_info->irq = client->irq; + /* board_info->irq_base = -1; */ - board_info->irq_base = 0; /* OLIO: if (-1) is true ... seems weird. */ + board_info->irq_base = 0; + board_info->pm_off = of_property_read_bool(np, "ti,system-power-controller"); |