summaryrefslogtreecommitdiff
path: root/drivers/mfd/tps65910.c
diff options
context:
space:
mode:
authormattis fjallstrom <mattis@acm.org>2016-05-10 22:35:42 -0700
committermattis fjallstrom <mattis@acm.org>2016-05-11 17:01:09 -0700
commit427160c0a0820798d703d5dc413bcb5583de8fa6 (patch)
tree8dbee9e1d6a5a8eb84e07089a5fa6b87f87c5c22 /drivers/mfd/tps65910.c
parent9fed79637320f99a185545ae4982ba25c681fcde (diff)
downloadolio-linux-3.10-427160c0a0820798d703d5dc413bcb5583de8fa6.tar.xz
olio-linux-3.10-427160c0a0820798d703d5dc413bcb5583de8fa6.zip
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.
Change-Id: Ie7adfb0c1ee9421cab85ad8be071825a43e99aca
Diffstat (limited to 'drivers/mfd/tps65910.c')
-rw-r--r--drivers/mfd/tps65910.c4
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");