aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLee Jones <lee.jones@linaro.org>2013-01-17 11:08:42 -0500
committerLee Jones <lee.jones@linaro.org>2013-01-23 09:39:21 -0500
commit97034a1e042d4316a83a3f68d61edf6c42e3f265 (patch)
treeacf4400657be33c5de4a4b029818f0f180aafaf2
parent0ed5107fa86013c91b1752230d44b79dffee0cda (diff)
ab8500-bm: Remove individual [charger|btemp|fg|chargalg] pdata structures
None of the aforementioned components have their own dedicated platform data structures anymore. Instead they have all been merged into one big Battery Management container. Let's remove them and place all the nice newly added attributes into the core container. Signed-off-by: Lee Jones <lee.jones@linaro.org>
-rw-r--r--drivers/power/ab8500_charger.c4
-rw-r--r--include/linux/mfd/abx500.h3
-rw-r--r--include/linux/mfd/abx500/ab8500-bm.h22
3 files changed, 5 insertions, 24 deletions
diff --git a/drivers/power/ab8500_charger.c b/drivers/power/ab8500_charger.c
index 871bf5a7c42a..432f6bc48764 100644
--- a/drivers/power/ab8500_charger.c
+++ b/drivers/power/ab8500_charger.c
@@ -2998,7 +2998,7 @@ static int ab8500_charger_probe(struct platform_device *pdev)
2998 di->ac_chg.max_out_curr = ab8500_charger_current_map[ 2998 di->ac_chg.max_out_curr = ab8500_charger_current_map[
2999 ARRAY_SIZE(ab8500_charger_current_map) - 1]; 2999 ARRAY_SIZE(ab8500_charger_current_map) - 1];
3000 di->ac_chg.wdt_refresh = CHG_WD_INTERVAL; 3000 di->ac_chg.wdt_refresh = CHG_WD_INTERVAL;
3001 di->ac_chg.enabled = di->pdata->ac_enabled; 3001 di->ac_chg.enabled = di->bm->ac_enabled;
3002 di->ac_chg.external = false; 3002 di->ac_chg.external = false;
3003 3003
3004 /* USB supply */ 3004 /* USB supply */
@@ -3019,7 +3019,7 @@ static int ab8500_charger_probe(struct platform_device *pdev)
3019 di->usb_chg.max_out_curr = ab8500_charger_current_map[ 3019 di->usb_chg.max_out_curr = ab8500_charger_current_map[
3020 ARRAY_SIZE(ab8500_charger_current_map) - 1]; 3020 ARRAY_SIZE(ab8500_charger_current_map) - 1];
3021 di->usb_chg.wdt_refresh = CHG_WD_INTERVAL; 3021 di->usb_chg.wdt_refresh = CHG_WD_INTERVAL;
3022 di->usb_chg.enabled = di->pdata->usb_enabled; 3022 di->usb_chg.enabled = di->bm->usb_enabled;
3023 di->usb_chg.external = false; 3023 di->usb_chg.external = false;
3024 3024
3025 /* Create a work queue for the charger */ 3025 /* Create a work queue for the charger */
diff --git a/include/linux/mfd/abx500.h b/include/linux/mfd/abx500.h
index 0e6e90badfca..1beaa056f195 100644
--- a/include/linux/mfd/abx500.h
+++ b/include/linux/mfd/abx500.h
@@ -254,6 +254,9 @@ struct abx500_bm_data {
254 int usb_safety_tmr_h; 254 int usb_safety_tmr_h;
255 int bkup_bat_v; 255 int bkup_bat_v;
256 int bkup_bat_i; 256 int bkup_bat_i;
257 bool autopower_cfg;
258 bool ac_enabled;
259 bool usb_enabled;
257 bool no_maintenance; 260 bool no_maintenance;
258 bool capacity_scaling; 261 bool capacity_scaling;
259 bool chg_unknown_bat; 262 bool chg_unknown_bat;
diff --git a/include/linux/mfd/abx500/ab8500-bm.h b/include/linux/mfd/abx500/ab8500-bm.h
index ec796c700e4c..345bc159f978 100644
--- a/include/linux/mfd/abx500/ab8500-bm.h
+++ b/include/linux/mfd/abx500/ab8500-bm.h
@@ -404,28 +404,6 @@ struct ab8500_bm_data {
404 const struct ab8500_fg_parameters *fg_params; 404 const struct ab8500_fg_parameters *fg_params;
405}; 405};
406 406
407struct ab8500_charger_platform_data {
408 char **supplied_to;
409 size_t num_supplicants;
410 bool autopower_cfg;
411 bool ac_enabled;
412 bool usb_enabled;
413};
414
415struct ab8500_btemp_platform_data {
416 char **supplied_to;
417 size_t num_supplicants;
418};
419
420struct ab8500_fg_platform_data {
421 char **supplied_to;
422 size_t num_supplicants;
423};
424
425struct ab8500_chargalg_platform_data {
426 char **supplied_to;
427 size_t num_supplicants;
428};
429struct ab8500_btemp; 407struct ab8500_btemp;
430struct ab8500_gpadc; 408struct ab8500_gpadc;
431struct ab8500_fg; 409struct ab8500_fg;