diff options
author | Christoph Egger <siccegge@stud.informatik.uni-erlangen.de> | 2010-01-15 09:33:46 -0500 |
---|---|---|
committer | Samuel Ortiz <sameo@linux.intel.com> | 2010-03-07 16:17:11 -0500 |
commit | f7ea2dc59ed46dcd0f1cfaccda02211f4507207b (patch) | |
tree | a8afa0e127faa17233800a66d80cb03d41e5bd18 /drivers/mfd | |
parent | ca229f1b624a72a1c9eb1d94bbca7a0c094a1b8b (diff) |
mfd: Remove leftover from discontinued TWL4030 battery patch
The TWL4030_BCI_BATTERY config option originates from a patch to the
omap git tree. However inclusion in linux was seemingly rejected and
the functionality nears inclusion under a different name so this
removes the bits of the old version that made it into the mainline
kernel again.
Signed-off-by: Christoph Egger <siccegge@stud.informatik.uni-erlangen.de>
Signed-off-by: Samuel Ortiz <sameo@linux.intel.com>
Diffstat (limited to 'drivers/mfd')
-rw-r--r-- | drivers/mfd/twl-core.c | 19 |
1 files changed, 0 insertions, 19 deletions
diff --git a/drivers/mfd/twl-core.c b/drivers/mfd/twl-core.c index 19a930d06241..d81003f4867e 100644 --- a/drivers/mfd/twl-core.c +++ b/drivers/mfd/twl-core.c | |||
@@ -58,13 +58,6 @@ | |||
58 | 58 | ||
59 | #define DRIVER_NAME "twl" | 59 | #define DRIVER_NAME "twl" |
60 | 60 | ||
61 | #if defined(CONFIG_TWL4030_BCI_BATTERY) || \ | ||
62 | defined(CONFIG_TWL4030_BCI_BATTERY_MODULE) | ||
63 | #define twl_has_bci() true | ||
64 | #else | ||
65 | #define twl_has_bci() false | ||
66 | #endif | ||
67 | |||
68 | #if defined(CONFIG_KEYBOARD_TWL4030) || defined(CONFIG_KEYBOARD_TWL4030_MODULE) | 61 | #if defined(CONFIG_KEYBOARD_TWL4030) || defined(CONFIG_KEYBOARD_TWL4030_MODULE) |
69 | #define twl_has_keypad() true | 62 | #define twl_has_keypad() true |
70 | #else | 63 | #else |
@@ -588,18 +581,6 @@ add_children(struct twl4030_platform_data *pdata, unsigned long features) | |||
588 | struct device *child; | 581 | struct device *child; |
589 | unsigned sub_chip_id; | 582 | unsigned sub_chip_id; |
590 | 583 | ||
591 | if (twl_has_bci() && pdata->bci && | ||
592 | !(features & (TPS_SUBSET | TWL5031))) { | ||
593 | child = add_child(3, "twl4030_bci", | ||
594 | pdata->bci, sizeof(*pdata->bci), | ||
595 | false, | ||
596 | /* irq0 = CHG_PRES, irq1 = BCI */ | ||
597 | pdata->irq_base + BCI_PRES_INTR_OFFSET, | ||
598 | pdata->irq_base + BCI_INTR_OFFSET); | ||
599 | if (IS_ERR(child)) | ||
600 | return PTR_ERR(child); | ||
601 | } | ||
602 | |||
603 | if (twl_has_gpio() && pdata->gpio) { | 584 | if (twl_has_gpio() && pdata->gpio) { |
604 | child = add_child(SUB_CHIP_ID1, "twl4030_gpio", | 585 | child = add_child(SUB_CHIP_ID1, "twl4030_gpio", |
605 | pdata->gpio, sizeof(*pdata->gpio), | 586 | pdata->gpio, sizeof(*pdata->gpio), |