Skip to contentSkip to conversation

mfd: twl4030: add twl4030_bci platform_data back

PATCH In review Grazvydas Ignotas 3 participants 3 messages Oct 1, 2010 – Oct 18, 2010

Subsystems (2)
Multifunction devices (MFD) OMAP2+ support
lore
Share & tools
lore

Grazvydas Ignotas

author
#0 lore raw

PATCH 1/1 mfd: twl4030: add twl4030_bci platform_data back

Now that we have twl4030 charger driver, add back it's platform_data (which was removed by f7ea2dc59ed46dcd0f1cfaccda02211f4507207b as unused).

Signed-off-by Grazvydas Ignotas <[email protected]>

---
Well the driver is still in battery.git and linux-next, but I'm pretty sure it will reach Linus.

 drivers/mfd/twl-core.c |   17 +++++++++++++++++
 1 files changed, 17 insertions(+), 0 deletions(-)
drivers/mfd/twl-core.c +17 -0
index b0f2c00..2f5258f 100644
@@ -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*/

@@ -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;
 }
Signature · 1 line
1.6.3.3
#2 lore raw
In reply to Grazvydas Ignotas

Hi Grazvydas,

Quoted 3 lines · Grazvydas Ignotas

Now that we have twl4030 charger driver, add back it's platform_data (which was removed by f7ea2dc59ed46dcd0f1cfaccda02211f4507207b as unused).

Patch applied, many thanks.

Cheers,
Samuel.

Quoted 46 lines
Signed-off-by Grazvydas Ignotas <[email protected]>

---
Well the driver is still in battery.git and linux-next, but I'm pretty sure it will reach Linus.

 drivers/mfd/twl-core.c |   17 +++++++++++++++++
 1 files changed, 17 insertions(+), 0 deletions(-)
drivers/mfd/twl-core.c +17 -0
index b0f2c00..2f5258f 100644
@@ -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*/

@@ -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;
 }
Signature · 1 line
1.6.3.3
Signature · 2 lines
Intel Open Source Technology Centre
http://oss.intel.com/