From ad732e7e434bb49d9fc43f1c989308ebe8144b72 Mon Sep 17 00:00:00 2001
From: Lee Jones <lee.jones@linaro.org>
Date: Fri, 15 Feb 2013 10:53:57 +0000
Subject: [PATCH] --- yaml --- r: 367455 b: refs/heads/master c:
 330b7ebfa59d70ea5b814a04a28b8c7d8e462a81 h: refs/heads/master i:   367453:
 111df6c381d84578fd3da1c6d9973a12b530d839   367451:
 d020d5e7433653fcbe069874728786ea65f7df3f   367447:
 d19b9dac2ce4baa2c2ebaf13e30f42554d2904dd   367439:
 629b10689a12d2b7e4d3ce8698e321f277594123   367423:
 2a2e1323aa111df4eec8398a8d251ac324bde548 v: v3

---
 [refs]                                | 2 +-
 trunk/drivers/power/abx500_chargalg.c | 5 ++++-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index f0bc261be6c8..a8eacce6dd51 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 584f970339bb259d4ac7dd82b355f283550193b2
+refs/heads/master: 330b7ebfa59d70ea5b814a04a28b8c7d8e462a81
diff --git a/trunk/drivers/power/abx500_chargalg.c b/trunk/drivers/power/abx500_chargalg.c
index f043c0851a76..31507bfe549c 100644
--- a/trunk/drivers/power/abx500_chargalg.c
+++ b/trunk/drivers/power/abx500_chargalg.c
@@ -204,6 +204,7 @@ enum maxim_ret {
  * @batt_data:		data of the battery
  * @susp_status:	current charger suspension status
  * @bm:           	Platform specific battery management information
+ * @parent:		pointer to the struct abx500
  * @chargalg_psy:	structure that holds the battery properties exposed by
  *			the charging algorithm
  * @events:		structure for information about events triggered
@@ -227,6 +228,7 @@ struct abx500_chargalg {
 	struct abx500_chargalg_charger_info chg_info;
 	struct abx500_chargalg_battery_data batt_data;
 	struct abx500_chargalg_suspension_status susp_status;
+	struct ab8500 *parent;
 	struct abx500_bm_data *bm;
 	struct power_supply chargalg_psy;
 	struct ux500_charger *ac_chg;
@@ -1873,8 +1875,9 @@ static int abx500_chargalg_probe(struct platform_device *pdev)
 		}
 	}
 
-	/* get device struct */
+	/* get device struct and parent */
 	di->dev = &pdev->dev;
+	di->parent = dev_get_drvdata(pdev->dev.parent);
 
 	/* chargalg supply */
 	di->chargalg_psy.name = "abx500_chargalg";