Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 220619
b: refs/heads/master
c: 11c39c4
h: refs/heads/master
i:
  220617: aecb8aa
  220615: a520afa
v: v3
  • Loading branch information
Grazvydas Ignotas authored and Samuel Ortiz committed Oct 28, 2010
1 parent 16bd802 commit 0fb738f
Show file tree
Hide file tree
Showing 2 changed files with 18 additions and 1 deletion.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 1c97872b80691f6bd3e46ec431a0d59dc75cb8da
refs/heads/master: 11c39c4bde7acb727f7a7c6a4d7ffeb95b64dbb4
17 changes: 17 additions & 0 deletions trunk/drivers/mfd/twl-core.c
Original file line number Diff line number Diff line change
Expand Up @@ -115,6 +115,12 @@
#define twl_has_codec() false
#endif

#if defined(CONFIG_CHARGER_TWL4030) || defined(CONFIG_CHARGER_TWL4030_MODULE)
#define twl_has_bci() true
#else
#define twl_has_bci() false
#endif

/* Triton Core internal information (BEGIN) */

/* Last - for index max*/
Expand Down Expand Up @@ -826,6 +832,17 @@ add_children(struct twl4030_platform_data *pdata, unsigned long features)
return PTR_ERR(child);
}

if (twl_has_bci() && pdata->bci &&
!(features & (TPS_SUBSET | TWL5031))) {
child = add_child(3, "twl4030_bci",
pdata->bci, sizeof(*pdata->bci), false,
/* irq0 = CHG_PRES, irq1 = BCI */
pdata->irq_base + BCI_PRES_INTR_OFFSET,
pdata->irq_base + BCI_INTR_OFFSET);
if (IS_ERR(child))
return PTR_ERR(child);
}

return 0;
}

Expand Down

0 comments on commit 0fb738f

Please sign in to comment.